Skip to content

Commit 8a63eb5

Browse files
fix: sanitize endpoint path params
1 parent b1056a0 commit 8a63eb5

File tree

11 files changed

+253
-32
lines changed

11 files changed

+253
-32
lines changed

src/browserbase/_utils/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from ._path import path_template as path_template
12
from ._sync import asyncify as asyncify
23
from ._proxy import LazyProxy as LazyProxy
34
from ._utils import (

src/browserbase/_utils/_path.py

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
from __future__ import annotations
2+
3+
import re
4+
from typing import (
5+
Any,
6+
Mapping,
7+
Callable,
8+
)
9+
from urllib.parse import quote
10+
11+
# Matches '.' or '..' where each dot is either literal or percent-encoded (%2e / %2E).
12+
_DOT_SEGMENT_RE = re.compile(r"^(?:\.|%2[eE]){1,2}$")
13+
14+
_PLACEHOLDER_RE = re.compile(r"\{(\w+)\}")
15+
16+
17+
def _quote_path_segment_part(value: str) -> str:
18+
"""Percent-encode `value` for use in a URI path segment.
19+
20+
Considers characters not in `pchar` set from RFC 3986 §3.3 to be unsafe.
21+
https://datatracker.ietf.org/doc/html/rfc3986#section-3.3
22+
"""
23+
# quote() already treats unreserved characters (letters, digits, and -._~)
24+
# as safe, so we only need to add sub-delims, ':', and '@'.
25+
# Notably, unlike the default `safe` for quote(), / is unsafe and must be quoted.
26+
return quote(value, safe="!$&'()*+,;=:@")
27+
28+
29+
def _quote_query_part(value: str) -> str:
30+
"""Percent-encode `value` for use in a URI query string.
31+
32+
Considers &, = and characters not in `query` set from RFC 3986 §3.4 to be unsafe.
33+
https://datatracker.ietf.org/doc/html/rfc3986#section-3.4
34+
"""
35+
return quote(value, safe="!$'()*+,;:@/?")
36+
37+
38+
def _quote_fragment_part(value: str) -> str:
39+
"""Percent-encode `value` for use in a URI fragment.
40+
41+
Considers characters not in `fragment` set from RFC 3986 §3.5 to be unsafe.
42+
https://datatracker.ietf.org/doc/html/rfc3986#section-3.5
43+
"""
44+
return quote(value, safe="!$&'()*+,;=:@/?")
45+
46+
47+
def _interpolate(
48+
template: str,
49+
values: Mapping[str, Any],
50+
quoter: Callable[[str], str],
51+
) -> str:
52+
"""Replace {name} placeholders in `template`, quoting each value with `quoter`.
53+
54+
Placeholder names are looked up in `values`.
55+
56+
Raises:
57+
KeyError: If a placeholder is not found in `values`.
58+
"""
59+
# re.split with a capturing group returns alternating
60+
# [text, name, text, name, ..., text] elements.
61+
parts = _PLACEHOLDER_RE.split(template)
62+
63+
for i in range(1, len(parts), 2):
64+
name = parts[i]
65+
if name not in values:
66+
raise KeyError(f"a value for placeholder {{{name}}} was not provided")
67+
val = values[name]
68+
if val is None:
69+
parts[i] = "null"
70+
elif isinstance(val, bool):
71+
parts[i] = "true" if val else "false"
72+
else:
73+
parts[i] = quoter(str(values[name]))
74+
75+
return "".join(parts)
76+
77+
78+
def path_template(template: str, /, **kwargs: Any) -> str:
79+
"""Interpolate {name} placeholders in `template` from keyword arguments.
80+
81+
Args:
82+
template: The template string containing {name} placeholders.
83+
**kwargs: Keyword arguments to interpolate into the template.
84+
85+
Returns:
86+
The template with placeholders interpolated and percent-encoded.
87+
88+
Safe characters for percent-encoding are dependent on the URI component.
89+
Placeholders in path and fragment portions are percent-encoded where the `segment`
90+
and `fragment` sets from RFC 3986 respectively are considered safe.
91+
Placeholders in the query portion are percent-encoded where the `query` set from
92+
RFC 3986 §3.3 is considered safe except for = and & characters.
93+
94+
Raises:
95+
KeyError: If a placeholder is not found in `kwargs`.
96+
ValueError: If resulting path contains /./ or /../ segments (including percent-encoded dot-segments).
97+
"""
98+
# Split the template into path, query, and fragment portions.
99+
fragment_template: str | None = None
100+
query_template: str | None = None
101+
102+
rest = template
103+
if "#" in rest:
104+
rest, fragment_template = rest.split("#", 1)
105+
if "?" in rest:
106+
rest, query_template = rest.split("?", 1)
107+
path_template = rest
108+
109+
# Interpolate each portion with the appropriate quoting rules.
110+
path_result = _interpolate(path_template, kwargs, _quote_path_segment_part)
111+
112+
# Reject dot-segments (. and ..) in the final assembled path. The check
113+
# runs after interpolation so that adjacent placeholders or a mix of static
114+
# text and placeholders that together form a dot-segment are caught.
115+
# Also reject percent-encoded dot-segments to protect against incorrectly
116+
# implemented normalization in servers/proxies.
117+
for segment in path_result.split("/"):
118+
if _DOT_SEGMENT_RE.match(segment):
119+
raise ValueError(f"Constructed path {path_result!r} contains dot-segment {segment!r} which is not allowed")
120+
121+
result = path_result
122+
if query_template is not None:
123+
result += "?" + _interpolate(query_template, kwargs, _quote_query_part)
124+
if fragment_template is not None:
125+
result += "#" + _interpolate(fragment_template, kwargs, _quote_fragment_part)
126+
127+
return result

src/browserbase/resources/contexts.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from ..types import context_create_params
88
from .._types import Body, Omit, Query, Headers, NoneType, NotGiven, omit, not_given
9-
from .._utils import maybe_transform, async_maybe_transform
9+
from .._utils import path_template, maybe_transform, async_maybe_transform
1010
from .._compat import cached_property
1111
from .._resource import SyncAPIResource, AsyncAPIResource
1212
from .._response import (
@@ -106,7 +106,7 @@ def retrieve(
106106
if not id:
107107
raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
108108
return self._get(
109-
f"/v1/contexts/{id}",
109+
path_template("/v1/contexts/{id}", id=id),
110110
options=make_request_options(
111111
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
112112
),
@@ -139,7 +139,7 @@ def update(
139139
if not id:
140140
raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
141141
return self._put(
142-
f"/v1/contexts/{id}",
142+
path_template("/v1/contexts/{id}", id=id),
143143
options=make_request_options(
144144
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
145145
),
@@ -173,7 +173,7 @@ def delete(
173173
raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
174174
extra_headers = {"Accept": "*/*", **(extra_headers or {})}
175175
return self._delete(
176-
f"/v1/contexts/{id}",
176+
path_template("/v1/contexts/{id}", id=id),
177177
options=make_request_options(
178178
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
179179
),
@@ -264,7 +264,7 @@ async def retrieve(
264264
if not id:
265265
raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
266266
return await self._get(
267-
f"/v1/contexts/{id}",
267+
path_template("/v1/contexts/{id}", id=id),
268268
options=make_request_options(
269269
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
270270
),
@@ -297,7 +297,7 @@ async def update(
297297
if not id:
298298
raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
299299
return await self._put(
300-
f"/v1/contexts/{id}",
300+
path_template("/v1/contexts/{id}", id=id),
301301
options=make_request_options(
302302
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
303303
),
@@ -331,7 +331,7 @@ async def delete(
331331
raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
332332
extra_headers = {"Accept": "*/*", **(extra_headers or {})}
333333
return await self._delete(
334-
f"/v1/contexts/{id}",
334+
path_template("/v1/contexts/{id}", id=id),
335335
options=make_request_options(
336336
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
337337
),

src/browserbase/resources/extensions.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from ..types import extension_create_params
1010
from .._types import Body, Query, Headers, NoneType, NotGiven, FileTypes, not_given
11-
from .._utils import extract_files, maybe_transform, deepcopy_minimal, async_maybe_transform
11+
from .._utils import extract_files, path_template, maybe_transform, deepcopy_minimal, async_maybe_transform
1212
from .._compat import cached_property
1313
from .._resource import SyncAPIResource, AsyncAPIResource
1414
from .._response import (
@@ -108,7 +108,7 @@ def retrieve(
108108
if not id:
109109
raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
110110
return self._get(
111-
f"/v1/extensions/{id}",
111+
path_template("/v1/extensions/{id}", id=id),
112112
options=make_request_options(
113113
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
114114
),
@@ -142,7 +142,7 @@ def delete(
142142
raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
143143
extra_headers = {"Accept": "*/*", **(extra_headers or {})}
144144
return self._delete(
145-
f"/v1/extensions/{id}",
145+
path_template("/v1/extensions/{id}", id=id),
146146
options=make_request_options(
147147
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
148148
),
@@ -235,7 +235,7 @@ async def retrieve(
235235
if not id:
236236
raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
237237
return await self._get(
238-
f"/v1/extensions/{id}",
238+
path_template("/v1/extensions/{id}", id=id),
239239
options=make_request_options(
240240
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
241241
),
@@ -269,7 +269,7 @@ async def delete(
269269
raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
270270
extra_headers = {"Accept": "*/*", **(extra_headers or {})}
271271
return await self._delete(
272-
f"/v1/extensions/{id}",
272+
path_template("/v1/extensions/{id}", id=id),
273273
options=make_request_options(
274274
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
275275
),

src/browserbase/resources/projects.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import httpx
66

77
from .._types import Body, Query, Headers, NotGiven, not_given
8+
from .._utils import path_template
89
from .._compat import cached_property
910
from .._resource import SyncAPIResource, AsyncAPIResource
1011
from .._response import (
@@ -67,7 +68,7 @@ def retrieve(
6768
if not id:
6869
raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
6970
return self._get(
70-
f"/v1/projects/{id}",
71+
path_template("/v1/projects/{id}", id=id),
7172
options=make_request_options(
7273
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
7374
),
@@ -119,7 +120,7 @@ def usage(
119120
if not id:
120121
raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
121122
return self._get(
122-
f"/v1/projects/{id}/usage",
123+
path_template("/v1/projects/{id}/usage", id=id),
123124
options=make_request_options(
124125
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
125126
),
@@ -173,7 +174,7 @@ async def retrieve(
173174
if not id:
174175
raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
175176
return await self._get(
176-
f"/v1/projects/{id}",
177+
path_template("/v1/projects/{id}", id=id),
177178
options=make_request_options(
178179
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
179180
),
@@ -225,7 +226,7 @@ async def usage(
225226
if not id:
226227
raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
227228
return await self._get(
228-
f"/v1/projects/{id}/usage",
229+
path_template("/v1/projects/{id}/usage", id=id),
229230
options=make_request_options(
230231
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
231232
),

src/browserbase/resources/sessions/downloads.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import httpx
66

77
from ..._types import Body, Query, Headers, NotGiven, not_given
8+
from ..._utils import path_template
89
from ..._compat import cached_property
910
from ..._resource import SyncAPIResource, AsyncAPIResource
1011
from ..._response import (
@@ -69,7 +70,7 @@ def list(
6970
raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
7071
extra_headers = {"Accept": "application/zip", **(extra_headers or {})}
7172
return self._get(
72-
f"/v1/sessions/{id}/downloads",
73+
path_template("/v1/sessions/{id}/downloads", id=id),
7374
options=make_request_options(
7475
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
7576
),
@@ -124,7 +125,7 @@ async def list(
124125
raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
125126
extra_headers = {"Accept": "application/zip", **(extra_headers or {})}
126127
return await self._get(
127-
f"/v1/sessions/{id}/downloads",
128+
path_template("/v1/sessions/{id}/downloads", id=id),
128129
options=make_request_options(
129130
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
130131
),

src/browserbase/resources/sessions/logs.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import httpx
66

77
from ..._types import Body, Query, Headers, NotGiven, not_given
8+
from ..._utils import path_template
89
from ..._compat import cached_property
910
from ..._resource import SyncAPIResource, AsyncAPIResource
1011
from ..._response import (
@@ -65,7 +66,7 @@ def list(
6566
if not id:
6667
raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
6768
return self._get(
68-
f"/v1/sessions/{id}/logs",
69+
path_template("/v1/sessions/{id}/logs", id=id),
6970
options=make_request_options(
7071
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
7172
),
@@ -119,7 +120,7 @@ async def list(
119120
if not id:
120121
raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
121122
return await self._get(
122-
f"/v1/sessions/{id}/logs",
123+
path_template("/v1/sessions/{id}/logs", id=id),
123124
options=make_request_options(
124125
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
125126
),

src/browserbase/resources/sessions/recording.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import httpx
66

77
from ..._types import Body, Query, Headers, NotGiven, not_given
8+
from ..._utils import path_template
89
from ..._compat import cached_property
910
from ..._resource import SyncAPIResource, AsyncAPIResource
1011
from ..._response import (
@@ -65,7 +66,7 @@ def retrieve(
6566
if not id:
6667
raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
6768
return self._get(
68-
f"/v1/sessions/{id}/recording",
69+
path_template("/v1/sessions/{id}/recording", id=id),
6970
options=make_request_options(
7071
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
7172
),
@@ -119,7 +120,7 @@ async def retrieve(
119120
if not id:
120121
raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
121122
return await self._get(
122-
f"/v1/sessions/{id}/recording",
123+
path_template("/v1/sessions/{id}/recording", id=id),
123124
options=make_request_options(
124125
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
125126
),

0 commit comments

Comments
 (0)