corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1597228 - move reportFalseDeceptiveSite to browser-safebrowsing.js, r=firefox-desktop-core-reviewers ,mossop

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D238761
This commit is contained in:
Gijs Kruitbosch
2025-02-24 15:30:41 +00:00
parent 8a155fd76c
commit d7fff069d3
5 changed files with 44 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
browser/base/content/browser-menubar.js
View File

@@ -95,7 +95,7 @@ document.addEventListener(
});
break;
case "menu_HelpPopup_reportPhishingErrortoolmenu":
ReportFalseDeceptiveSite();
gSafeBrowsing.reportFalseDeceptiveSite();
break;
case "helpSwitchDevice":
openSwitchingDevicesPage();

42
browser/base/content/browser-safebrowsing.js
View File

@@ -72,4 +72,46 @@ var gSafeBrowsing = {
}
return SafeBrowsing.getReportURL(name, reportInfo);
},
reportFalseDeceptiveSite() {
let contextsToVisit = [gBrowser.selectedBrowser.browsingContext];
while (contextsToVisit.length) {
let currentContext = contextsToVisit.pop();
let global = currentContext.currentWindowGlobal;
if (!global) {
continue;
}
let docURI = global.documentURI;
// Ensure the page is an about:blocked pagae before handling.
if (
docURI &&
docURI.spec.startsWith("about:blocked?e=deceptiveBlocked")
) {
let actor = global.getActor("BlockedSite");
actor.sendQuery("DeceptiveBlockedDetails").then(data => {
let reportUrl = gSafeBrowsing.getReportURL(
"PhishMistake",
data.blockedInfo
);
if (reportUrl) {
openTrustedLinkIn(reportUrl, "tab");
} else {
let bundle = Services.strings.createBundle(
"chrome://browser/locale/safebrowsing/safebrowsing.properties"
);
Services.prompt.alert(
window,
bundle.GetStringFromName("errorReportFalseDeceptiveTitle"),
bundle.formatStringFromName("errorReportFalseDeceptiveMessage", [
data.blockedInfo.provider,
])
);
}
});
}
contextsToVisit.push(...currentContext.children);
}
},
};

39
browser/base/content/browser.js
View File

@@ -4978,45 +4978,6 @@ function undoCloseWindow(aIndex) {
return window;
}
function ReportFalseDeceptiveSite() {
let contextsToVisit = [gBrowser.selectedBrowser.browsingContext];
while (contextsToVisit.length) {
let currentContext = contextsToVisit.pop();
let global = currentContext.currentWindowGlobal;
if (!global) {
continue;
}
let docURI = global.documentURI;
// Ensure the page is an about:blocked pagae before handling.
if (docURI && docURI.spec.startsWith("about:blocked?e=deceptiveBlocked")) {
let actor = global.getActor("BlockedSite");
actor.sendQuery("DeceptiveBlockedDetails").then(data => {
let reportUrl = gSafeBrowsing.getReportURL(
"PhishMistake",
data.blockedInfo
);
if (reportUrl) {
openTrustedLinkIn(reportUrl, "tab");
} else {
let bundle = Services.strings.createBundle(
"chrome://browser/locale/safebrowsing/safebrowsing.properties"
);
Services.prompt.alert(
window,
bundle.GetStringFromName("errorReportFalseDeceptiveTitle"),
bundle.formatStringFromName("errorReportFalseDeceptiveMessage", [
data.blockedInfo.provider,
])
);
}
});
}
contextsToVisit.push(...currentContext.children);
}
}
/**
* This is a temporary hack to connect a Help menu item for reporting
* site issues to the WebCompat team's Site Compatability Reporter

1
browser/base/content/browser.js.globals
View File

@@ -88,7 +88,6 @@
"restoreLastClosedTabOrWindowOrSession",
"undoCloseTab",
"undoCloseWindow",
"ReportFalseDeceptiveSite",
"ReportSiteIssue",
"gRemoteControl",
"gPrivateBrowsingUI",

2
browser/components/customizableui/content/panelUI.js
View File

@@ -755,7 +755,7 @@ const PanelUI = {
});
break;
case "appMenu_menu_HelpPopup_reportPhishingErrortoolmenu":
ReportFalseDeceptiveSite();
gSafeBrowsing.reportFalseDeceptiveSite();
break;
case "appMenu_helpSwitchDevice":
openSwitchingDevicesPage();