phoenix/litellm
1
0
Fork 0
forked from phoenix/litellm-mirror
Code Pull requests Activity

Fix OpenAPI auth spec.

Browse source
This commit is contained in:
David Manouchehri 2023-11-24 11:59:00 -05:00
parent 0a23af7990
commit 3fa3a767b3
No known key found for this signature in database
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
litellm/proxy/proxy_server.py
View file

@ -88,7 +88,7 @@ from fastapi.routing import APIRouter
from fastapi.encoders import jsonable_encoder from fastapi.encoders import jsonable_encoder
from fastapi.responses import StreamingResponse, FileResponse from fastapi.responses import StreamingResponse, FileResponse
from fastapi.middleware.cors import CORSMiddleware from fastapi.middleware.cors import CORSMiddleware
from fastapi.security import OAuth2PasswordBearer from fastapi.security.api_key import APIKeyHeader
import json import json
import logging import logging
# from litellm.proxy.queue import start_rq_worker_in_background # from litellm.proxy.queue import start_rq_worker_in_background
@ -115,7 +115,6 @@ user_telemetry = True
user_config = None user_config = None
user_headers = None user_headers = None
local_logging = True # writes logs to a local api_log.json file for debugging local_logging = True # writes logs to a local api_log.json file for debugging
oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token")
experimental = False experimental = False
#### GLOBAL VARIABLES #### #### GLOBAL VARIABLES ####
llm_router: Optional[litellm.Router] = None llm_router: Optional[litellm.Router] = None
@ -145,14 +144,15 @@ def usage_telemetry(
target=litellm.utils.litellm_telemetry, args=(data,), daemon=True target=litellm.utils.litellm_telemetry, args=(data,), daemon=True
).start() ).start()
async def user_api_key_auth(request: Request): api_key_header = APIKeyHeader(name="Authorization", auto_error=False)
async def user_api_key_auth(request: Request, api_key: str = fastapi.Security(api_key_header)):
global master_key, prisma_client, llm_model_list global master_key, prisma_client, llm_model_list
if master_key is None: if master_key is None:
return return
try: try:
api_key = await oauth2_scheme(request=request)
route = request.url.path route = request.url.path
if api_key == master_key: if api_key == master_key or api_key == "Bearer " + master_key:
return return
if (route == "/key/generate" or route == "/key/delete") and api_key != master_key: if (route == "/key/generate" or route == "/key/delete") and api_key != master_key: