summaryrefslogtreecommitdiffstats
path: root/application/basilisk/base/content
diff options
context:
space:
mode:
Diffstat (limited to 'application/basilisk/base/content')
-rw-r--r--application/basilisk/base/content/aboutNetError.xhtml52
-rw-r--r--application/basilisk/base/content/browser.js24
-rw-r--r--application/basilisk/base/content/content.js28
3 files changed, 1 insertions, 103 deletions
diff --git a/application/basilisk/base/content/aboutNetError.xhtml b/application/basilisk/base/content/aboutNetError.xhtml
index f2de106c2..609725c9e 100644
--- a/application/basilisk/base/content/aboutNetError.xhtml
+++ b/application/basilisk/base/content/aboutNetError.xhtml
@@ -96,11 +96,6 @@
return (node.style.display = toggle[node.style.display]);
}
- function showCertificateErrorReporting() {
- // Display error reporting UI
- document.getElementById("certificateErrorReporting").style.display = "block";
- }
-
function showPrefChangeContainer() {
const panel = document.getElementById("prefChangeContainer");
panel.style.display = "block";
@@ -286,21 +281,6 @@
learnMoreLink.href = "https://support.mozilla.org/kb/how-resolve-weak-crypto-error-messages-firefox";
}
- var options = JSON.parse(evt.detail);
- if (options && options.enabled) {
- var checkbox = document.getElementById("automaticallyReportInFuture");
- showCertificateErrorReporting();
- if (options.automatic) {
- // set the checkbox
- checkbox.checked = true;
- }
-
- checkbox.addEventListener("change", function(evt) {
- var event = new CustomEvent("AboutNetErrorSetAutomatic",
- {bubbles:true, detail:evt.target.checked});
- document.dispatchEvent(event);
- }, false);
- }
const hasPrefStyleError = [
"interrupted", // This happens with subresources that are above the max tls
"SSL_ERROR_PROTOCOL_VERSION_ALERT",
@@ -370,25 +350,6 @@
document.getElementById("learnMoreContainer").style.display = "block";
- let checkbox = document.getElementById("automaticallyReportInFuture");
- checkbox.addEventListener("change", function({target: {checked}}) {
- document.dispatchEvent(new CustomEvent("AboutNetErrorSetAutomatic", {
- detail: checked,
- bubbles: true
- }));
- });
-
- addEventListener("AboutNetErrorOptions", function(event) {
- var options = JSON.parse(event.detail);
- if (options && options.enabled) {
- // Display error reporting UI
- document.getElementById("certificateErrorReporting").style.display = "block";
-
- // set the checkbox
- checkbox.checked = !!options.automatic;
- }
- }, true, true);
-
let event = new CustomEvent("AboutNetErrorLoad", {bubbles:true});
document.getElementById("advancedButton").dispatchEvent(event);
@@ -631,10 +592,6 @@
<!-- Long Description (Note: See netError.dtd for used XHTML tags) -->
<div id="errorLongDesc" />
- <div id="learnMoreContainer">
- <p><a href="https://support.mozilla.org/kb/what-does-your-connection-is-not-secure-mean" id="learnMoreLink" target="new">&errorReporting.learnMore;</a></p>
- </div>
-
<div id="prefChangeContainer" class="button-container">
<p>&prefReset.longDesc;</p>
<button id="prefResetButton" class="primary" autocomplete="off">&prefReset.label;</button>
@@ -652,15 +609,6 @@
<button id="errorTryAgain" class="primary" autocomplete="off" onclick="retryThis(this);">&retry.label;</button>
</div>
- <!-- UI for option to report certificate errors to Mozilla. Removed on
- init for other error types .-->
- <div id="certificateErrorReporting">
- <p class="toggle-container-with-text">
- <input type="checkbox" id="automaticallyReportInFuture" />
- <label for="automaticallyReportInFuture" id="automaticallyReportInFuture">&errorReporting.automatic2;</label>
- </p>
- </div>
-
<div id="advancedPanelContainer">
<div id="weakCryptoAdvancedPanel" class="advanced-panel">
<div id="weakCryptoAdvancedDescription">
diff --git a/application/basilisk/base/content/browser.js b/application/basilisk/base/content/browser.js
index 38c340eea..9ec7715fa 100644
--- a/application/basilisk/base/content/browser.js
+++ b/application/basilisk/base/content/browser.js
@@ -2749,8 +2749,6 @@ var BrowserOnClick = {
mm.addMessageListener("Browser:OpenCaptivePortalPage", this);
mm.addMessageListener("Browser:SiteBlockedError", this);
mm.addMessageListener("Browser:EnableOnlineMode", this);
- mm.addMessageListener("Browser:SendSSLErrorReport", this);
- mm.addMessageListener("Browser:SetSSLErrorReportAuto", this);
mm.addMessageListener("Browser:ResetSSLPreferences", this);
mm.addMessageListener("Browser:SSLErrorReportTelemetry", this);
mm.addMessageListener("Browser:OverrideWeakCrypto", this);
@@ -2765,8 +2763,6 @@ var BrowserOnClick = {
mm.removeMessageListener("Browser:CertExceptionError", this);
mm.removeMessageListener("Browser:SiteBlockedError", this);
mm.removeMessageListener("Browser:EnableOnlineMode", this);
- mm.removeMessageListener("Browser:SendSSLErrorReport", this);
- mm.removeMessageListener("Browser:SetSSLErrorReportAuto", this);
mm.removeMessageListener("Browser:ResetSSLPreferences", this);
mm.removeMessageListener("Browser:SSLErrorReportTelemetry", this);
mm.removeMessageListener("Browser:OverrideWeakCrypto", this);
@@ -2808,11 +2804,6 @@ var BrowserOnClick = {
msg.target.reload();
}
break;
- case "Browser:SendSSLErrorReport":
- this.onSSLErrorReport(msg.target,
- msg.data.uri,
- msg.data.securityInfo);
- break;
case "Browser:ResetSSLPreferences":
for (let prefName of PREF_SSL_IMPACT) {
Services.prefs.clearUserPref(prefName);
@@ -2846,20 +2837,7 @@ var BrowserOnClick = {
},
onSSLErrorReport: function(browser, uri, securityInfo) {
- if (!Services.prefs.getBoolPref("security.ssl.errorReporting.enabled")) {
- Cu.reportError("User requested certificate error report sending, but certificate error reporting is disabled");
- return;
- }
-
- let serhelper = Cc["@mozilla.org/network/serialization-helper;1"]
- .getService(Ci.nsISerializationHelper);
- let transportSecurityInfo = serhelper.deserializeObject(securityInfo);
- transportSecurityInfo.QueryInterface(Ci.nsITransportSecurityInfo)
-
- let errorReporter = Cc["@mozilla.org/securityreporter;1"]
- .getService(Ci.nsISecurityReporter);
- errorReporter.reportTLSError(transportSecurityInfo,
- uri.host, uri.port);
+ Cu.reportError("User requested certificate error report sending, but certificate error reporting is disabled");
},
onCertError: function (browser, elementId, isTopFrame, location, securityInfoAsString) {
diff --git a/application/basilisk/base/content/content.js b/application/basilisk/base/content/content.js
index 5758cb023..88e58b501 100644
--- a/application/basilisk/base/content/content.js
+++ b/application/basilisk/base/content/content.js
@@ -385,18 +385,6 @@ var AboutNetAndCertErrorListener = {
let ownerDoc = originalTarget.ownerDocument;
ClickEventHandler.onCertError(originalTarget, ownerDoc);
}
-
- let automatic = Services.prefs.getBoolPref("security.ssl.errorReporting.automatic");
- content.dispatchEvent(new content.CustomEvent("AboutNetErrorOptions", {
- detail: JSON.stringify({
- enabled: Services.prefs.getBoolPref("security.ssl.errorReporting.enabled"),
- changedCertPrefs: this.changedCertPrefs(),
- automatic: automatic
- })
- }));
-
- sendAsyncMessage("Browser:SSLErrorReportTelemetry",
- {reportStatus: TLS_ERROR_REPORT_TELEMETRY_UI_SHOWN});
},
openCaptivePortalPage: function(evt) {
@@ -408,22 +396,6 @@ var AboutNetAndCertErrorListener = {
sendAsyncMessage("Browser:ResetSSLPreferences");
},
- onSetAutomatic: function(evt) {
- sendAsyncMessage("Browser:SetSSLErrorReportAuto", {
- automatic: evt.detail
- });
-
- // if we're enabling reports, send a report for this failure
- if (evt.detail) {
- let {host, port} = content.document.mozDocumentURIIfNotForErrorPages;
- sendAsyncMessage("Browser:SendSSLErrorReport", {
- uri: { host, port },
- securityInfo: getSerializedSecurityInfo(docShell),
- });
-
- }
- },
-
onOverride: function(evt) {
let {host, port} = content.document.mozDocumentURIIfNotForErrorPages;
sendAsyncMessage("Browser:OverrideWeakCrypto", { uri: {host, port} });
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 23:05:33 +0000