Skip to content

Add support for additional SSL certificates #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pbrassel merged 2 commits into from
Sep 23, 2025
Merged

Add support for additional SSL certificates #99

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
364ed6a
fix(ssl): add SSL context to proxy mounts
brucetony Sep 19, 2025
3849d81
style: check style via ruff
pbrassel Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions project/dependencies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,24 @@ def get_client_id(
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="JWT is malformed")


@lru_cache
def get_ssl_context(
settings: Annotated[Settings, Depends(get_settings)],
):
# see https://www.python-httpx.org/advanced/ssl/#configuring-client-instances
ctx = truststore.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
if settings.extra_ca_certs is not None:
ctx.load_verify_locations(cafile=settings.extra_ca_certs)
return ctx


ProxyMount = dict[str, httpx.HTTPTransport] | None


def get_proxy_mounts(settings: Annotated[Settings, Depends(get_settings)]):
def get_proxy_mounts(
settings: Annotated[Settings, Depends(get_settings)],
ssl_context: Annotated[ssl.SSLContext, Depends(get_ssl_context)],
):
proxy = settings.proxy
proxy_mounts = {}

Expand All @@ -127,7 +141,7 @@ def get_proxy_mounts(settings: Annotated[Settings, Depends(get_settings)]):
if http_proxy_set and https_proxy_set:
# if two urls are provided, set them for each mode of transport individually
proxy_mounts["http://"] = httpx.HTTPTransport(proxy=str(proxy.http_url))
proxy_mounts["https://"] = httpx.HTTPTransport(proxy=str(proxy.https_url))
proxy_mounts["https://"] = httpx.HTTPTransport(proxy=str(proxy.https_url), verify=ssl_context)
elif not http_proxy_set and not https_proxy_set:
# if no urls are provided, do nothing
pass
Expand All @@ -136,25 +150,14 @@ def get_proxy_mounts(settings: Annotated[Settings, Depends(get_settings)]):
proxy_url = str(proxy.http_url) if http_proxy_set else str(proxy.https_url)

proxy_mounts["http://"] = httpx.HTTPTransport(proxy=proxy_url)
proxy_mounts["https://"] = httpx.HTTPTransport(proxy=proxy_url)
proxy_mounts["https://"] = httpx.HTTPTransport(proxy=proxy_url, verify=ssl_context)

if len(proxy_mounts) == 0:
return None

return proxy_mounts


@lru_cache
def get_ssl_context(
settings: Annotated[Settings, Depends(get_settings)],
):
# see https://www.python-httpx.org/advanced/ssl/#configuring-client-instances
ctx = truststore.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
if settings.extra_ca_certs is not None:
ctx.load_verify_locations(cafile=settings.extra_ca_certs)
return ctx


def get_flame_hub_auth_flow(
settings: Annotated[Settings, Depends(get_settings)],
ssl_context: Annotated[ssl.SSLContext, Depends(get_ssl_context)],
Expand Down