fix(core): Only consider ingest endpoint requests when checking isSentryRequestUrl

Author: Lms24

packages/core/src/utils/isSentryRequestUrl.ts

@@ -21,7 +21,10 @@ function checkTunnel(url: string, tunnel: string | undefined): boolean {
 }
 
 function checkDsn(url: string, dsn: DsnComponents | undefined): boolean {
-  return dsn ? url.includes(dsn.host) : false;
+  // Requests to Sentry's ingest endpoint must have a `sentry_key` in the query string
+  // This is equivalent to the public_key which is required in the DSN
+  // see https://develop.sentry.dev/sdk/overview/#parsing-the-dsn
+  return dsn ? url.includes(dsn.host) && !!url.match(/sentry_key/) : false;
 }
 
 function removeTrailingSlash(str: string): string {

packages/core/test/lib/utils/isSentryRequestUrl.test.ts

@@ -4,12 +4,17 @@ import type { Client } from '../../../src/client';
 
 describe('isSentryRequestUrl', () => {
   it.each([
-    ['', 'sentry-dsn.com', '', false],
-    ['http://sentry-dsn.com/my-url', 'sentry-dsn.com', '', true],
-    ['http://sentry-dsn.com', 'sentry-dsn.com', '', true],
+    ['http://sentry-dsn.com/my-url?sentry_key=123', 'sentry-dsn.com', '', true],
     ['http://tunnel:4200', 'sentry-dsn.com', 'http://tunnel:4200', true],
     ['http://tunnel:4200', 'sentry-dsn.com', 'http://tunnel:4200/', true],
     ['http://tunnel:4200/', 'sentry-dsn.com', 'http://tunnel:4200', true],
+    ['http://tunnel:4200/', 'another-dsn.com', 'http://tunnel:4200', true],
+
+    ['http://tunnel:4200/?sentry_key=123', 'another-dsn.com', '', false],
+    ['http://sentry-dsn.com/my-url', 'sentry-dsn.com', '', false],
+    ['http://sentry-dsn.com', 'sentry-dsn.com', '', false],
+    ['http://tunnel:4200/', 'another-dsn.com', 'http://tunnel:4200/sentry-tunnel', false],
+    ['', 'sentry-dsn.com', '', false],
     ['http://tunnel:4200/a', 'sentry-dsn.com', 'http://tunnel:4200', false],
   ])('works with url=%s, dsn=%s, tunnel=%s', (url: string, dsn: string, tunnel: string, expected: boolean) => {
     const client = {