Revert "Revert "feat: Add support for DSN paths""

This reverts commit d44a02f.

Author: untitaker

sentry_sdk/utils.py

@@ -84,15 +84,18 @@ def __init__(self, value):
             self.port = self.scheme == "https" and 443 or 80
         self.public_key = parts.username
         if not self.public_key:
-            raise BadDsn("Missig public key")
+            raise BadDsn("Missing public key")
         self.secret_key = parts.password
-        if not parts.path:
-            raise BadDsn("Missing project ID in DSN")
+
+        path = parts.path.rsplit("/", 1)
+
         try:
-            self.project_id = text_type(int(parts.path[1:]))
+            self.project_id = text_type(int(path.pop()))
         except (ValueError, TypeError):
             raise BadDsn("Invalid project in DSN (%r)" % (parts.path or "")[1:])
 
+        self.path = "/".join(path) + "/"
+
     @property
     def netloc(self):
         """The netloc part of a DSN."""
@@ -106,18 +109,20 @@ def to_auth(self, client=None):
         return Auth(
             scheme=self.scheme,
             host=self.netloc,
+            path=self.path,
             project_id=self.project_id,
             public_key=self.public_key,
             secret_key=self.secret_key,
             client=client,
         )
 
     def __str__(self):
-        return "%s://%s%s@%s/%s" % (
+        return "%s://%s%s@%s%s%s" % (
             self.scheme,
             self.public_key,
             self.secret_key and "@" + self.secret_key or "",
             self.netloc,
+            self.path,
             self.project_id,
         )
 
@@ -129,6 +134,7 @@ def __init__(
         self,
         scheme,
         host,
+        path,
         project_id,
         public_key,
         secret_key=None,
@@ -137,6 +143,7 @@ def __init__(
     ):
         self.scheme = scheme
         self.host = host
+        self.path = path
         self.project_id = project_id
         self.public_key = public_key
         self.secret_key = secret_key
@@ -146,7 +153,12 @@ def __init__(
     @property
     def store_api_url(self):
         """Returns the API url for storing events."""
-        return "%s://%s/api/%s/store/" % (self.scheme, self.host, self.project_id)
+        return "%s://%s%sapi/%s/store/" % (
+            self.scheme,
+            self.host,
+            self.path,
+            self.project_id,
+        )
 
     def to_header(self, timestamp=None):
         """Returns the auth header a string."""

tests/utils/test_general.py

@@ -8,6 +8,8 @@
 import hypothesis.strategies as st
 
 from sentry_sdk.utils import (
+    BadDsn,
+    Dsn,
     safe_repr,
     exceptions_from_error_tuple,
     format_and_strip,
@@ -111,3 +113,35 @@ def test_filename():
     import sentry_sdk.utils
 
     assert x("sentry_sdk.utils", sentry_sdk.utils.__file__) == "sentry_sdk/utils.py"
+
+
+@pytest.mark.parametrize(
+    "given,expected",
+    [
+        ("https://foobar@sentry.io/123", "https://sentry.io/api/123/store/"),
+        ("https://foobar@sentry.io/bam/123", "https://sentry.io/bam/api/123/store/"),
+        (
+            "https://foobar@sentry.io/bam/baz/123",
+            "https://sentry.io/bam/baz/api/123/store/",
+        ),
+    ],
+)
+def test_parse_dsn_paths(given, expected):
+    dsn = Dsn(given)
+    auth = dsn.to_auth()
+    assert auth.store_api_url == expected
+
+
+@pytest.mark.parametrize(
+    "dsn",
+    [
+        "https://foobar@sentry.io"
+        "https://foobar@sentry.io/"
+        "https://foobar@sentry.io/asdf"
+        "https://foobar@sentry.io/asdf/"
+        "https://foobar@sentry.io/asdf/123/"
+    ],
+)
+def test_parse_invalid_dsn(dsn):
+    with pytest.raises(BadDsn):
+        dsn = Dsn(dsn)