Skip to content

#6128 Use stripped url for exception #6131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sosnovsky merged 4 commits into from
Dec 16, 2025
Merged

#6128 Use stripped url for exception #6131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7abbec
fix: strip gmail url from report
ioanatflowcrypt Dec 8, 2025
17b6be0
Merge branch 'master' into 6128-use-stripped-url-for-exceptions-from-…
ioanatflowcrypt Dec 9, 2025
3f23561
feat: added test
ioanatflowcrypt Dec 12, 2025
3cfea01
Merge branch '6128-use-stripped-url-for-exceptions-from-mailgooglecom…
ioanatflowcrypt Dec 12, 2025
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
8 changes: 5 additions & 3 deletions extension/js/common/platform/catch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ export class Catch {

public static environment(url = location.href): string {
const browserName = Catch.browser().name;
const origin = new URL(location.href).origin;
const origin = new URL(url).origin;
let env = 'unknown';
if (url.includes('bnjglocicd')) {
env = 'ex:prod';
Expand Down Expand Up @@ -262,12 +262,14 @@ export class Catch {
}
}
const exception = Catch.formExceptionFromThrown(thrown);
const reportUrl = location.href.split('?')[0];
return {
name: exception.name.substring(0, 50),
message: Catch.groupSimilarReports(exception.message.substring(0, 200)),
// Use https://mail.google.com/mail as URL for content script errors
// Strip Gmail URLs to group similar errors from different threads/messages
// https://github.com/FlowCrypt/flowcrypt-browser/issues/6031
url: Catch.RUNTIME_ENVIRONMENT === 'ex:s:gmail' ? 'https://mail.google.com/mail' : Catch.groupSimilarReports(location.href.split('?')[0]),
// https://github.com/FlowCrypt/flowcrypt-browser/issues/6128
url: Catch.RUNTIME_ENVIRONMENT.endsWith(':ex:s:gmail') ? 'https://mail.google.com/mail/' : Catch.groupSimilarReports(reportUrl),
line: line || 1,
col: col || 1,
trace: Catch.groupSimilarReports(exception.stack || ''),
Expand Down
31 changes: 31 additions & 0 deletions test/source/tests/browser-unit-tests/unit-Catch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,34 @@ BROWSER_UNIT_TEST_NAME(`Catcher does not include query string on report`);
}
return 'pass';
})();

BROWSER_UNIT_TEST_NAME(`Catcher reports correct URL for Gmail environment`);
(async () => {
const originalEnv = Catch.RUNTIME_ENVIRONMENT;

// https://github.com/FlowCrypt/flowcrypt-browser/issues/6128
const sensitivePaths = [
'/mail/u/0/#inbox/WhctKLbvMNLndrHSj',
'/mail/u/0/#sent/KtbxLzFrMS',
'/mail/u/1/#inbox/rtjXfHsNNgrJVZL',
'/mail/u/1/#search/MSCGwzQrb',
];

try {
for (const path of sensitivePaths) {
const fullUrl = 'https://mail.google.com' + path;

// Simulate environment detection based on the URL
const env = Catch.environment(fullUrl);
Catch.RUNTIME_ENVIRONMENT = env;

const formatted = Catch.formatExceptionForReport({ name: 'Error' });
if (formatted.url !== 'https://mail.google.com/mail/') {
throw new Error(`For path ${path}, expected URL to be 'https://mail.google.com/mail/' but got '${formatted.url}' (env: ${env})`);
}
}
} finally {
Catch.RUNTIME_ENVIRONMENT = originalEnv;
}
return 'pass';
})();
Loading