Cleanup minor whitespace and formatting issues

Signed-off-by: Ivan Kanakarakis <[email protected]>

Author: c00kiemon5ter

src/satosa/backends/saml2.py

@@ -287,9 +287,7 @@ def _translate_response(self, response, state):
             pass
 
         internal_resp.attributes = self.converter.to_internal(
-                                       self.attribute_profile,
-                                       response.ava
-                                       )
+                self.attribute_profile, response.ava)
 
         satosa_logging(logger, logging.DEBUG,
                        "backend received attributes:\n%s" %

src/satosa/base.py

@@ -178,23 +178,24 @@ def _auth_resp_callback_func(self, context, internal_response):
         # If configured construct the user id from attribute values.
         if "user_id_from_attrs" in self.config["INTERNAL_ATTRIBUTES"]:
             user_id = [
-                       "".join(internal_response.attributes[attr]) for attr in
-                       self.config["INTERNAL_ATTRIBUTES"]["user_id_from_attrs"]
-                      ]
+                "".join(internal_response.attributes[attr]) for attr in
+                self.config["INTERNAL_ATTRIBUTES"]["user_id_from_attrs"]
+            ]
             internal_response.user_id = "".join(user_id)
 
         # The authentication response may not contain a user id. For example
         # a SAML IdP may not assert a SAML NameID in the subject and we may
         # not be configured to construct one from asserted attributes.
         # So only hash the user_id if it is not None.
         if internal_response.user_id:
-            user_id = UserIdHasher.hash_data(self.config["USER_ID_HASH_SALT"],
-                                             internal_response.user_id)
+            user_id = UserIdHasher.hash_data(
+                self.config["USER_ID_HASH_SALT"],
+                internal_response.user_id)
             internal_response.user_id = user_id
 
         if self.response_micro_services:
-            return self.response_micro_services[0].process(context,
-                                                           internal_response)
+            return self.response_micro_services[0].process(
+                context, internal_response)
 
         return self._auth_resp_finish(context, internal_response)
 

tests/satosa/backends/test_saml2.py

@@ -193,33 +193,31 @@ def test_authn_response(self, context, idp_conf, sp_conf):
 
     def test_authn_response_no_name_id(self, context, idp_conf, sp_conf):
         response_binding = BINDING_HTTP_REDIRECT
-        fakesp = FakeSP(SPConfig().load(sp_conf, metadata_construction=False))
-        fakeidp = FakeIdP(
-                          USERS,
-                          config=IdPConfig().load(
-                                                  idp_conf,
-                                                  metadata_construction=False
-                                                  )
-                         )
+
+        fakesp_conf = SPConfig().load(sp_conf, metadata_construction=False)
+        fakesp = FakeSP(fakesp_conf)
+
+        fakeidp_conf = IdPConfig().load(idp_conf, metadata_construction=False)
+        fakeidp = FakeIdP(USERS, config=fakeidp_conf)
+
         destination, request_params = fakesp.make_auth_req(
-                                            idp_conf["entityid"])
+            idp_conf["entityid"])
 
         # Use the fake IdP to mock up an authentication request that has no
         # <NameID> element.
         url, auth_resp = fakeidp.handle_auth_req_no_name_id(
-                                    request_params["SAMLRequest"],
-                                    request_params["RelayState"],
-                                    BINDING_HTTP_REDIRECT,
-                                    "testuser1",
-                                    response_binding=response_binding
-                                    )
+            request_params["SAMLRequest"],
+            request_params["RelayState"],
+            BINDING_HTTP_REDIRECT,
+            "testuser1",
+            response_binding=response_binding)
 
         backend = self.samlbackend
 
         context.request = auth_resp
         context.state[backend.name] = {
-                                "relay_state": request_params["RelayState"]
-                                }
+            "relay_state": request_params["RelayState"],
+        }
         backend.authn_response(context, response_binding)
 
         context, internal_resp = backend.auth_callback_func.call_args[0]

tests/util.py

@@ -135,14 +135,13 @@ def __apply_binding_to_authn_response(self,
             resp = {"SAMLResponse": saml_response, "RelayState": relay_state}
         elif response_binding == BINDING_HTTP_REDIRECT:
             http_args = self.apply_binding(
-                            response_binding,
-                            '%s' % resp,
-                            destination,
-                            relay_state,
-                            response=True
-                            )
+                response_binding,
+                '%s' % resp,
+                destination,
+                relay_state,
+                response=True)
             resp = dict(parse_qsl(urlparse(
-                                dict(http_args["headers"])["Location"]).query))
+                dict(http_args["headers"])["Location"]).query))
 
         return resp
 
@@ -166,26 +165,24 @@ def handle_auth_req(self, saml_request, relay_state, binding, userid,
         """
 
         destination, _resp = self.__create_authn_response(
-                                saml_request,
-                                relay_state,
-                                binding,
-                                userid,
-                                response_binding
-                                )
+            saml_request,
+            relay_state,
+            binding,
+            userid,
+            response_binding)
 
         resp = self.__apply_binding_to_authn_response(
-                        _resp,
-                        response_binding,
-                        relay_state,
-                        destination
-                        )
+            _resp,
+            response_binding,
+            relay_state,
+            destination)
 
         return destination, resp
 
     def handle_auth_req_no_name_id(self, saml_request, relay_state, binding,
                                    userid, response_binding=BINDING_HTTP_POST):
         """
-        Handles a SAML request, validates and creates a SAML response but 
+        Handles a SAML request, validates and creates a SAML response but
         without a <NameID> element.
         :type saml_request: str
         :type relay_state: str
@@ -203,22 +200,20 @@ def handle_auth_req_no_name_id(self, saml_request, relay_state, binding,
         """
 
         destination, _resp = self.__create_authn_response(
-                                saml_request,
-                                relay_state,
-                                binding,
-                                userid,
-                                response_binding
-                                )
+            saml_request,
+            relay_state,
+            binding,
+            userid,
+            response_binding)
 
         # Remove the <NameID> element from the response.
         _resp.assertion.subject.name_id = None
 
         resp = self.__apply_binding_to_authn_response(
-                        _resp,
-                        response_binding,
-                        relay_state,
-                        destination
-                        )
+            _resp,
+            response_binding,
+            relay_state,
+            destination)
 
         return destination, resp