Skip to content

fix: reject non-default OpenAI base URL ports #3434

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

Closed
pragnyanramtha wants to merge 1 commit into from
Closed

fix: reject non-default OpenAI base URL ports #3434

Show file tree
Hide file tree
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
11 changes: 10 additions & 1 deletion src/agents/models/openai_client_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,17 @@

def is_official_openai_base_url(base_url: object, *, websocket: bool = False) -> bool:
parsed = urlsplit(str(base_url))
try:
port = parsed.port
except ValueError:
return False

expected_scheme = "wss" if websocket else "https"
return parsed.scheme == expected_scheme and parsed.hostname == "api.openai.com"
return (
parsed.scheme == expected_scheme
and parsed.hostname == "api.openai.com"
and port in (None, 443)
)


def is_official_openai_client(client: AsyncOpenAI) -> bool:
Expand Down
8 changes: 8 additions & 0 deletions tests/models/test_openai_client_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
[
"https://api.openai.com",
"https://api.openai.com/v1/",
"https://api.openai.com:443/v1/",
],
)
def test_official_openai_base_url_matches_exact_host(base_url: str) -> None:
Expand All @@ -24,6 +25,9 @@ def test_official_openai_base_url_matches_exact_host(base_url: str) -> None:
[
"https://api.openai.com.evil/v1/",
"https://api.openai.com.proxy.local/v1/",
"https://api.openai.com:444/v1/",
"https://api.openai.com:99999/v1/",
"https://api.openai.com:abc/v1/",
"http://api.openai.com/v1/",
"https://custom.example.test/v1/",
],
Expand All @@ -34,9 +38,13 @@ def test_official_openai_base_url_rejects_non_openai_hosts(base_url: str) -> Non

def test_official_openai_websocket_base_url_matches_exact_host() -> None:
assert is_official_openai_base_url("wss://api.openai.com/v1/", websocket=True) is True
assert is_official_openai_base_url("wss://api.openai.com:443/v1/", websocket=True) is True
assert (
is_official_openai_base_url("wss://api.openai.com.proxy.local/v1/", websocket=True) is False
)
assert is_official_openai_base_url("wss://api.openai.com:444/v1/", websocket=True) is False
assert is_official_openai_base_url("wss://api.openai.com:99999/v1/", websocket=True) is False
assert is_official_openai_base_url("wss://api.openai.com:abc/v1/", websocket=True) is False


def test_official_openai_client_rejects_client_without_base_url() -> None:
Expand Down