Skip to content

fix: strip newlines from NO_PROXY env var values #3372

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

Open
Oxygen56 wants to merge 1 commit into
base: main
Choose a base branch
from
+33 −0
Open

fix: strip newlines from NO_PROXY env var values #3372

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 33 additions & 0 deletions src/openai/_base_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from __future__ import annotations

import os
import sys
import json
import time
Expand Down Expand Up @@ -93,6 +94,36 @@
log: logging.Logger = logging.getLogger(__name__)
log.addFilter(SensitiveHeadersFilter())


def _sanitize_proxy_env() -> None:
"""Strip whitespace/newlines from proxy-related environment variables.

In Docker/Kubernetes environments, proxy env vars (especially ``NO_PROXY``)
can contain embedded newlines that cause httpx/urllib to raise
``InvalidURL`` when parsing proxy URLs.
"""
# Comma-separated host lists: split, strip each entry, rejoin
for key in ("NO_PROXY", "no_proxy"):
val = os.environ.get(key)
if val and "\n" in val:
os.environ[key] = ",".join(
part.strip() for part in val.replace("\n", ",").split(",") if part.strip()
)

# Single-URL vars: just strip surrounding whitespace
for key in (
"HTTP_PROXY",
"http_proxy",
"HTTPS_PROXY",
"https_proxy",
"ALL_PROXY",
"all_proxy",
):
val = os.environ.get(key)
if val:
os.environ[key] = val.strip()


# TODO: make base page type vars covariant
SyncPageT = TypeVar("SyncPageT", bound="BaseSyncPage[Any]")
AsyncPageT = TypeVar("AsyncPageT", bound="BaseAsyncPage[Any]")
Expand Down Expand Up @@ -836,6 +867,7 @@ def __init__(self, **kwargs: Any) -> None:
kwargs.setdefault("timeout", DEFAULT_TIMEOUT)
kwargs.setdefault("limits", DEFAULT_CONNECTION_LIMITS)
kwargs.setdefault("follow_redirects", True)
_sanitize_proxy_env()
super().__init__(**kwargs)


Expand Down Expand Up @@ -1423,6 +1455,7 @@ def __init__(self, **kwargs: Any) -> None:
kwargs.setdefault("timeout", DEFAULT_TIMEOUT)
kwargs.setdefault("limits", DEFAULT_CONNECTION_LIMITS)
kwargs.setdefault("follow_redirects", True)
_sanitize_proxy_env()
super().__init__(**kwargs)


Expand Down