fix: sanitize endpoint path params

Author: stainless-app[bot]

src/neptune_api_v2/_utils/__init__.py

@@ -1,3 +1,4 @@
+from ._path import path_template as path_template
 from ._sync import asyncify as asyncify
 from ._proxy import LazyProxy as LazyProxy
 from ._utils import (

src/neptune_api_v2/_utils/_path.py

@@ -0,0 +1,127 @@
+from __future__ import annotations
+
+import re
+from typing import (
+    Any,
+    Mapping,
+    Callable,
+)
+from urllib.parse import quote
+
+# Matches '.' or '..' where each dot is either literal or percent-encoded (%2e / %2E).
+_DOT_SEGMENT_RE = re.compile(r"^(?:\.|%2[eE]){1,2}$")
+
+_PLACEHOLDER_RE = re.compile(r"\{(\w+)\}")
+
+
+def _quote_path_segment_part(value: str) -> str:
+    """Percent-encode `value` for use in a URI path segment.
+
+    Considers characters not in `pchar` set from RFC 3986 §3.3 to be unsafe.
+    https://datatracker.ietf.org/doc/html/rfc3986#section-3.3
+    """
+    # quote() already treats unreserved characters (letters, digits, and -._~)
+    # as safe, so we only need to add sub-delims, ':', and '@'.
+    # Notably, unlike the default `safe` for quote(), / is unsafe and must be quoted.
+    return quote(value, safe="!$&'()*+,;=:@")
+
+
+def _quote_query_part(value: str) -> str:
+    """Percent-encode `value` for use in a URI query string.
+
+    Considers &, = and characters not in `query` set from RFC 3986 §3.4 to be unsafe.
+    https://datatracker.ietf.org/doc/html/rfc3986#section-3.4
+    """
+    return quote(value, safe="!$'()*+,;:@/?")
+
+
+def _quote_fragment_part(value: str) -> str:
+    """Percent-encode `value` for use in a URI fragment.
+
+    Considers characters not in `fragment` set from RFC 3986 §3.5 to be unsafe.
+    https://datatracker.ietf.org/doc/html/rfc3986#section-3.5
+    """
+    return quote(value, safe="!$&'()*+,;=:@/?")
+
+
+def _interpolate(
+    template: str,
+    values: Mapping[str, Any],
+    quoter: Callable[[str], str],
+) -> str:
+    """Replace {name} placeholders in `template`, quoting each value with `quoter`.
+
+    Placeholder names are looked up in `values`.
+
+    Raises:
+        KeyError: If a placeholder is not found in `values`.
+    """
+    # re.split with a capturing group returns alternating
+    # [text, name, text, name, ..., text] elements.
+    parts = _PLACEHOLDER_RE.split(template)
+
+    for i in range(1, len(parts), 2):
+        name = parts[i]
+        if name not in values:
+            raise KeyError(f"a value for placeholder {{{name}}} was not provided")
+        val = values[name]
+        if val is None:
+            parts[i] = "null"
+        elif isinstance(val, bool):
+            parts[i] = "true" if val else "false"
+        else:
+            parts[i] = quoter(str(values[name]))
+
+    return "".join(parts)
+
+
+def path_template(template: str, /, **kwargs: Any) -> str:
+    """Interpolate {name} placeholders in `template` from keyword arguments.
+
+    Args:
+        template: The template string containing {name} placeholders.
+        **kwargs: Keyword arguments to interpolate into the template.
+
+    Returns:
+        The template with placeholders interpolated and percent-encoded.
+
+        Safe characters for percent-encoding are dependent on the URI component.
+        Placeholders in path and fragment portions are percent-encoded where the `segment`
+        and `fragment` sets from RFC 3986 respectively are considered safe.
+        Placeholders in the query portion are percent-encoded where the `query` set from
+        RFC 3986 §3.3 is considered safe except for = and & characters.
+
+    Raises:
+        KeyError: If a placeholder is not found in `kwargs`.
+        ValueError: If resulting path contains /./ or /../ segments (including percent-encoded dot-segments).
+    """
+    # Split the template into path, query, and fragment portions.
+    fragment_template: str | None = None
+    query_template: str | None = None
+
+    rest = template
+    if "#" in rest:
+        rest, fragment_template = rest.split("#", 1)
+    if "?" in rest:
+        rest, query_template = rest.split("?", 1)
+    path_template = rest
+
+    # Interpolate each portion with the appropriate quoting rules.
+    path_result = _interpolate(path_template, kwargs, _quote_path_segment_part)
+
+    # Reject dot-segments (. and ..) in the final assembled path.  The check
+    # runs after interpolation so that adjacent placeholders or a mix of static
+    # text and placeholders that together form a dot-segment are caught.
+    # Also reject percent-encoded dot-segments to protect against incorrectly
+    # implemented normalization in servers/proxies.
+    for segment in path_result.split("/"):
+        if _DOT_SEGMENT_RE.match(segment):
+            raise ValueError(f"Constructed path {path_result!r} contains dot-segment {segment!r} which is not allowed")
+
+    result = path_result
+    if query_template is not None:
+        result += "?" + _interpolate(query_template, kwargs, _quote_query_part)
+    if fragment_template is not None:
+        result += "#" + _interpolate(fragment_template, kwargs, _quote_fragment_part)
+
+    return result

src/neptune_api_v2/resources/user/market/borrow/borrow.py

@@ -5,7 +5,7 @@
 import httpx
 
 from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
-from ....._utils import maybe_transform, async_maybe_transform
+from ....._utils import path_template, maybe_transform, async_maybe_transform
 from .subaccount import (
     SubaccountResource,
     AsyncSubaccountResource,
@@ -102,7 +102,7 @@ def get_collateral_accounts_by_asset(
         if not address:
             raise ValueError(f"Expected a non-empty value for `address` but received {address!r}")
         return self._get(
-            f"/api/v1/users/{address}/markets/borrow/lookup/collateral",
+            path_template("/api/v1/users/{address}/markets/borrow/lookup/collateral", address=address),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -154,7 +154,7 @@ def get_collateral_totals(
         if not address:
             raise ValueError(f"Expected a non-empty value for `address` but received {address!r}")
         return self._get(
-            f"/api/v1/users/{address}/markets/borrow/sum/collaterals",
+            path_template("/api/v1/users/{address}/markets/borrow/sum/collaterals", address=address),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -208,7 +208,7 @@ def get_debt_accounts_by_asset(
         if not address:
             raise ValueError(f"Expected a non-empty value for `address` but received {address!r}")
         return self._get(
-            f"/api/v1/users/{address}/markets/borrow/lookup/debt",
+            path_template("/api/v1/users/{address}/markets/borrow/lookup/debt", address=address),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -260,7 +260,7 @@ def get_debts_totals(
         if not address:
             raise ValueError(f"Expected a non-empty value for `address` but received {address!r}")
         return self._get(
-            f"/api/v1/users/{address}/markets/borrow/sum/debts",
+            path_template("/api/v1/users/{address}/markets/borrow/sum/debts", address=address),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -311,7 +311,7 @@ def get_portfolio(
         if not address:
             raise ValueError(f"Expected a non-empty value for `address` but received {address!r}")
         return self._get(
-            f"/api/v1/users/{address}/markets/borrow",
+            path_template("/api/v1/users/{address}/markets/borrow", address=address),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -390,7 +390,7 @@ async def get_collateral_accounts_by_asset(
         if not address:
             raise ValueError(f"Expected a non-empty value for `address` but received {address!r}")
         return await self._get(
-            f"/api/v1/users/{address}/markets/borrow/lookup/collateral",
+            path_template("/api/v1/users/{address}/markets/borrow/lookup/collateral", address=address),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -442,7 +442,7 @@ async def get_collateral_totals(
         if not address:
             raise ValueError(f"Expected a non-empty value for `address` but received {address!r}")
         return await self._get(
-            f"/api/v1/users/{address}/markets/borrow/sum/collaterals",
+            path_template("/api/v1/users/{address}/markets/borrow/sum/collaterals", address=address),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -496,7 +496,7 @@ async def get_debt_accounts_by_asset(
         if not address:
             raise ValueError(f"Expected a non-empty value for `address` but received {address!r}")
         return await self._get(
-            f"/api/v1/users/{address}/markets/borrow/lookup/debt",
+            path_template("/api/v1/users/{address}/markets/borrow/lookup/debt", address=address),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -548,7 +548,7 @@ async def get_debts_totals(
         if not address:
             raise ValueError(f"Expected a non-empty value for `address` but received {address!r}")
         return await self._get(
-            f"/api/v1/users/{address}/markets/borrow/sum/debts",
+            path_template("/api/v1/users/{address}/markets/borrow/sum/debts", address=address),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -599,7 +599,7 @@ async def get_portfolio(
         if not address:
             raise ValueError(f"Expected a non-empty value for `address` but received {address!r}")
         return await self._get(
-            f"/api/v1/users/{address}/markets/borrow",
+            path_template("/api/v1/users/{address}/markets/borrow", address=address),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,

src/neptune_api_v2/resources/user/market/borrow/subaccount.py

@@ -5,7 +5,7 @@
 import httpx
 
 from ....._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
-from ....._utils import maybe_transform, async_maybe_transform
+from ....._utils import path_template, maybe_transform, async_maybe_transform
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -90,7 +90,7 @@ def get_subaccount(
         if not address:
             raise ValueError(f"Expected a non-empty value for `address` but received {address!r}")
         return self._get(
-            f"/api/v1/users/{address}/markets/borrow/accounts/{index}",
+            path_template("/api/v1/users/{address}/markets/borrow/accounts/{index}", address=address, index=index),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -144,7 +144,9 @@ def get_subaccount_collaterals(
         if not address:
             raise ValueError(f"Expected a non-empty value for `address` but received {address!r}")
         return self._get(
-            f"/api/v1/users/{address}/markets/borrow/accounts/{index}/collaterals",
+            path_template(
+                "/api/v1/users/{address}/markets/borrow/accounts/{index}/collaterals", address=address, index=index
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -198,7 +200,9 @@ def get_subaccount_debts(
         if not address:
             raise ValueError(f"Expected a non-empty value for `address` but received {address!r}")
         return self._get(
-            f"/api/v1/users/{address}/markets/borrow/accounts/{index}/debts",
+            path_template(
+                "/api/v1/users/{address}/markets/borrow/accounts/{index}/debts", address=address, index=index
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -249,7 +253,9 @@ def get_subaccount_health(
         if not address:
             raise ValueError(f"Expected a non-empty value for `address` but received {address!r}")
         return self._get(
-            f"/api/v1/users/{address}/markets/borrow/accounts/{index}/health",
+            path_template(
+                "/api/v1/users/{address}/markets/borrow/accounts/{index}/health", address=address, index=index
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -321,7 +327,7 @@ async def get_subaccount(
         if not address:
             raise ValueError(f"Expected a non-empty value for `address` but received {address!r}")
         return await self._get(
-            f"/api/v1/users/{address}/markets/borrow/accounts/{index}",
+            path_template("/api/v1/users/{address}/markets/borrow/accounts/{index}", address=address, index=index),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -375,7 +381,9 @@ async def get_subaccount_collaterals(
         if not address:
             raise ValueError(f"Expected a non-empty value for `address` but received {address!r}")
         return await self._get(
-            f"/api/v1/users/{address}/markets/borrow/accounts/{index}/collaterals",
+            path_template(
+                "/api/v1/users/{address}/markets/borrow/accounts/{index}/collaterals", address=address, index=index
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -429,7 +437,9 @@ async def get_subaccount_debts(
         if not address:
             raise ValueError(f"Expected a non-empty value for `address` but received {address!r}")
         return await self._get(
-            f"/api/v1/users/{address}/markets/borrow/accounts/{index}/debts",
+            path_template(
+                "/api/v1/users/{address}/markets/borrow/accounts/{index}/debts", address=address, index=index
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -480,7 +490,9 @@ async def get_subaccount_health(
         if not address:
             raise ValueError(f"Expected a non-empty value for `address` but received {address!r}")
         return await self._get(
-            f"/api/v1/users/{address}/markets/borrow/accounts/{index}/health",
+            path_template(
+                "/api/v1/users/{address}/markets/borrow/accounts/{index}/health", address=address, index=index
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,

src/neptune_api_v2/resources/user/market/lend.py

@@ -5,7 +5,7 @@
 import httpx
 
 from ...._types import Body, Omit, Query, Headers, NotGiven, omit, not_given
-from ...._utils import maybe_transform, async_maybe_transform
+from ...._utils import path_template, maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -76,7 +76,7 @@ def list(
         if not address:
             raise ValueError(f"Expected a non-empty value for `address` but received {address!r}")
         return self._get(
-            f"/api/v1/users/{address}/markets/lend",
+            path_template("/api/v1/users/{address}/markets/lend", address=address),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -130,7 +130,7 @@ def get_by_asset(
         if not address:
             raise ValueError(f"Expected a non-empty value for `address` but received {address!r}")
         return self._get(
-            f"/api/v1/users/{address}/markets/lend/lookup",
+            path_template("/api/v1/users/{address}/markets/lend/lookup", address=address),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -203,7 +203,7 @@ async def list(
         if not address:
             raise ValueError(f"Expected a non-empty value for `address` but received {address!r}")
         return await self._get(
-            f"/api/v1/users/{address}/markets/lend",
+            path_template("/api/v1/users/{address}/markets/lend", address=address),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -257,7 +257,7 @@ async def get_by_asset(
         if not address:
             raise ValueError(f"Expected a non-empty value for `address` but received {address!r}")
         return await self._get(
-            f"/api/v1/users/{address}/markets/lend/lookup",
+            path_template("/api/v1/users/{address}/markets/lend/lookup", address=address),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,