refactor: ruff autofixes

gns3server/api/routes/controller/dependencies/authentication.py

@@ -50,14 +50,13 @@ def _reject_refresh_token(token_data) -> None:
 
 
 async def get_user_from_token(
-        request: Request,
-        bearer_token: str = Depends(oauth2_scheme),
-        user_repo: UsersRepository = Depends(get_repository(UsersRepository)),
-        api_keys_repo: ApiKeysRepository = Depends(get_repository(ApiKeysRepository)),
-        token: Optional[str] = Query(None, include_in_schema=False)
+    request: Request,
+    bearer_token: str = Depends(oauth2_scheme),
+    user_repo: UsersRepository = Depends(get_repository(UsersRepository)),
+    api_keys_repo: ApiKeysRepository = Depends(get_repository(ApiKeysRepository)),
+    token: Optional[str] = Query(None, include_in_schema=False),
 ) -> schemas.User:
 
-
     if bearer_token:
         # bearer token is used first, then any token passed as a URL parameter
         token = bearer_token
@@ -147,9 +146,9 @@ async def get_user_from_token(
 
 
 async def get_current_active_user(
-        request: Request,
-        current_user: schemas.User = Depends(get_user_from_token),
-        rbac_repo: RbacRepository = Depends(get_repository(RbacRepository))
+    request: Request,
+    current_user: schemas.User = Depends(get_user_from_token),
+    rbac_repo: RbacRepository = Depends(get_repository(RbacRepository)),
 ) -> schemas.User:
 
     # Super admin is always authorized
@@ -167,9 +166,9 @@ async def get_current_active_user(
 
 
 async def get_current_active_user_from_websocket(
-        websocket: WebSocket,
-        token: str = Query(...),
-        user_repo: UsersRepository = Depends(get_repository(UsersRepository)),
+    websocket: WebSocket,
+    token: str = Query(...),
+    user_repo: UsersRepository = Depends(get_repository(UsersRepository)),
 ) -> Optional[schemas.User]:
 
     # Extract requested subprotocols from headers for proper WebSocket negotiation
@@ -209,12 +208,11 @@ async def get_current_active_user_from_websocket(
         if user is None:
             raise HTTPException(
                 status_code=status.HTTP_401_UNAUTHORIZED,
-                detail=f"Could not validate credentials for '{token_data.username}'"
+                detail=f"Could not validate credentials for '{token_data.username}'",
             )
         if token_data.token_version != user.token_version:
             raise HTTPException(
-                status_code=status.HTTP_401_UNAUTHORIZED,
-                detail=f"Token has been revoked for '{token_data.username}'"
+                status_code=status.HTTP_401_UNAUTHORIZED, detail=f"Token has been revoked for '{token_data.username}'"
             )
 
         # Super admin is always authorized
@@ -223,8 +221,7 @@ async def get_current_active_user_from_websocket(
 
         if not user.is_active:
             raise HTTPException(
-                status_code=status.HTTP_401_UNAUTHORIZED,
-                detail=f"'{token_data.username}' is not an active user"
+                status_code=status.HTTP_401_UNAUTHORIZED, detail=f"'{token_data.username}' is not an active user"
             )
 
         return user
@@ -242,4 +239,3 @@ async def get_current_active_user_from_websocket(
         await websocket.send_json(websocket_error)
         log.error(err_msg)
         return await websocket.close(code=1008)
-

gns3server/api/routes/controller/dependencies/database.py

@@ -22,8 +22,6 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from gns3server.db.repositories.base import BaseRepository
 
 
-
-
 async def get_db_session(request: HTTPConnection) -> AsyncSession:
 
     async with AsyncSession(request.app.state._db_engine, expire_on_commit=False) as session:

gns3server/api/routes/controller/dependencies/rbac.py

@@ -27,30 +27,29 @@ import logging
 log = logging.getLogger()
 
 
-def has_privilege(
-        privilege_name: str
-):
+def has_privilege(privilege_name: str):
     async def get_user_and_check_privilege(
-            request: Request,
-            current_user: schemas.User = Depends(get_current_active_user),
-            rbac_repo: RbacRepository = Depends(get_repository(RbacRepository))
+        request: Request,
+        current_user: schemas.User = Depends(get_current_active_user),
+        rbac_repo: RbacRepository = Depends(get_repository(RbacRepository)),
     ):
         if not current_user.is_superadmin:
             path = re.sub(r"^/v[0-9]", "", request.url.path)  # remove the prefix (e.g. "/v3") from URL path
             log.debug(f"Checking user {current_user.username} has privilege {privilege_name} on '{path}'")
             if not await rbac_repo.check_user_has_privilege(current_user.user_id, path, privilege_name):
-                raise HTTPException(status_code=403, detail=f"Permission denied (privilege {privilege_name} is required)")
+                raise HTTPException(
+                    status_code=403, detail=f"Permission denied (privilege {privilege_name} is required)"
+                )
         return current_user
+
     return get_user_and_check_privilege
 
 
-def has_privilege_on_websocket(
-        privilege_name: str
-):
+def has_privilege_on_websocket(privilege_name: str):
     async def get_user_and_check_privilege(
-            websocket: WebSocket,
-            current_user: schemas.User = Depends(get_current_active_user_from_websocket),
-            rbac_repo: RbacRepository = Depends(get_repository(RbacRepository))
+        websocket: WebSocket,
+        current_user: schemas.User = Depends(get_current_active_user_from_websocket),
+        rbac_repo: RbacRepository = Depends(get_repository(RbacRepository)),
     ):
         # Authentication may have failed and closed the socket inside the auth
         # dependency, returning None — bail out before touching the user object.
@@ -60,10 +59,14 @@ def has_privilege_on_websocket(
             path = re.sub(r"^/v[0-9]", "", websocket.url.path)  # remove the prefix (e.g. "/v3") from URL path
             log.debug(f"Checking user {current_user.username} has privilege {privilege_name} on '{path}'")
             if not await rbac_repo.check_user_has_privilege(current_user.user_id, path, privilege_name):
-                raise HTTPException(status_code=403, detail=f"Permission denied (privilege {privilege_name} is required)")
+                raise HTTPException(
+                    status_code=403, detail=f"Permission denied (privilege {privilege_name} is required)"
+                )
         return current_user
+
     return get_user_and_check_privilege
 
+
 # class PrivilegeChecker:
 #
 #     def __init__(self, required_privilege: str) -> None: