black autofixes

Author: g-as

djangosaml2/overrides.py

@@ -19,9 +19,9 @@ class Saml2Client(saml2.client.Saml2Client):
     def do_logout(self, *args, **kwargs):
         if not kwargs.get("expected_binding"):
             try:
-                kwargs[
-                    "expected_binding"
-                ] = settings.SAML_LOGOUT_REQUEST_PREFERRED_BINDING
+                kwargs["expected_binding"] = (
+                    settings.SAML_LOGOUT_REQUEST_PREFERRED_BINDING
+                )
             except AttributeError:
                 logger.warning(
                     "SAML_LOGOUT_REQUEST_PREFERRED_BINDING setting is"

djangosaml2/tests/__init__.py

@@ -139,9 +139,9 @@ def add_outstanding_query(self, session_id, came_from):
             came_from,
         )
         self.saml_session.save()
-        self.client.cookies[
-            settings.SESSION_COOKIE_NAME
-        ] = self.saml_session.session_key
+        self.client.cookies[settings.SESSION_COOKIE_NAME] = (
+            self.saml_session.session_key
+        )
 
     def b64_for_post(self, xml_text, encoding="utf-8"):
         return base64.b64encode(xml_text.encode(encoding)).decode("ascii")
@@ -308,8 +308,12 @@ def test_unknown_idp(self):
             metadata_file="remote_metadata_three_idps.xml",
         )
 
-        response = self.client.get(reverse("saml2_login") + "?idp=<b>https://unknown.org</b>")
-        self.assertContains(response, "&lt;b&gt;https://unknown.org&lt;/b&gt;", status_code=403)
+        response = self.client.get(
+            reverse("saml2_login") + "?idp=<b>https://unknown.org</b>"
+        )
+        self.assertContains(
+            response, "&lt;b&gt;https://unknown.org&lt;/b&gt;", status_code=403
+        )
 
     def test_login_authn_context(self):
         sp_kwargs = {

djangosaml2/utils.py

@@ -47,7 +47,7 @@ def available_idps(config: SPConfig, langpref=None, idp_to_check: str = None) ->
     for metadata in config.metadata.metadata.values():
         # initiate a fetch to the selected idp when using MDQ, otherwise the MetaDataMDX is an empty database
         if isinstance(metadata, MetaDataMDX) and idp_to_check:
-            m = metadata[idp_to_check]
+            m = metadata[idp_to_check]  # noqa: F841
         result = metadata.any("idpsso_descriptor", "single_sign_on_service")
         if result:
             idps.update(result.keys())
@@ -108,11 +108,7 @@ def validate_referral_url(request, url):
     # SAML_STRICT_URL_VALIDATION setting can be used to turn off this check.
     # This should only happen if there is no slash, host and/or protocol in the
     # given URL. A better fix would be to add those to the RelayState.
-    saml_strict_url_validation = getattr(
-        settings,
-        "SAML_STRICT_URL_VALIDATION",
-        True
-    )
+    saml_strict_url_validation = getattr(settings, "SAML_STRICT_URL_VALIDATION", True)
     try:
         if saml_strict_url_validation:
             # This will also resolve Django URL pattern names
@@ -133,8 +129,7 @@ def validate_referral_url(request, url):
     )
 
     if not url_has_allowed_host_and_scheme(url=url, allowed_hosts=saml_allowed_hosts):
-        logger.debug("Referral URL not in SAML_ALLOWED_HOSTS or of the origin "
-                     "host.")
+        logger.debug("Referral URL not in SAML_ALLOWED_HOSTS or of the origin host.")
         return None
 
     return url

djangosaml2/views.py

@@ -135,7 +135,7 @@ def get_state_client(self, request: HttpRequest):
         return state, client
 
 
-@method_decorator(saml2_csp_update, name='dispatch')
+@method_decorator(saml2_csp_update, name="dispatch")
 class LoginView(SPConfigMixin, View):
     """SAML Authorization Request initiator.
 
@@ -389,7 +389,7 @@ def get(self, request, *args, **kwargs):
                 except TemplateDoesNotExist as e:
                     logger.debug(
                         f"TemplateDoesNotExist: [{self.post_binding_form_template}] - {e}",
-                        exc_info=True
+                        exc_info=True,
                     )
 
             if not http_response:
@@ -574,7 +574,7 @@ def post(self, request, attribute_mapping=None, create_unknown_user=None):
                 session_info,
                 attribute_mapping,
                 create_unknown_user,
-                assertion_info
+                assertion_info,
             )
         except PermissionDenied as e:
             return self.handle_acs_failure(
@@ -592,21 +592,21 @@ def post(self, request, attribute_mapping=None, create_unknown_user=None):
         if not relay_state:
             logger.debug(
                 "RelayState is not a valid URL, redirecting to fallback: %s",
-                relay_state
+                relay_state,
             )
             return HttpResponseRedirect(get_fallback_login_redirect_url())
 
         logger.debug("Redirecting to the RelayState: %s", relay_state)
         return HttpResponseRedirect(relay_state)
 
     def authenticate_user(
-            self,
-            request,
-            session_info,
-            attribute_mapping,
-            create_unknown_user,
-            assertion_info
-        ):
+        self,
+        request,
+        session_info,
+        attribute_mapping,
+        create_unknown_user,
+        assertion_info,
+    ):
         """Calls Django's authenticate method after the SAML response is verified"""
         logger.debug("Trying to authenticate the user. Session info: %s", session_info)
 
@@ -685,7 +685,7 @@ def get(self, request, *args, **kwargs):
         )
 
 
-@method_decorator(saml2_csp_update, name='dispatch')
+@method_decorator(saml2_csp_update, name="dispatch")
 class LogoutInitView(LoginRequiredMixin, SPConfigMixin, View):
     """SAML Logout Request initiator
 
@@ -801,7 +801,9 @@ def do_logout_service(self, request, data, binding, *args, **kwargs):
                 )
             except StatusError as e:
                 response = None
-                logger.warning(f"Error logging out from remote provider: {e}", exc_info=True)
+                logger.warning(
+                    f"Error logging out from remote provider: {e}", exc_info=True
+                )
             state.sync()
             return finish_logout(request, response)
 
@@ -853,13 +855,16 @@ def finish_logout(request, response):
             return HttpResponseRedirect(next_path)
         elif settings.LOGOUT_REDIRECT_URL is not None:
             fallback_url = resolve_url(settings.LOGOUT_REDIRECT_URL)
-            logger.debug("No valid RelayState found; Redirecting to "
-                         "LOGOUT_REDIRECT_URL")
+            logger.debug(
+                "No valid RelayState found; Redirecting to " "LOGOUT_REDIRECT_URL"
+            )
             return HttpResponseRedirect(fallback_url)
         else:
             current_site = get_current_site(request)
-            logger.debug("No valid RelayState or LOGOUT_REDIRECT_URL found, "
-                         "rendering fallback template.")
+            logger.debug(
+                "No valid RelayState or LOGOUT_REDIRECT_URL found, "
+                "rendering fallback template."
+            )
             return render(
                 request,
                 "registration/logged_out.html",