forked from phoenix/litellm-mirror
fix(_types.py): hash api key, if given
fixes https://github.com/BerriAI/litellm/issues/2114
This commit is contained in:
parent
53df916f69
commit
bafb008b44
2 changed files with 47 additions and 0 deletions
|
@ -800,6 +800,10 @@ class UserAPIKeyAuth(
|
||||||
def check_api_key(cls, values):
|
def check_api_key(cls, values):
|
||||||
if values.get("api_key") is not None:
|
if values.get("api_key") is not None:
|
||||||
values.update({"token": hash_token(values.get("api_key"))})
|
values.update({"token": hash_token(values.get("api_key"))})
|
||||||
|
if isinstance(values.get("api_key"), str) and values.get(
|
||||||
|
"api_key"
|
||||||
|
).startswith("sk-"):
|
||||||
|
values.update({"api_key": hash_token(values.get("api_key"))})
|
||||||
return values
|
return values
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1925,3 +1925,46 @@ async def test_proxy_load_test_db(prisma_client):
|
||||||
raise Exception(f"it worked! key={key.key}")
|
raise Exception(f"it worked! key={key.key}")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
pytest.fail(f"An exception occurred - {str(e)}")
|
pytest.fail(f"An exception occurred - {str(e)}")
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio()
|
||||||
|
async def test_master_key_hashing(prisma_client):
|
||||||
|
try:
|
||||||
|
|
||||||
|
print("prisma client=", prisma_client)
|
||||||
|
|
||||||
|
master_key = "sk-1234"
|
||||||
|
|
||||||
|
setattr(litellm.proxy.proxy_server, "prisma_client", prisma_client)
|
||||||
|
setattr(litellm.proxy.proxy_server, "master_key", master_key)
|
||||||
|
|
||||||
|
await litellm.proxy.proxy_server.prisma_client.connect()
|
||||||
|
from litellm.proxy.proxy_server import user_api_key_cache
|
||||||
|
|
||||||
|
_response = await new_user(
|
||||||
|
data=NewUserRequest(
|
||||||
|
models=["azure-gpt-3.5"],
|
||||||
|
team_id="ishaans-special-team",
|
||||||
|
tpm_limit=20,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
print(_response)
|
||||||
|
assert _response.models == ["azure-gpt-3.5"]
|
||||||
|
assert _response.team_id == "ishaans-special-team"
|
||||||
|
assert _response.tpm_limit == 20
|
||||||
|
|
||||||
|
bearer_token = "Bearer " + master_key
|
||||||
|
|
||||||
|
request = Request(scope={"type": "http"})
|
||||||
|
request._url = URL(url="/chat/completions")
|
||||||
|
|
||||||
|
# use generated key to auth in
|
||||||
|
result: UserAPIKeyAuth = await user_api_key_auth(
|
||||||
|
request=request, api_key=bearer_token
|
||||||
|
)
|
||||||
|
|
||||||
|
assert result.api_key == hash_token(master_key)
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
print("Got Exception", e)
|
||||||
|
pytest.fail(f"Got exception {e}")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue