Skip to content

Commit

Permalink
Add basic role based authentication
Browse files Browse the repository at this point in the history
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
  • Loading branch information
stgraber committed Jul 9, 2014
1 parent 9aedf85 commit 54aef68
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 16 deletions.
28 changes: 13 additions & 15 deletions src/lxccmd/lxccmd/commands/server/__init__.py
Expand Up @@ -61,14 +61,14 @@ def handle_one_request(self):
Mostly copy/paste from the original function.
"""

if not trust_cert_verify(
ssl.DER_cert_to_PEM_cert(
self.connection.getpeercert(binary_form=True)), "server"):
self.requestline = ''
self.request_version = ''
self.command = ''
self.send_error(401)
return
# Validate the connection
peer_cert = self.connection.getpeercert(binary_form=True)
if not peer_cert:
role = "guest"
elif trust_cert_verify(ssl.DER_cert_to_PEM_cert(peer_cert), "server"):
role = "trusted"
else:
role = "untrusted"

try:
self.raw_requestline = self.rfile.readline(65537)
Expand All @@ -86,8 +86,8 @@ def handle_one_request(self):
return

# Actual processing happens here
if "%s:%s" % (self.command, self.path) \
not in self.server.exported_functions:
signature = (role, self.command, self.path)
if signature not in self.server.exported_functions:
self.send_response(404)
self.end_headers()
self.wfile.write(
Expand All @@ -102,9 +102,7 @@ def handle_one_request(self):
self.end_headers()
self.wfile.write(
json.dumps(
self.server.exported_functions["%s:%s" %
(self.command,
self.path)](),
self.server.exported_functions[signature](),
sort_keys=True, indent=4, separators=(',', ': ')).encode())

self.wfile.flush()
Expand Down Expand Up @@ -258,8 +256,8 @@ def cli_set(parser, args):

# REST functions
def rest_functions():
return {"GET:/": rest_root}
return {("guest", "GET", "/server/trust"): rest_trust}


def rest_root():
def rest_trust():
return {}
2 changes: 1 addition & 1 deletion src/lxccmd/lxccmd/commands/status/__init__.py
Expand Up @@ -163,4 +163,4 @@ def cli_status(parser, args):

# REST functions
def rest_functions():
return {'GET:/status': get_status}
return {("trusted", "GET", "/status"): get_status}

0 comments on commit 54aef68

Please sign in to comment.