chore(python3): black

fence/__init__.py

@@ -18,7 +18,7 @@
 from fence.resources.aws.boto_manager import BotoManager
 from fence.resources.openid.google_oauth2 import GoogleOauth2Client as GoogleClient
 from fence.resources.openid.microsoft_oauth2 import (
-    MicrosoftOauth2Client as MicrosoftClient
+    MicrosoftOauth2Client as MicrosoftClient,
 )
 from fence.resources.openid.orcid_oauth2 import OrcidOauth2Client as ORCIDClient
 from fence.resources.storage import StorageManager

fence/blueprints/google.py

@@ -458,16 +458,12 @@ def _update_service_account_permissions(self, sa):
 
         except CirrusNotFound as exc:
             return (
-                "Can not update the service accout {}. Detail {}".format(
-                    sa.email, exc
-                ),
+                "Can not update the service accout {}. Detail {}".format(sa.email, exc),
                 404,
             )
         except GoogleAPIError as exc:
             return (
-                "Can not update the service accout {}. Detail {}".format(
-                    sa.email, exc
-                ),
+                "Can not update the service accout {}. Detail {}".format(sa.email, exc),
                 400,
             )
         except Exception:
@@ -502,16 +498,12 @@ def _delete(self, id_):
             force_delete_service_account(service_account_email)
         except CirrusNotFound as exc:
             return (
-                "Can not remove the service accout {}. Detail {}".format(
-                    id_, exc
-                ),
+                "Can not remove the service accout {}. Detail {}".format(id_, exc),
                 404,
             )
         except GoogleAPIError as exc:
             return (
-                "Can not remove the service accout {}. Detail {}".format(
-                    id_, exc
-                ),
+                "Can not remove the service accout {}. Detail {}".format(id_, exc),
                 400,
             )
         except Exception:

fence/blueprints/login/fence_login.py

@@ -30,8 +30,7 @@ def get(self):
             validate_redirect(redirect_url)
             flask.session["redirect"] = redirect_url
         authorization_url, state = flask.current_app.fence_client.generate_authorize_redirect(
-            oauth2_redirect_uri,
-            prompt="login"
+            oauth2_redirect_uri, prompt="login"
         )
         flask.session["state"] = state
         return flask.redirect(authorization_url)

fence/blueprints/login/redirect.py

@@ -32,8 +32,6 @@ def validate_redirect(url):
     allowed_redirects = allowed_login_redirects()
     if domain(url) not in allowed_redirects:
         flask.current_app.logger.error(
-            "invalid redirect {}. expected one of: {}".format(
-                url, allowed_redirects
-            )
+            "invalid redirect {}. expected one of: {}".format(url, allowed_redirects)
         )
         raise UserError("invalid login redirect URL {}".format(url))

fence/blueprints/login/utils.py

@@ -1,4 +1,4 @@
-from urlparse import urlparse
+from urllib.parse import urlparse
 
 import flask
 

fence/oidc/endpoints.py

@@ -56,7 +56,9 @@ def validate_authenticate_client(self):
         # authorization header to check against stored hash.
         hashed = client.client_secret
         if (
-            bcrypt.hashpw(client_secret.encode("utf-8"), hashed.encode("utf-8")).decode("utf-8")
+            bcrypt.hashpw(client_secret.encode("utf-8"), hashed.encode("utf-8")).decode(
+                "utf-8"
+            )
             != hashed
         ):
             logger.debug("client secret hash does not match stored secret hash")

fence/oidc/grants/authorization_code_grant.py

@@ -135,7 +135,9 @@ def authenticate_client(self):
             # Client secrets are stored as hash.
             hashed = client.client_secret
             if (
-                bcrypt.hashpw(client_secret.encode("utf-8"), hashed.encode("utf-8")).decode("utf-8")
+                bcrypt.hashpw(
+                    client_secret.encode("utf-8"), hashed.encode("utf-8")
+                ).decode("utf-8")
                 != hashed
             ):
                 raise InvalidClientError(uri=self.uri)

fence/resources/aws/boto_manager.py

@@ -150,9 +150,7 @@ def get_user_group(self, group_names):
                     res[group["GroupName"]] = group
         except Exception as ex:
             self.logger.exception(ex)
-            raise UserError(
-                "Fail to get list of groups {}: {}".format(group_names, ex)
-            )
+            raise UserError("Fail to get list of groups {}: {}".format(group_names, ex))
         return res
 
     def create_user_group(self, group_name, path=None):
@@ -163,9 +161,7 @@ def create_user_group(self, group_name, path=None):
             )
         except Exception as ex:
             self.logger.exception(ex)
-            raise UserError(
-                "Fail to create group {}: {}".format(group_name, ex)
-            )
+            raise UserError("Fail to create group {}: {}".format(group_name, ex))
         return group
 
     def __get_policy_document_by_group_name__(self, group_name):

fence/resources/openid/google_oauth2.py

@@ -30,7 +30,9 @@ def get_auth_url(self):
         authorization_endpoint = self.get_value_from_discovery_doc(
             "authorization_endpoint", "https://accounts.google.com/o/oauth2/v2/auth"
         )
-        uri, _ = self.session.create_authorization_url(authorization_endpoint, prompt="login")
+        uri, _ = self.session.create_authorization_url(
+            authorization_endpoint, prompt="login"
+        )
 
         return uri
 

fence/resources/openid/microsoft_oauth2.py

@@ -30,7 +30,9 @@ def get_auth_url(self):
             "authorization_endpoint",
             "https://login.microsoftonline.com/organizations/oauth2/v2.0/authorize",
         )
-        uri, _ = self.session.create_authorization_url(authorization_endpoint, prompt="login")
+        uri, _ = self.session.create_authorization_url(
+            authorization_endpoint, prompt="login"
+        )
 
         return uri
 

fence/resources/openid/orcid_oauth2.py

@@ -28,7 +28,9 @@ def get_auth_url(self):
             "authorization_endpoint", "https://orcid.org/oauth/authorize"
         )
 
-        uri, state = self.session.create_authorization_url(authorization_endpoint, prompt="login")
+        uri, state = self.session.create_authorization_url(
+            authorization_endpoint, prompt="login"
+        )
 
         return uri
 

fence/sync/sync_users.py

@@ -93,7 +93,19 @@ def _read_file(filepath, encrypted=True, key=None, logger=None):
             # TODO (rudyardrichter, 2019-01-08): raise error and move exit out to script
             exit(1)
         p = sp.Popen(
-            ["mcrypt", "-a", "enigma", "-o", "scrypt", "-m", "stream", "--bare", "--key", key, "--force"],
+            [
+                "mcrypt",
+                "-a",
+                "enigma",
+                "-o",
+                "scrypt",
+                "-m",
+                "stream",
+                "--bare",
+                "--key",
+                key,
+                "--force",
+            ],
             stdin=open(filepath, "r"),
             stdout=sp.PIPE,
             stderr=open(os.devnull, "w"),
@@ -953,7 +965,9 @@ def _sync(self, sess):
 
         permissions = [{"read-storage"} for _ in local_csv_file_list]
         user_projects_csv, user_info_csv = self._parse_csv(
-            dict(list(zip(local_csv_file_list, permissions))), encrypted=False, sess=sess
+            dict(list(zip(local_csv_file_list, permissions))),
+            encrypted=False,
+            sess=sess,
         )
 
         try:

fence/utils.py

@@ -52,7 +52,9 @@ def create_client(
     hashed_secret = None
     if confidential:
         client_secret = random_str(55)
-        hashed_secret = bcrypt.hashpw(client_secret.encode('utf-8'), bcrypt.gensalt()).decode("utf-8")
+        hashed_secret = bcrypt.hashpw(
+            client_secret.encode("utf-8"), bcrypt.gensalt()
+        ).decode("utf-8")
     auth_method = "client_secret_basic" if confidential else "none"
     with driver.session as s:
         user = query_for_user(session=s, username=username)

tests/admin/test_admin_users.py

@@ -206,6 +206,6 @@ def test_get_user_groups(db_session, awg_users):
             "projects": ["test_project_1"],
         },
     ]
-    expected_groups.sort(key=lambda x: x['name'])
-    groups["groups"].sort(key=lambda x: x['name'])
+    expected_groups.sort(key=lambda x: x["name"])
+    groups["groups"].sort(key=lambda x: x["name"])
     assert groups["groups"] == expected_groups

tests/admin/test_admin_users_endpoints.py

@@ -57,7 +57,9 @@ def encoded_admin_jwt(kid, rsa_private_key):
     claims["sub"] = "5678"
     claims["iss"] = config["BASE_URL"]
     claims["exp"] += 600
-    return jwt.encode(claims, key=rsa_private_key, headers=headers, algorithm="RS256").decode("utf-8")
+    return jwt.encode(
+        claims, key=rsa_private_key, headers=headers, algorithm="RS256"
+    ).decode("utf-8")
 
 
 # Dictionary for all these random magic numbers that the delete user

tests/conftest.py

@@ -277,7 +277,7 @@ def app(kid, rsa_private_key, rsa_public_key):
     )
 
     config.update(BASE_URL=config["BASE_URL"])
-    config.update(ENCRYPTION_KEY=Fernet.generate_key().decode('utf-8'))
+    config.update(ENCRYPTION_KEY=Fernet.generate_key().decode("utf-8"))
 
     return fence.app
 
@@ -856,7 +856,9 @@ def oauth_client(app, db_session, oauth_user):
     url = "https://oauth-test-client.net"
     client_id = "test-client"
     client_secret = fence.utils.random_str(50)
-    hashed_secret = bcrypt.hashpw(client_secret.encode('utf-8'), bcrypt.gensalt()).decode("utf-8")
+    hashed_secret = bcrypt.hashpw(
+        client_secret.encode("utf-8"), bcrypt.gensalt()
+    ).decode("utf-8")
     test_user = db_session.query(models.User).filter_by(id=oauth_user.user_id).first()
     db_session.add(
         models.Client(
@@ -884,7 +886,9 @@ def oauth_client_B(app, request, db_session):
     url = "https://oauth-test-client-B.net"
     client_id = "test-client-B"
     client_secret = fence.utils.random_str(50)
-    hashed_secret = bcrypt.hashpw(client_secret.encode('utf-8'), bcrypt.gensalt()).decode("utf-8")
+    hashed_secret = bcrypt.hashpw(
+        client_secret.encode("utf-8"), bcrypt.gensalt()
+    ).decode("utf-8")
 
     test_user = db_session.query(models.User).filter_by(username="test").first()
     if not test_user:

tests/session/test_session.py

@@ -267,9 +267,7 @@ def test_valid_session_valid_access_token_diff_user(
 
 def _get_cookies_from_response(response):
     raw_cookies = [
-        header[1]
-        for header in response.headers.items()
-        if header[0] == "Set-Cookie"
+        header[1] for header in response.headers.items() if header[0] == "Set-Cookie"
     ]
     cookies = {}
     for cookie in raw_cookies: