Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions packages/core/src/integrations/inboundfilters.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { addGlobalEventProcessor, getCurrentHub } from '@sentry/hub';
import { Event, Integration } from '@sentry/types';
import { Event, Integration, StackFrame } from '@sentry/types';
import { getEventDescription, isMatchingPattern, logger } from '@sentry/utils';

// "Script error." is hard coded into browsers for errors that it can't read.
Expand Down Expand Up @@ -189,17 +189,30 @@ export class InboundFilters implements Integration {
return [];
}

/** JSDoc */
private _getLastUrl(frames: StackFrame[]): string | null {
for (let i = frames.length - 1; i >= 0; i--) {
const frame = frames[i];

if (frame?.filename !== '<anonymous>') {
return frame.filename || null;
}
}

return null;
}

/** JSDoc */
private _getEventFilterUrl(event: Event): string | null {
try {
if (event.stacktrace) {
const frames = event.stacktrace.frames;
return (frames && frames[frames.length - 1].filename) || null;
return frames ? this._getLastUrl(frames) : null;
}
if (event.exception) {
const frames =
event.exception.values && event.exception.values[0].stacktrace && event.exception.values[0].stacktrace.frames;
return (frames && frames[frames.length - 1].filename) || null;
return frames ? this._getLastUrl(frames) : null;
}
return null;
} catch (oO) {
Expand Down
31 changes: 31 additions & 0 deletions packages/core/test/lib/integrations/inboundfilters.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -456,5 +456,36 @@ describe('InboundFilters', () => {
),
).toBe(true);
});

it('should search for script names when there is an anonymous callback at the last frame', () => {
const messageEvent = {
message: 'any',
stacktrace: {
frames: [
{ filename: 'https://our-side.com/js/bundle.js' },
{ filename: 'https://awesome-analytics.io/some/file.js' },
{ filename: '<anonymous>' },
],
},
};

expect(
inboundFilters._isAllowedUrl(
messageEvent,
inboundFilters._mergeOptions({
allowUrls: ['https://awesome-analytics.io/some/file.js'],
}),
),
).toBe(true);

expect(
inboundFilters._isDeniedUrl(
messageEvent,
inboundFilters._mergeOptions({
denyUrls: ['https://awesome-analytics.io/some/file.js'],
}),
),
).toBe(true);
});
});
});