Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-02-05 12:35:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

code beautify

Browse Source
This commit is contained in:
Muthu Subramanian 2015-07-08 16:05:20 +05:30
parent 81682d0f82
commit 77c5db5977
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
synapse/rest/client/v1/login.py
View File

@ -45,7 +45,8 @@ class LoginRestServlet(ClientV1RestServlet):
self.idp_redirect_url = hs.config.saml2_config['idp_redirect_url'] self.idp_redirect_url = hs.config.saml2_config['idp_redirect_url']
def on_GET(self, request): def on_GET(self, request):
return (200, {"flows": [{"type": LoginRestServlet.PASS_TYPE}, {"type": LoginRestServlet.SAML2_TYPE}]}) return (200, {"flows": [{"type": LoginRestServlet.PASS_TYPE},
{"type": LoginRestServlet.SAML2_TYPE}]})
def on_OPTIONS(self, request): def on_OPTIONS(self, request):
return (200, {}) return (200, {})
@ -60,9 +61,10 @@ class LoginRestServlet(ClientV1RestServlet):
elif login_submission["type"] == LoginRestServlet.SAML2_TYPE: elif login_submission["type"] == LoginRestServlet.SAML2_TYPE:
relay_state = "" relay_state = ""
if "relay_state" in login_submission: if "relay_state" in login_submission:
relay_state = "&RelayState="+urllib.quote(login_submission["relay_state"]) relay_state = "&RelayState="+urllib.quote(
login_submission["relay_state"])
result = { result = {
"uri": "%s%s"%(self.idp_redirect_url, relay_state) "uri": "%s%s" % (self.idp_redirect_url, relay_state)
} }
defer.returnValue((200, result)) defer.returnValue((200, result))
else: else:
@ -119,6 +121,7 @@ class PasswordResetRestServlet(ClientV1RestServlet):
"Missing keys. Requires 'email' and 'user_id'." "Missing keys. Requires 'email' and 'user_id'."
) )
class SAML2RestServlet(ClientV1RestServlet): class SAML2RestServlet(ClientV1RestServlet):
PATTERN = client_path_pattern("/login/saml2") PATTERN = client_path_pattern("/login/saml2")
@ -133,7 +136,8 @@ class SAML2RestServlet(ClientV1RestServlet):
conf = config.SPConfig() conf = config.SPConfig()
conf.load_file(self.sp_config) conf.load_file(self.sp_config)
SP = Saml2Client(conf) SP = Saml2Client(conf)
saml2_auth = SP.parse_authn_request_response(request.args['SAMLResponse'][0], BINDING_HTTP_POST) saml2_auth = SP.parse_authn_request_response(
request.args['SAMLResponse'][0], BINDING_HTTP_POST)
except Exception, e: # Not authenticated except Exception, e: # Not authenticated
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
logger.exception(e) logger.exception(e)
@ -143,15 +147,24 @@ class SAML2RestServlet(ClientV1RestServlet):
(user_id, token) = yield handler.register_saml2(username) (user_id, token) = yield handler.register_saml2(username)
# Forward to the RelayState callback along with ava # Forward to the RelayState callback along with ava
if 'RelayState' in request.args: if 'RelayState' in request.args:
request.redirect(urllib.unquote(request.args['RelayState'][0])+'?status=authenticated&access_token='+token+'&user_id='+user_id+'&ava='+urllib.quote(json.dumps(saml2_auth.ava))) request.redirect(urllib.unquote(
request.args['RelayState'][0]) +
'?status=authenticated&access_token=' +
token + '&user_id=' + user_id + '&ava=' +
urllib.quote(json.dumps(saml2_auth.ava)))
request.finish() request.finish()
defer.returnValue(None) defer.returnValue(None)
defer.returnValue((200, {"status":"authenticated", "user_id": user_id, "token": token, "ava":saml2_auth.ava})) defer.returnValue((200, {"status": "authenticated",
"user_id": user_id, "token": token,
"ava": saml2_auth.ava}))
elif 'RelayState' in request.args: elif 'RelayState' in request.args:
request.redirect(urllib.unquote(request.args['RelayState'][0])+'?status=not_authenticated') request.redirect(urllib.unquote(
request.args['RelayState'][0]) +
'?status=not_authenticated')
request.finish() request.finish()
defer.returnValue(None) defer.returnValue(None)
defer.returnValue((200, {"status":"not_authenticated"})) defer.returnValue((200, {"status": "not_authenticated"}))
def _parse_json(request): def _parse_json(request):
try: try: