Skip to content

Commit 5615d9e

Browse files
fix: sanitize endpoint path params
1 parent 4c01647 commit 5615d9e

File tree

16 files changed

+442
-146
lines changed

16 files changed

+442
-146
lines changed

src/knockapi/_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/knockapi/_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/knockapi/resources/audiences.py

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

99
from ..types import audience_add_members_params, audience_remove_members_params
1010
from .._types import Body, Omit, Query, Headers, NoneType, NotGiven, omit, not_given
11-
from .._utils import maybe_transform, async_maybe_transform
11+
from .._utils import path_template, maybe_transform, async_maybe_transform
1212
from .._compat import cached_property
1313
from .._resource import SyncAPIResource, AsyncAPIResource
1414
from .._response import (
@@ -81,7 +81,7 @@ def add_members(
8181
raise ValueError(f"Expected a non-empty value for `key` but received {key!r}")
8282
extra_headers = {"Accept": "*/*", **(extra_headers or {})}
8383
return self._post(
84-
f"/v1/audiences/{key}/members",
84+
path_template("/v1/audiences/{key}/members", key=key),
8585
body=maybe_transform({"members": members}, audience_add_members_params.AudienceAddMembersParams),
8686
options=make_request_options(
8787
extra_headers=extra_headers,
@@ -122,7 +122,7 @@ def list_members(
122122
if not key:
123123
raise ValueError(f"Expected a non-empty value for `key` but received {key!r}")
124124
return self._get(
125-
f"/v1/audiences/{key}/members",
125+
path_template("/v1/audiences/{key}/members", key=key),
126126
options=make_request_options(
127127
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
128128
),
@@ -163,7 +163,7 @@ def remove_members(
163163
raise ValueError(f"Expected a non-empty value for `key` but received {key!r}")
164164
extra_headers = {"Accept": "*/*", **(extra_headers or {})}
165165
return self._delete(
166-
f"/v1/audiences/{key}/members",
166+
path_template("/v1/audiences/{key}/members", key=key),
167167
body=maybe_transform({"members": members}, audience_remove_members_params.AudienceRemoveMembersParams),
168168
options=make_request_options(
169169
extra_headers=extra_headers,
@@ -234,7 +234,7 @@ async def add_members(
234234
raise ValueError(f"Expected a non-empty value for `key` but received {key!r}")
235235
extra_headers = {"Accept": "*/*", **(extra_headers or {})}
236236
return await self._post(
237-
f"/v1/audiences/{key}/members",
237+
path_template("/v1/audiences/{key}/members", key=key),
238238
body=await async_maybe_transform(
239239
{"members": members}, audience_add_members_params.AudienceAddMembersParams
240240
),
@@ -277,7 +277,7 @@ async def list_members(
277277
if not key:
278278
raise ValueError(f"Expected a non-empty value for `key` but received {key!r}")
279279
return await self._get(
280-
f"/v1/audiences/{key}/members",
280+
path_template("/v1/audiences/{key}/members", key=key),
281281
options=make_request_options(
282282
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
283283
),
@@ -318,7 +318,7 @@ async def remove_members(
318318
raise ValueError(f"Expected a non-empty value for `key` but received {key!r}")
319319
extra_headers = {"Accept": "*/*", **(extra_headers or {})}
320320
return await self._delete(
321-
f"/v1/audiences/{key}/members",
321+
path_template("/v1/audiences/{key}/members", key=key),
322322
body=await async_maybe_transform(
323323
{"members": members}, audience_remove_members_params.AudienceRemoveMembersParams
324324
),

src/knockapi/resources/bulk_operations.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 get(
6970
if not id:
7071
raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
7172
return self._get(
72-
f"/v1/bulk_operations/{id}",
73+
path_template("/v1/bulk_operations/{id}", id=id),
7374
options=make_request_options(
7475
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
7576
),
@@ -127,7 +128,7 @@ async def get(
127128
if not id:
128129
raise ValueError(f"Expected a non-empty value for `id` but received {id!r}")
129130
return await self._get(
130-
f"/v1/bulk_operations/{id}",
131+
path_template("/v1/bulk_operations/{id}", id=id),
131132
options=make_request_options(
132133
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
133134
),

src/knockapi/resources/channels/bulk.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import httpx
1010

1111
from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
12-
from ..._utils import maybe_transform, async_maybe_transform
12+
from ..._utils import path_template, maybe_transform, async_maybe_transform
1313
from ..._compat import cached_property
1414
from ..._resource import SyncAPIResource, AsyncAPIResource
1515
from ..._response import (
@@ -125,7 +125,7 @@ def update_message_status(
125125
if not action:
126126
raise ValueError(f"Expected a non-empty value for `action` but received {action!r}")
127127
return self._post(
128-
f"/v1/channels/{channel_id}/messages/bulk/{action}",
128+
path_template("/v1/channels/{channel_id}/messages/bulk/{action}", channel_id=channel_id, action=action),
129129
body=maybe_transform(
130130
{
131131
"archived": archived,
@@ -252,7 +252,7 @@ async def update_message_status(
252252
if not action:
253253
raise ValueError(f"Expected a non-empty value for `action` but received {action!r}")
254254
return await self._post(
255-
f"/v1/channels/{channel_id}/messages/bulk/{action}",
255+
path_template("/v1/channels/{channel_id}/messages/bulk/{action}", channel_id=channel_id, action=action),
256256
body=await async_maybe_transform(
257257
{
258258
"archived": archived,

0 commit comments

Comments
 (0)