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

fix - oidc provider on python3.8

Browse source
This commit is contained in:
Ishaan Jaff 2024-05-11 16:01:34 -07:00
parent d7f7120880
commit 0887e9cc0d
1 changed files with 59 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

27
litellm/utils.py
View file

@ -9554,15 +9554,12 @@ def get_secret(
secret_name_split = secret_name.replace("oidc/", "") secret_name_split = secret_name.replace("oidc/", "")
oidc_provider, oidc_aud = secret_name_split.split("/", 1) oidc_provider, oidc_aud = secret_name_split.split("/", 1)
# TODO: Add caching for HTTP requests # TODO: Add caching for HTTP requests
match oidc_provider: if oidc_provider == "google":
case "google":
oidc_token = oidc_cache.get_cache(key=secret_name) oidc_token = oidc_cache.get_cache(key=secret_name)
if oidc_token is not None: if oidc_token is not None:
return oidc_token return oidc_token
oidc_client = HTTPHandler( oidc_client = HTTPHandler(timeout=httpx.Timeout(timeout=600.0, connect=5.0))
timeout=httpx.Timeout(timeout=600.0, connect=5.0)
)
# https://cloud.google.com/compute/docs/instances/verifying-instance-identity#request_signature # https://cloud.google.com/compute/docs/instances/verifying-instance-identity#request_signature
response = oidc_client.get( response = oidc_client.get(
"http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/default/identity", "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/default/identity",
@ -9571,30 +9568,26 @@ def get_secret(
) )
if response.status_code == 200: if response.status_code == 200:
oidc_token = response.text oidc_token = response.text
oidc_cache.set_cache( oidc_cache.set_cache(key=secret_name, value=oidc_token, ttl=3600 - 60)
key=secret_name, value=oidc_token, ttl=3600 - 60
)
return oidc_token return oidc_token
else: else:
raise ValueError("Google OIDC provider failed") raise ValueError("Google OIDC provider failed")
case "circleci": elif oidc_provider == "circleci":
# https://circleci.com/docs/openid-connect-tokens/ # https://circleci.com/docs/openid-connect-tokens/
env_secret = os.getenv("CIRCLE_OIDC_TOKEN") env_secret = os.getenv("CIRCLE_OIDC_TOKEN")
if env_secret is None: if env_secret is None:
raise ValueError("CIRCLE_OIDC_TOKEN not found in environment") raise ValueError("CIRCLE_OIDC_TOKEN not found in environment")
return env_secret return env_secret
case "circleci_v2": elif oidc_provider == "circleci_v2":
# https://circleci.com/docs/openid-connect-tokens/ # https://circleci.com/docs/openid-connect-tokens/
env_secret = os.getenv("CIRCLE_OIDC_TOKEN_V2") env_secret = os.getenv("CIRCLE_OIDC_TOKEN_V2")
if env_secret is None: if env_secret is None:
raise ValueError("CIRCLE_OIDC_TOKEN_V2 not found in environment") raise ValueError("CIRCLE_OIDC_TOKEN_V2 not found in environment")
return env_secret return env_secret
case "github": elif oidc_provider == "github":
# https://docs.github.com/en/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-cloud-providers#using-custom-actions # https://docs.github.com/en/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-cloud-providers#using-custom-actions
actions_id_token_request_url = os.getenv("ACTIONS_ID_TOKEN_REQUEST_URL") actions_id_token_request_url = os.getenv("ACTIONS_ID_TOKEN_REQUEST_URL")
actions_id_token_request_token = os.getenv( actions_id_token_request_token = os.getenv("ACTIONS_ID_TOKEN_REQUEST_TOKEN")
"ACTIONS_ID_TOKEN_REQUEST_TOKEN"
)
if ( if (
actions_id_token_request_url is None actions_id_token_request_url is None
or actions_id_token_request_token is None or actions_id_token_request_token is None
@ -9607,9 +9600,7 @@ def get_secret(
if oidc_token is not None: if oidc_token is not None:
return oidc_token return oidc_token
oidc_client = HTTPHandler( oidc_client = HTTPHandler(timeout=httpx.Timeout(timeout=600.0, connect=5.0))
timeout=httpx.Timeout(timeout=600.0, connect=5.0)
)
response = oidc_client.get( response = oidc_client.get(
actions_id_token_request_url, actions_id_token_request_url,
params={"audience": oidc_aud}, params={"audience": oidc_aud},
@ -9624,7 +9615,7 @@ def get_secret(
return oidc_token return oidc_token
else: else:
raise ValueError("Github OIDC provider failed") raise ValueError("Github OIDC provider failed")
case _: else:
raise ValueError("Unsupported OIDC provider") raise ValueError("Unsupported OIDC provider")
try: try: