diff options
| author | Matt Schwager <schwag09@gmail.com> | 2012-10-19 13:37:49 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-02-12 08:35:32 -0500 |
| commit | 0253b04b9ba7c3e4ef139bf352b7a57de823daaa (patch) | |
| tree | f06a339d7baaa73cc90cb65b6a0b87d75b11eecd /src/lib/Bcfg2/Server/Core.py | |
| parent | ead022433a759686db6de02b91811de7ca166ac7 (diff) | |
| download | bcfg2-0253b04b9ba7c3e4ef139bf352b7a57de823daaa.tar.gz bcfg2-0253b04b9ba7c3e4ef139bf352b7a57de823daaa.tar.bz2 bcfg2-0253b04b9ba7c3e4ef139bf352b7a57de823daaa.zip | |
Added CIDR notation to IP ACLs. Still need to test.
Diffstat (limited to 'src/lib/Bcfg2/Server/Core.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Core.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index c9fd76325..c01b493de 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -1072,13 +1072,12 @@ class BaseCore(object): return self.metadata.AuthenticateConnection(acert, user, password, address) - def check_acls(self, client): + def check_acls(self, client_ip): """ Check if client IP is in list of accepted IPs """ try: - return (client in self.plugins['Acl'].config.ips or - '*' in self.plugins['Acl'].config.ips) + return self.plugins['Acl'].config.check_acl(client_ip) except KeyError: - # No ACL means accept all incoming ips (wildcard) + # No ACL means accept all incoming ips return True @exposed |