diff options
| author | Matt Schwager <schwag09@gmail.com> | 2012-10-17 13:44:43 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-02-12 08:35:32 -0500 |
| commit | 168aa5f9d31f310caa2d8fb87b5d46d6e23b5821 (patch) | |
| tree | ac35385b07db6ac87c828b6181c5f9c679b53ee1 /src/lib/Bcfg2/Server/Core.py | |
| parent | e8a5500535cb7c23ef3d687304033e50e80dbd3f (diff) | |
| download | bcfg2-168aa5f9d31f310caa2d8fb87b5d46d6e23b5821.tar.gz bcfg2-168aa5f9d31f310caa2d8fb87b5d46d6e23b5821.tar.bz2 bcfg2-168aa5f9d31f310caa2d8fb87b5d46d6e23b5821.zip | |
IP based ACLs working for CherryPy and Builtin Server. Rudimentary tests performed and passed.
Diffstat (limited to 'src/lib/Bcfg2/Server/Core.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Core.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index 9ca540127..e931a7bc0 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -1075,8 +1075,10 @@ class BaseCore(object): def check_acls(self, client): """ Check if client IP is in list of accepted IPs """ try: - return client in self.plugins['Acl'].config.ips + return (client in self.plugins['Acl'].config.ips or + '*' in self.plugins['Acl'].config) except KeyError: + # No ACL means accept all incoming ips (wildcard) return True @exposed |