OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Unpack dictionary in for loop for nicer syntax

pull/299/head
Steven Hammerton 2015-10-12 15:05:34 +01:00
parent ab7f9bb861
commit 83b464e4f7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,16 +127,16 @@ class LoginRestServlet(ClientV1RestServlet):
def do_cas_login(self, cas_response_body): def do_cas_login(self, cas_response_body):
user, attributes = self.parse_cas_response(cas_response_body) user, attributes = self.parse_cas_response(cas_response_body)
for required_attribute in self.cas_required_attributes: for required_attribute, required_value in self.cas_required_attributes.items():
# If required attribute was not in CAS Response - Forbidden # If required attribute was not in CAS Response - Forbidden
if required_attribute not in attributes: if required_attribute not in attributes:
raise LoginError(401, "Unauthorized", errcode=Codes.UNAUTHORIZED) raise LoginError(401, "Unauthorized", errcode=Codes.UNAUTHORIZED)
# Also need to check value # Also need to check value
if self.cas_required_attributes[required_attribute] is not None: if required_value is not None:
actualValue = attributes[required_attribute] actual_value = attributes[required_attribute]
# If required attribute value does not match expected - Forbidden # If required attribute value does not match expected - Forbidden
if self.cas_required_attributes[required_attribute] != actualValue: if required_value != actual_value:
raise LoginError(401, "Unauthorized", errcode=Codes.UNAUTHORIZED) raise LoginError(401, "Unauthorized", errcode=Codes.UNAUTHORIZED)
user_id = UserID.create(user, self.hs.hostname).to_string() user_id = UserID.create(user, self.hs.hostname).to_string()