summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/CherryPyCore.py
diff options
context:
space:
mode:
authorMatt Schwager <schwag09@gmail.com>2012-10-15 12:34:07 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-02-12 08:35:32 -0500
commite8a5500535cb7c23ef3d687304033e50e80dbd3f (patch)
treee612938dde26bb1ea50a9d241cf519c247f30205 /src/lib/Bcfg2/Server/CherryPyCore.py
parent2ad656a8b9fe4fd364dff3a4f6e419699438c714 (diff)
downloadbcfg2-e8a5500535cb7c23ef3d687304033e50e80dbd3f.tar.gz
bcfg2-e8a5500535cb7c23ef3d687304033e50e80dbd3f.tar.bz2
bcfg2-e8a5500535cb7c23ef3d687304033e50e80dbd3f.zip
IP based ACLs working for CherryPy Server. Still need to implement BuiltinServer and test.
Diffstat (limited to 'src/lib/Bcfg2/Server/CherryPyCore.py')
-rw-r--r--src/lib/Bcfg2/Server/CherryPyCore.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Server/CherryPyCore.py b/src/lib/Bcfg2/Server/CherryPyCore.py
index 936279508..6709a2f10 100644
--- a/src/lib/Bcfg2/Server/CherryPyCore.py
+++ b/src/lib/Bcfg2/Server/CherryPyCore.py
@@ -63,6 +63,9 @@ class Core(BaseCore):
username = auth_content
password = ""
+ if not self.check_acls(cherrypy.request.remote.ip):
+ raise cherrypy.HTTPError(403)
+
# FIXME: Get client cert
cert = None
address = (cherrypy.request.remote.ip, cherrypy.request.remote.name)