summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/SSLServer.py
diff options
context:
space:
mode:
authorMatt Schwager <schwag09@gmail.com>2012-10-17 13:44:43 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-02-12 08:35:32 -0500
commit168aa5f9d31f310caa2d8fb87b5d46d6e23b5821 (patch)
treeac35385b07db6ac87c828b6181c5f9c679b53ee1 /src/lib/Bcfg2/Server/SSLServer.py
parente8a5500535cb7c23ef3d687304033e50e80dbd3f (diff)
downloadbcfg2-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/SSLServer.py')
-rw-r--r--src/lib/Bcfg2/Server/SSLServer.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Server/SSLServer.py b/src/lib/Bcfg2/Server/SSLServer.py
index eeaeb9516..c2294eec9 100644
--- a/src/lib/Bcfg2/Server/SSLServer.py
+++ b/src/lib/Bcfg2/Server/SSLServer.py
@@ -209,6 +209,8 @@ class XMLRPCRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
password = ""
cert = self.request.getpeercert()
client_address = self.request.getpeername()
+ if not self.server.instance.check_acls(client_address[0]):
+ return False
return self.server.instance.authenticate(cert, username,
password, client_address)