"git@developer.sourcefind.cn:chenpangpang/open-webui.git" did not exist on "0def6f87249295506d1e2dfd56114b99d1b38f8d"
Commit ab270c16 authored by Timothy J. Baek's avatar Timothy J. Baek
Browse files

fix

parent 1e045322
...@@ -325,6 +325,7 @@ class ChatCompletionMiddleware(BaseHTTPMiddleware): ...@@ -325,6 +325,7 @@ class ChatCompletionMiddleware(BaseHTTPMiddleware):
data = json.loads(body_str) if body_str else {} data = json.loads(body_str) if body_str else {}
user = get_current_user( user = get_current_user(
request,
get_http_authorization_cred(request.headers.get("Authorization")) get_http_authorization_cred(request.headers.get("Authorization"))
) )
...@@ -558,6 +559,7 @@ class PipelineMiddleware(BaseHTTPMiddleware): ...@@ -558,6 +559,7 @@ class PipelineMiddleware(BaseHTTPMiddleware):
data = json.loads(body_str) if body_str else {} data = json.loads(body_str) if body_str else {}
user = get_current_user( user = get_current_user(
request,
get_http_authorization_cred(request.headers.get("Authorization")) get_http_authorization_cred(request.headers.get("Authorization"))
) )
......
...@@ -25,7 +25,6 @@ ALGORITHM = "HS256" ...@@ -25,7 +25,6 @@ ALGORITHM = "HS256"
############## ##############
bearer_security = HTTPBearer(auto_error=False) bearer_security = HTTPBearer(auto_error=False)
pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto") pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
...@@ -79,15 +78,17 @@ def get_current_user( ...@@ -79,15 +78,17 @@ def get_current_user(
request: Request, request: Request,
auth_token: HTTPAuthorizationCredentials = Depends(bearer_security), auth_token: HTTPAuthorizationCredentials = Depends(bearer_security),
): ):
# get token from cookie token = None
token = request.cookies.get("token")
if auth_token is None and token is None:
raise HTTPException(status_code=403, detail="Not authenticated")
if auth_token is not None: if auth_token is not None:
token = auth_token.credentials token = auth_token.credentials
if token is None and "token" in request.cookies:
token = request.cookies.get("token")
if token is None:
raise HTTPException(status_code=403, detail="Not authenticated")
# auth by api key # auth by api key
if token.startswith("sk-"): if token.startswith("sk-"):
return get_current_user_by_api_key(token) return get_current_user_by_api_key(token)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment