Merge pull request #798 from BC-SECURITY/release/6.2.1

v6.2.1 into main

Author: vinnybod

CHANGELOG.md

@@ -14,6 +14,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [6.2.1] - 2025-09-05
+
+-   Fix bug where websocket connection would fail because the jwt_auth method arguments changed
+
 ## [6.2.0] - 2025-09-02
 
 -   Updated Starkiller to v3.1.0
@@ -1152,7 +1156,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -   Updated shellcoderdi to newest version (@Cx01N)
 -   Added a Nim launcher (@Hubbl3)
 
-[Unreleased]: https://github.com/BC-SECURITY/Empire-Sponsors/compare/v6.2.0...HEAD
+[Unreleased]: https://github.com/BC-SECURITY/Empire-Sponsors/compare/v6.2.1...HEAD
+
+[6.2.1]: https://github.com/BC-SECURITY/Empire-Sponsors/compare/v6.2.0...v6.2.1
 
 [6.2.0]: https://github.com/BC-SECURITY/Empire-Sponsors/compare/v6.1.4...v6.2.0
 

empire/server/api/jwt_auth.py

@@ -90,9 +90,9 @@ def get_token_from_headers(request: Request) -> str:
     )
 
 
-async def get_current_user(
+async def get_current_user_from_token(
     db: CurrentSession,
-    request: Request,
+    token: str,
 ):
     credentials_exception = HTTPException(
         status_code=status.HTTP_401_UNAUTHORIZED,
@@ -101,7 +101,6 @@ async def get_current_user(
     )
 
     try:
-        token = get_token_from_headers(request)
         payload = jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM])
         username: str = payload.get("sub")
         if username is None:
@@ -118,6 +117,14 @@ async def get_current_user(
     return user
 
 
+async def get_current_user(
+    db: CurrentSession,
+    request: Request,
+):
+    token = get_token_from_headers(request)
+    return await get_current_user_from_token(db, token)
+
+
 CurrentUser = Annotated[models.User, Depends(get_current_user)]
 
 

empire/server/api/v2/websocket/socketio.py

@@ -31,7 +31,7 @@ def setup_socket_events(sio, empire_menu):  # noqa: PLR0915
     sid_to_user = {}
 
     async def get_user_from_token(sid, token, db: Session):
-        user = await jwt_auth.get_current_user(db, token)
+        user = await jwt_auth.get_current_user_from_token(db, token)
         if user is None:
             return False
         sid_to_user[sid] = user.id

empire/server/common/empire.py

@@ -34,7 +34,7 @@
 if TYPE_CHECKING:
     from socket import SocketIO
 
-VERSION = "6.2.0 BC Security Fork"
+VERSION = "6.2.1 BC Security Fork"
 
 log = logging.getLogger(__name__)
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "empire-bc-security-fork"
-version = "6.2.0"
+version = "6.2.1"
 description = ""
 authors = ["BC Security <info@bc-security.org>"]
 readme = "README.md"