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

Bug 1284835: Replaced Hardcoded URLs with Services.urlFormatter.formatURLPref r=johannh

Browse Source 
Bug 1284835: Replaced Hardcoded URLs with Services.urlFormatter.formatURLPref r=reviewers

Differential Revision: https://phabricator.services.mozilla.com/D21834
This commit is contained in:
Syeda Asra Arshia Qadri
2019-03-13 08:23:00 +00:00
parent 4eb7131fba
commit 5aee5576c7
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
browser/actors/NetErrorChild.jsm
View File

@@ -383,10 +383,26 @@ class NetErrorChild extends ActorChild {
this._setTechDetails(msg, doc);
let learnMoreLink = doc.getElementById("learnMoreLink");
let baseURL = Services.urlFormatter.formatURLPref("app.support.baseURL");
learnMoreLink.setAttribute("href", baseURL + "connection-not-secure");
let errWhatToDo = doc.getElementById("es_nssBadCert_" + msg.data.codeString);
let es = doc.getElementById("errorWhatToDoText");
let errWhatToDoTitle = doc.getElementById("edd_nssBadCert");
let est = doc.getElementById("errorWhatToDoTitleText");
let searchParams = new URLSearchParams(doc.documentURI.split("?")[1]);
let error = searchParams.get("e");
if (error == "sslv3Used") {
learnMoreLink.setAttribute("href", baseURL + "sslv3-error-messages");
}
if (error == "nssFailure2") {
let shortDesc = doc.getElementById("errorShortDescText").textContent;
// nssFailure2 also gets us other non-overrideable errors. Choose
// a "learn more" link based on description:
if (shortDesc.includes("MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE")) {
learnMoreLink.setAttribute("href", baseURL + "certificate-pinning-reports");
}
}
// This is set to true later if the user's system clock is at fault for this error.
let clockSkew = false;

2
browser/base/content/aboutNetError-new.xhtml
View File

@@ -182,7 +182,7 @@
<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" data-telemetry-id="learn_more_link">&errorReporting.learnMore;</a></p>
<p><a id="learnMoreLink" target="new" data-telemetry-id="learn_more_link">&errorReporting.learnMore;</a></p>
</div>
</div>

9
browser/base/content/aboutNetError.js
View File

@@ -222,8 +222,6 @@ function initPage() {
if (err == "sslv3Used") {
document.getElementById("learnMoreContainer").style.display = "block";
let learnMoreLink = document.getElementById("learnMoreLink");
learnMoreLink.href = "https://support.mozilla.org/kb/how-resolve-sslv3-error-messages-firefox";
document.body.className = "certerror";
}
@@ -248,13 +246,6 @@ function initPage() {
if (getErrorCode() == "nssFailure2") {
let shortDesc = document.getElementById("errorShortDescText").textContent;
document.getElementById("learnMoreContainer").style.display = "block";
let learnMoreLink = document.getElementById("learnMoreLink");
// nssFailure2 also gets us other non-overrideable errors. Choose
// a "learn more" link based on description:
if (shortDesc.includes("MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE")) {
learnMoreLink.href = "https://support.mozilla.org/kb/certificate-pinning-reports";
}
var options = JSON.parse(evt.detail);
if (options && options.enabled) {
var checkbox = document.getElementById("automaticallyReportInFuture");