Fix addressing issue #2005 including tests

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

@@ -47,14 +47,20 @@ async def get_user_from_token(
             headers={"WWW-Authenticate": "Bearer"},
         )
 
-    username = auth_service.get_username_from_token(token)
-    user = await user_repo.get_user_by_username(username)
+    token_data = auth_service.get_token_data(token)
+    user = await user_repo.get_user_by_username(token_data.username)
     if user is None:
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
             detail="Could not validate credentials",
             headers={"WWW-Authenticate": "Bearer"},
         )
+    if token_data.token_version != user.token_version:
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail="Token has been revoked",
+            headers={"WWW-Authenticate": "Bearer"},
+        )
     return user
 
 
@@ -87,13 +93,18 @@ async def get_current_active_user_from_websocket(
     await websocket.accept()
 
     try:
-        username = auth_service.get_username_from_token(token)
-        user = await user_repo.get_user_by_username(username)
+        token_data = auth_service.get_token_data(token)
+        user = await user_repo.get_user_by_username(token_data.username)
 
         if user is None:
             raise HTTPException(
                 status_code=status.HTTP_401_UNAUTHORIZED,
-                detail=f"Could not validate credentials for '{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}'"
             )
 
         # Super admin is always authorized