BUG: fix error when xinference run on docker with oath2 (#4161)

Author: OliverBryant

setup.cfg

@@ -43,8 +43,7 @@ install_requires =
     sse_starlette>=1.6.5  # ensure_bytes API break change: https://github.com/sysid/sse-starlette/issues/65
     openai>=1.40.0  # For typing
     python-jose[cryptography]
-    passlib[bcrypt]<1.8.0
-    bcrypt<4.1.0
+    bcrypt>=4.0.0
     aioprometheus[starlette]>=23.12.0
     nvidia-ml-py
     pynvml>=12

xinference/api/oauth2/utils.py

@@ -14,10 +14,8 @@
 from datetime import datetime, timedelta
 from typing import Union
 
+import bcrypt
 from jose import jwt
-from passlib.context import CryptContext
-
-pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
 
 
 def create_access_token(
@@ -37,8 +35,31 @@ def create_access_token(
 
 
 def verify_password(plain_password, hashed_password):
-    return pwd_context.verify(plain_password, hashed_password)
+    if isinstance(plain_password, str):
+        plain_password = plain_password.encode("utf-8")
+    if isinstance(hashed_password, str):
+        hashed_password = hashed_password.encode("utf-8")
+
+    if len(plain_password) > 72:
+        import hashlib
+
+        password_hash = hashlib.sha256(plain_password).digest()
+        plain_password = password_hash[:72]
+
+    return bcrypt.checkpw(plain_password, hashed_password)
 
 
 def get_password_hash(password):
-    return pwd_context.hash(password)
+    if isinstance(password, str):
+        password = password.encode("utf-8")
+
+    if len(password) > 72:
+        import hashlib
+
+        password_hash = hashlib.sha256(password).digest()
+        password = password_hash[:72]
+
+    salt = bcrypt.gensalt()
+    hashed = bcrypt.hashpw(password, salt)
+
+    return hashed.decode("utf-8")

xinference/deploy/docker/requirements/requirements-base.txt

@@ -14,7 +14,7 @@ modelscope>=1.10.0
 sse_starlette>=1.6.5  # ensure_bytes API break change: https://github.com/sysid/sse-starlette/issues/65
 openai>=1.40.0  # For typing
 python-jose[cryptography]
-passlib[bcrypt]
+bcrypt>=4.0.0
 aioprometheus[starlette]>=23.12.0
 nvidia-ml-py
 pynvml>=12

xinference/deploy/docker/requirements_12.8/requirements-cu128-base.txt

@@ -14,7 +14,7 @@ modelscope>=1.10.0
 sse_starlette>=1.6.5  # ensure_bytes API break change: https://github.com/sysid/sse-starlette/issues/65
 openai>=1.40.0  # For typing
 python-jose[cryptography]
-passlib[bcrypt]
+bcrypt>=4.0.0
 aioprometheus[starlette]>=23.12.0
 nvidia-ml-py
 pynvml>=12

xinference/deploy/docker/requirements_cpu/requirements_cpu-base.txt

@@ -14,7 +14,7 @@ boto3>=1.28.55,<1.28.65
 sse_starlette>=1.6.5
 openai>1
 python-jose[cryptography]
-passlib[bcrypt]
+bcrypt>=4.0.0
 aioprometheus[starlette]>=23.12.0
 nvidia-ml-py
 async-timeout