fix(hybridcloud) Improve API gateway routing for error-embed

src/sentry/conf/server.py

@@ -3970,7 +3970,6 @@ def build_cdc_postgres_init_db_volume(settings: Any) -> dict[str, dict[str, str]
     "sentry-api-0-relays-details",
     # Backwards compatibility for US customers.
     # New usage of these is region scoped.
-    "sentry-error-page-embed",
     "sentry-js-sdk-loader",
     "sentry-release-hook",
     "sentry-api-0-organizations",

src/sentry/hybridcloud/apigateway/apigateway.py

@@ -9,6 +9,7 @@
 from rest_framework.request import Request
 
 from sentry.hybridcloud.apigateway.proxy import (
+    proxy_error_embed_request,
     proxy_region_request,
     proxy_request,
     proxy_sentryapp_request,
@@ -105,6 +106,18 @@ def proxy_request_if_needed(
         )
         return proxy_sentryapp_request(request, app_id_or_slug, url_name)
 
+    if url_name == "sentry-error-page-embed" and "dsn" in request.GET:
+        # Error embed modal is special as customers can't easily use region URLs.
+        dsn = request.GET["dsn"]
+        metrics.incr(
+            "apigateway.proxy_request",
+            tags={
+                "url_name": url_name,
+                "kind": "error-embed",
+            },
+        )
+        return proxy_error_embed_request(request, dsn, url_name)
+
     if (
         request.resolver_match
         and request.resolver_match.url_name in settings.REGION_PINNED_URL_NAMES

src/sentry/hybridcloud/apigateway/proxy.py

@@ -6,7 +6,7 @@
 
 import logging
 from collections.abc import Iterator
-from urllib.parse import urljoin
+from urllib.parse import urljoin, urlparse
 from wsgiref.util import is_hop_by_hop
 
 from django.conf import settings
@@ -16,6 +16,7 @@
 from requests import request as external_request
 from requests.exceptions import Timeout
 
+from sentry import options
 from sentry.api.exceptions import RequestTimeout
 from sentry.models.integrations.sentry_app import SentryApp
 from sentry.models.integrations.sentry_app_installation import SentryAppInstallation
@@ -149,6 +150,36 @@ def proxy_sentryapp_request(
     return proxy_region_request(request, region, url_name)
 
 
+def proxy_error_embed_request(
+    request: HttpRequest, dsn: str, url_name: str
+) -> HttpResponseBase | None:
+    try:
+        parsed = urlparse(dsn)
+    except Exception:
+        return None
+    host = parsed.netloc
+    app_host = urlparse(options.get("system.url-prefix")).netloc
+    if not host.endswith(app_host):
+        # Don't further parse URLs that aren't for us.
+        return None
+
+    app_segments = app_host.split(".")
+    host_segments = host.split(".")
+    if len(host_segments) - len(app_segments) < 3:
+        # If we don't have a o123.ingest.{region}.{app_host} style domain
+        # we forward to the monolith region
+        region = get_region_by_name(settings.SENTRY_MONOLITH_REGION)
+        return proxy_region_request(request, region, url_name)
+    try:
+        region_offset = len(app_segments) + 1
+        region_segment = host_segments[region_offset * -1]
+        region = get_region_by_name(region_segment)
+    except Exception:
+        return None
+
+    return proxy_region_request(request, region, url_name)
+
+
 def proxy_region_request(
     request: HttpRequest, region: Region, url_name: str
 ) -> StreamingHttpResponse:

src/sentry/testutils/helpers/apigateway.py

@@ -66,6 +66,11 @@ def get(self, request):
         RegionEndpoint.as_view(),
         name="region-endpoint-id-or-slug",
     ),
+    re_path(
+        r"^api/embed/error-page/$",
+        RegionEndpoint.as_view(),
+        name="sentry-error-page-embed",
+    ),
 ] + api_urls.urlpatterns
 
 

tests/sentry/hybridcloud/apigateway/test_apigateway.py

@@ -1,12 +1,13 @@
 from urllib.parse import urlencode
 
+import pytest
 import responses
 from django.conf import settings
 from django.test import override_settings
 from django.urls import get_resolver, reverse
 from rest_framework.response import Response
 
-from sentry.silo.base import SiloMode
+from sentry.silo.base import SiloLimit, SiloMode
 from sentry.testutils.helpers.apigateway import ApiGatewayTestCase, verify_request_params
 from sentry.testutils.helpers.options import override_options
 from sentry.testutils.helpers.response import close_streaming_response
@@ -261,6 +262,57 @@ def test_proxy_check_region_pinned_issue_urls(self):
             assert resp_json["proxy"] is True
             assert resp_json["events"]
 
+    @responses.activate
+    def test_proxy_error_embed_dsn(self):
+        responses.add(
+            responses.GET,
+            f"{self.REGION.address}/api/embed/error-page/",
+            json={"proxy": True, "name": "error-embed"},
+        )
+        with override_settings(SILO_MODE=SiloMode.CONTROL, MIDDLEWARE=tuple(self.middleware)):
+            # no dsn
+            with pytest.raises(SiloLimit.AvailabilityError):
+                self.client.get("/api/embed/error-page/")
+
+            # invalid dsn
+            with pytest.raises(SiloLimit.AvailabilityError):
+                self.client.get("/api/embed/error-page/", data={"dsn": "lolnope"})
+
+            # invalid DSN that doesn't match our domain
+            with pytest.raises(SiloLimit.AvailabilityError):
+                self.client.get(
+                    "/api/embed/error-page/", data={"dsn": "https://abc123@nope.com/123"}
+                )
+
+            # Older DSN with no region -> monolith region
+            resp = self.client.get(
+                "/api/embed/error-page/", data={"dsn": "https://abc123@testserver/123"}
+            )
+            assert resp.status_code == 200
+            self._check_response(resp, "error-embed")
+
+            # DSN with o123.ingest.sentry.io style hosts
+            resp = self.client.get(
+                "/api/embed/error-page/", data={"dsn": "https://abc123@o123.ingest.testserver/123"}
+            )
+            assert resp.status_code == 200
+            self._check_response(resp, "error-embed")
+
+            # DSN with o123.ingest.us.sentry.io style hosts
+            resp = self.client.get(
+                "/api/embed/error-page/",
+                data={"dsn": "https://abc123@o123.ingest.us.testserver/123"},
+            )
+            assert resp.status_code == 200
+            self._check_response(resp, "error-embed")
+
+            # DSN with o123.ingest.us.sentry.io style hosts with a garbage region
+            with pytest.raises(SiloLimit.AvailabilityError):
+                self.client.get(
+                    "/api/embed/error-page/",
+                    data={"dsn": "https://abc123@o123.ingest.zz.testserver/123"},
+                )
+
     @staticmethod
     def _check_response(resp: Response, expected_name: str) -> None:
         if SiloMode.get_current_mode() == SiloMode.MONOLITH: