зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1484255 - Add Telemetry Events for the certificate error pages. r=nhnt11,keeler
Differential Revision: https://phabricator.services.mozilla.com/D8281 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Johann Hofmann
Родитель
3c9ac6a32d
Коммит
a63c05f4b8
|
|
@ -16,6 +16,8 @@ ChromeUtils.defineModuleGetter(this, "WebNavigationFrames",
|
|||
|
||||
XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);
|
||||
|
||||
XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);
|
||||
|
||||
XPCOMUtils.defineLazyGetter(this, "gPipNSSBundle", function() {
|
||||
return Services.strings.createBundle("chrome://pipnss/locale/pipnss.properties");
|
||||
});
|
||||
|
|
@ -330,6 +332,7 @@ class NetErrorChild extends ActorChild {
|
|||
detailLink.append(input.data.codeString);
|
||||
detailLink.title = input.data.codeString;
|
||||
detailLink.id = "errorCode";
|
||||
detailLink.dataset.telemetryId = "error_code_link";
|
||||
let fragment = BrowserUtils.getLocalizedFragment(doc, linkPrefix, detailLink);
|
||||
technicalInfo.appendChild(fragment);
|
||||
var errorCode = doc.getElementById("errorCode");
|
||||
|
|
@ -364,6 +367,12 @@ class NetErrorChild extends ActorChild {
|
|||
// This is set to true later if the user's system clock is at fault for this error.
|
||||
let clockSkew = false;
|
||||
|
||||
doc.body.setAttribute("code", msg.data.codeString);
|
||||
|
||||
// Need to do this here (which is not exactly at load but a few ticks later),
|
||||
// because this is the first time we have access to the error code.
|
||||
this.recordLoadEvent(doc);
|
||||
|
||||
switch (msg.data.code) {
|
||||
case SSL_ERROR_BAD_CERT_DOMAIN:
|
||||
case SEC_ERROR_OCSP_INVALID_SIGNING_CERT:
|
||||
|
|
@ -556,11 +565,13 @@ class NetErrorChild extends ActorChild {
|
|||
case "click":
|
||||
if (aEvent.button == 0) {
|
||||
if (this.isAboutCertError(doc)) {
|
||||
this.recordClick(aEvent.originalTarget);
|
||||
this.onCertError(aEvent.originalTarget, doc.defaultView);
|
||||
} else {
|
||||
this.onClick(aEvent);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -722,6 +733,38 @@ class NetErrorChild extends ActorChild {
|
|||
});
|
||||
}
|
||||
|
||||
getCSSClass(doc) {
|
||||
let searchParams = new URL(doc.documentURI).searchParams;
|
||||
return searchParams.get("s");
|
||||
}
|
||||
|
||||
recordLoadEvent(doc) {
|
||||
let cssClass = this.getCSSClass(doc);
|
||||
// Telemetry values for events are max. 80 bytes.
|
||||
let errorCode = doc.body.getAttribute("code").substring(0, 40);
|
||||
Services.telemetry.recordEvent("security.ui.certerror", "load", "aboutcerterror", errorCode, {
|
||||
"has_sts": (cssClass == "badStsCert").toString(),
|
||||
"is_frame": (doc.ownerGlobal.parent != doc.ownerGlobal).toString(),
|
||||
});
|
||||
}
|
||||
|
||||
recordClick(element) {
|
||||
let telemetryId = element.dataset.telemetryId;
|
||||
if (!telemetryId) {
|
||||
return;
|
||||
}
|
||||
let doc = element.ownerDocument;
|
||||
let cssClass = this.getCSSClass(doc);
|
||||
// Telemetry values for events are max. 80 bytes.
|
||||
let errorCode = doc.body.getAttribute("code").substring(0, 40);
|
||||
let panel = doc.getElementById("badCertAdvancedPanel");
|
||||
Services.telemetry.recordEvent("security.ui.certerror", "click", telemetryId, errorCode, {
|
||||
"panel_open": (panel.style.display == "none").toString(),
|
||||
"has_sts": (cssClass == "badStsCert").toString(),
|
||||
"is_frame": (doc.ownerGlobal.parent != doc.ownerGlobal).toString(),
|
||||
});
|
||||
}
|
||||
|
||||
onClick(event) {
|
||||
let {documentURI} = event.target.ownerDocument;
|
||||
|
||||
|
|
|
|||
|
|
@ -953,6 +953,8 @@ pref("browser.security.newcerterrorpage.enabled", true);
|
|||
pref("browser.security.newcerterrorpage.enabled", false);
|
||||
#endif
|
||||
|
||||
pref("security.certerrors.recordEventTelemetry", true);
|
||||
|
||||
// Whether to start the private browsing mode at application startup
|
||||
pref("browser.privatebrowsing.autostart", false);
|
||||
|
||||
|
|
|
|||
|
|
@ -171,7 +171,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">&errorReporting.learnMore;</a></p>
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -183,10 +183,10 @@
|
|||
</div>
|
||||
|
||||
<div id="certErrorAndCaptivePortalButtonContainer" class="button-container">
|
||||
<button id="returnButton" class="primary" autocomplete="off">&returnToPreviousPage1.label;</button>
|
||||
<button id="returnButton" class="primary" autocomplete="off" data-telemetry-id="return_button_top">&returnToPreviousPage1.label;</button>
|
||||
<button id="openPortalLoginPageButton" class="primary" autocomplete="off">&openPortalLoginPage.label2;</button>
|
||||
<button id="errorTryAgain" class="primary" autocomplete="off">&retry.label;</button>
|
||||
<button id="advancedButton" autocomplete="off">&continue2.label;</button>
|
||||
<button id="advancedButton" data-telemetry-id="advanced_button" autocomplete="off">&continue2.label;</button>
|
||||
<button id="moreInformationButton" autocomplete="off">&moreInformation.label;</button>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -199,25 +199,25 @@
|
|||
<div id="badCertAdvancedPanel" class="advanced-panel">
|
||||
<p id="badCertTechnicalInfo"/>
|
||||
<div id="advancedPanelButtonContainer" class="button-container">
|
||||
<button id="advancedPanelReturnButton" class="primary" autocomplete="off">&returnToPreviousPage1.label;</button>
|
||||
<button id="advancedPanelReturnButton" class="primary" autocomplete="off" data-telemetry-id="return_button_adv">&returnToPreviousPage1.label;</button>
|
||||
<button id="advancedPanelErrorTryAgain" class="primary" autocomplete="off">&retry.label;</button>
|
||||
<div class="exceptionDialogButtonContainer">
|
||||
<button id="exceptionDialogButton">&securityOverride.exceptionButton1Label;</button>
|
||||
<button id="exceptionDialogButton" data-telemetry-id="exception_button">&securityOverride.exceptionButton1Label;</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="certificateErrorReporting">
|
||||
<p class="toggle-container-with-text">
|
||||
<input type="checkbox" id="automaticallyReportInFuture" role="checkbox" />
|
||||
<input type="checkbox" id="automaticallyReportInFuture" role="checkbox" data-telemetry-id="auto_report_cb"/>
|
||||
<label for="automaticallyReportInFuture" id="automaticallyReportInFuture">&errorReporting.automatic2;</label>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div id="certificateErrorDebugInformation">
|
||||
<button id="copyToClipboard">&certerror.copyToClipboard.label;</button>
|
||||
<button id="copyToClipboard" data-telemetry-id="clipboard_button_top">&certerror.copyToClipboard.label;</button>
|
||||
<div id="certificateErrorText"/>
|
||||
<button id="copyToClipboard">&certerror.copyToClipboard.label;</button>
|
||||
<button id="copyToClipboard" data-telemetry-id="clipboard_button_bot">&certerror.copyToClipboard.label;</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -133,7 +133,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">&errorReporting.learnMore;</a></p>
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -141,7 +141,7 @@
|
|||
init for other error types .-->
|
||||
<div id="certificateErrorReporting">
|
||||
<p class="toggle-container-with-text">
|
||||
<input type="checkbox" id="automaticallyReportInFuture" role="checkbox" />
|
||||
<input type="checkbox" id="automaticallyReportInFuture" role="checkbox" data-telemetry-id="auto_report_cb"/>
|
||||
<label for="automaticallyReportInFuture" id="automaticallyReportInFuture">&errorReporting.automatic2;</label>
|
||||
</p>
|
||||
</div>
|
||||
|
|
@ -152,9 +152,9 @@
|
|||
</div>
|
||||
|
||||
<div id="certErrorAndCaptivePortalButtonContainer" class="button-container">
|
||||
<button id="returnButton" class="primary" autocomplete="off">&returnToPreviousPage.label;</button>
|
||||
<button id="returnButton" class="primary" autocomplete="off" data-telemetry-id="return_button_top">&returnToPreviousPage.label;</button>
|
||||
<button id="openPortalLoginPageButton" class="primary" autocomplete="off">&openPortalLoginPage.label2;</button>
|
||||
<button id="advancedButton" autocomplete="off">&advanced.label;</button>
|
||||
<button id="advancedButton" data-telemetry-id="advanced_button" autocomplete="off">&advanced.label;</button>
|
||||
<button id="moreInformationButton" autocomplete="off">&moreInformation.label;</button>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -170,14 +170,14 @@
|
|||
<button id="advancedPanelErrorTryAgain" class="primary" autocomplete="off">&retry.label;</button>
|
||||
</div>
|
||||
<div class="exceptionDialogButtonContainer">
|
||||
<button id="exceptionDialogButton">&securityOverride.exceptionButtonLabel;</button>
|
||||
<button id="exceptionDialogButton" data-telemetry-id="exception_button">&securityOverride.exceptionButtonLabel;</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="certificateErrorDebugInformation">
|
||||
<button id="copyToClipboard">&certerror.copyToClipboard.label;</button>
|
||||
<button id="copyToClipboard" data-telemetry-id="clipboard_button_top">&certerror.copyToClipboard.label;</button>
|
||||
<div id="certificateErrorText"/>
|
||||
<button id="copyToClipboard">&certerror.copyToClipboard.label;</button>
|
||||
<button id="copyToClipboard" data-telemetry-id="clipboard_button_bot">&certerror.copyToClipboard.label;</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -3038,15 +3038,10 @@ var BrowserOnClick = {
|
|||
},
|
||||
|
||||
onCertError(browser, elementId, isTopFrame, location, securityInfoAsString, frameId) {
|
||||
let secHistogram = Services.telemetry.getHistogramById("SECURITY_UI");
|
||||
let securityInfo;
|
||||
|
||||
switch (elementId) {
|
||||
case "exceptionDialogButton":
|
||||
if (isTopFrame) {
|
||||
secHistogram.add(Ci.nsISecurityUITelemetry.WARNING_BAD_CERT_TOP_CLICK_ADD_EXCEPTION);
|
||||
}
|
||||
|
||||
securityInfo = getSecurityInfo(securityInfoAsString);
|
||||
let params = { exceptionAdded: false,
|
||||
securityInfo };
|
||||
|
|
@ -3095,9 +3090,6 @@ var BrowserOnClick = {
|
|||
break;
|
||||
|
||||
case "returnButton":
|
||||
if (isTopFrame) {
|
||||
secHistogram.add(Ci.nsISecurityUITelemetry.WARNING_BAD_CERT_TOP_GET_ME_OUT_OF_HERE);
|
||||
}
|
||||
goBackFromErrorPage();
|
||||
break;
|
||||
|
||||
|
|
@ -3107,10 +3099,6 @@ var BrowserOnClick = {
|
|||
|
||||
case "advancedButton":
|
||||
case "moreInformationButton":
|
||||
if (isTopFrame) {
|
||||
secHistogram.add(Ci.nsISecurityUITelemetry.WARNING_BAD_CERT_TOP_UNDERSTAND_RISKS);
|
||||
}
|
||||
|
||||
securityInfo = getSecurityInfo(securityInfoAsString);
|
||||
let errorInfo = getDetailedCertErrorInfo(location,
|
||||
securityInfo);
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@ support-files =
|
|||
searchSuggestionEngine.sjs
|
||||
searchSuggestionEngine.xml
|
||||
POSTSearchEngine.xml
|
||||
dummy_page.html
|
||||
|
||||
[browser_aboutCertError.js]
|
||||
support-files =
|
||||
dummy_page.html
|
||||
[browser_aboutCertError_telemetry.js]
|
||||
[browser_aboutHome_search_POST.js]
|
||||
[browser_aboutHome_search_composing.js]
|
||||
[browser_aboutHome_search_searchbar.js]
|
||||
|
|
|
|||
|
|
@ -7,47 +7,11 @@
|
|||
|
||||
const GOOD_PAGE = "https://example.com/";
|
||||
const GOOD_PAGE_2 = "https://example.org/";
|
||||
const DUMMY_PAGE = getRootDirectory(gTestPath).replace("chrome://mochitests/content", GOOD_PAGE) + "dummy_page.html";
|
||||
const BAD_CERT = "https://expired.example.com/";
|
||||
const UNKNOWN_ISSUER = "https://self-signed.example.com ";
|
||||
const BAD_STS_CERT = "https://badchain.include-subdomains.pinning.example.com:443";
|
||||
const {TabStateFlusher} = ChromeUtils.import("resource:///modules/sessionstore/TabStateFlusher.jsm", {});
|
||||
|
||||
function injectErrorPageFrame(tab, src) {
|
||||
return ContentTask.spawn(tab.linkedBrowser, {frameSrc: src}, async function({frameSrc}) {
|
||||
let loaded = ContentTaskUtils.waitForEvent(content.wrappedJSObject, "DOMFrameContentLoaded");
|
||||
let iframe = content.document.createElement("iframe");
|
||||
iframe.src = frameSrc;
|
||||
content.document.body.appendChild(iframe);
|
||||
await loaded;
|
||||
// We will have race conditions when accessing the frame content after setting a src,
|
||||
// so we can't wait for AboutNetErrorLoad. Let's wait for the certerror class to
|
||||
// appear instead (which should happen at the same time as AboutNetErrorLoad).
|
||||
await ContentTaskUtils.waitForCondition(() =>
|
||||
iframe.contentDocument.body.classList.contains("certerror"));
|
||||
});
|
||||
}
|
||||
|
||||
async function openErrorPage(src, useFrame) {
|
||||
let tab;
|
||||
if (useFrame) {
|
||||
info("Loading cert error page in an iframe");
|
||||
tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, DUMMY_PAGE);
|
||||
await injectErrorPageFrame(tab, src);
|
||||
} else {
|
||||
let certErrorLoaded;
|
||||
tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, () => {
|
||||
gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser, src);
|
||||
let browser = gBrowser.selectedBrowser;
|
||||
certErrorLoaded = BrowserTestUtils.waitForErrorPage(browser);
|
||||
}, false);
|
||||
info("Loading and waiting for the cert error");
|
||||
await certErrorLoaded;
|
||||
}
|
||||
|
||||
return tab;
|
||||
}
|
||||
|
||||
add_task(async function checkReturnToAboutHome() {
|
||||
info("Loading a bad cert page directly and making sure 'return to previous page' goes to about:home");
|
||||
for (let useFrame of [false, true]) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,121 @@
|
|||
/* Any copyright is dedicated to the Public Domain.
|
||||
* http://creativecommons.org/publicdomain/zero/1.0/ */
|
||||
|
||||
"use strict";
|
||||
|
||||
requestLongerTimeout(2);
|
||||
|
||||
const BAD_CERT = "https://expired.example.com/";
|
||||
const BAD_STS_CERT = "https://badchain.include-subdomains.pinning.example.com:443";
|
||||
|
||||
add_task(async function checkTelemetryClickEvents() {
|
||||
info("Loading a bad cert page and verifying telemetry click events arrive.");
|
||||
|
||||
let oldCanRecord = Services.telemetry.canRecordExtended;
|
||||
Services.telemetry.canRecordExtended = true;
|
||||
|
||||
registerCleanupFunction(() => {
|
||||
Services.telemetry.canRecordExtended = oldCanRecord;
|
||||
});
|
||||
|
||||
// For obvious reasons event telemetry in the content processes updates with
|
||||
// the main processs asynchronously, so we need to wait for the main process
|
||||
// to catch up through the entire test.
|
||||
|
||||
// There's an arbitrary interval of 2 seconds in which the content
|
||||
// processes sync their event data with the parent process, we wait
|
||||
// this out to ensure that we clear everything that is left over from
|
||||
// previous tests and don't receive random events in the middle of our tests.
|
||||
// eslint-disable-next-line mozilla/no-arbitrary-setTimeout
|
||||
await new Promise(c => setTimeout(c, 2000));
|
||||
|
||||
// Clear everything.
|
||||
Services.telemetry.clearEvents();
|
||||
await TestUtils.waitForCondition(() => {
|
||||
let events = Services.telemetry.snapshotEvents(
|
||||
Ci.nsITelemetry.DATASET_RELEASE_CHANNEL_OPTIN, true).content;
|
||||
return !events || !events.length;
|
||||
});
|
||||
|
||||
// Now enable recording our telemetry. Even if this is disabled, content
|
||||
// processes will send event telemetry to the parent, thus we needed to ensure
|
||||
// we waited and cleared first. Sigh.
|
||||
Services.telemetry.setEventRecordingEnabled("security.ui.certerror", true);
|
||||
|
||||
for (let useFrame of [false, true]) {
|
||||
let recordedObjects = [
|
||||
"advanced_button",
|
||||
"learn_more_link",
|
||||
"auto_report_cb",
|
||||
"error_code_link",
|
||||
"clipboard_button_top",
|
||||
"clipboard_button_bot",
|
||||
"return_button_top",
|
||||
"return_button_adv",
|
||||
];
|
||||
|
||||
if (!useFrame) {
|
||||
recordedObjects.push("exception_button");
|
||||
}
|
||||
|
||||
for (let object of recordedObjects) {
|
||||
let tab = await openErrorPage(BAD_CERT, useFrame);
|
||||
let browser = tab.linkedBrowser;
|
||||
|
||||
let loadEvents = await TestUtils.waitForCondition(() => {
|
||||
let events = Services.telemetry.snapshotEvents(
|
||||
Ci.nsITelemetry.DATASET_RELEASE_CHANNEL_OPTIN, true).content;
|
||||
if (events && events.length) {
|
||||
events = events.filter(e => e[1] == "security.ui.certerror" && e[2] == "load");
|
||||
if (events.length == 1 && events[0][5].is_frame == useFrame.toString()) {
|
||||
return events;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}, "recorded telemetry for the load");
|
||||
|
||||
is(loadEvents.length, 1, `recorded telemetry for the load testing ${object}, useFrame: ${useFrame}`);
|
||||
|
||||
await ContentTask.spawn(browser, {frame: useFrame, objectId: object}, async function({frame, objectId}) {
|
||||
let doc = frame ? content.document.querySelector("iframe").contentDocument : content.document;
|
||||
|
||||
await ContentTaskUtils.waitForCondition(() => doc.body.classList.contains("certerror"), "Wait for certerror to be loaded");
|
||||
|
||||
let domElement = doc.querySelector(`[data-telemetry-id='${objectId}']`);
|
||||
domElement.click();
|
||||
});
|
||||
|
||||
let clickEvents = await TestUtils.waitForCondition(() => {
|
||||
let events = Services.telemetry.snapshotEvents(
|
||||
Ci.nsITelemetry.DATASET_RELEASE_CHANNEL_OPTIN, true).content;
|
||||
if (events && events.length) {
|
||||
events = events.filter(e => e[1] == "security.ui.certerror" && e[2] == "click" && e[3] == object);
|
||||
if (events.length == 1 && events[0][5].is_frame == useFrame.toString()) {
|
||||
return events;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}, "Has captured telemetry events.");
|
||||
|
||||
is(clickEvents.length, 1, `recorded telemetry for the click on ${object}, useFrame: ${useFrame}`);
|
||||
|
||||
// We opened an extra tab for the SUMO page, need to close it.
|
||||
if (object == "learn_more_link") {
|
||||
BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
||||
}
|
||||
|
||||
if (object == "exception_button") {
|
||||
let certOverrideService = Cc["@mozilla.org/security/certoverride;1"]
|
||||
.getService(Ci.nsICertOverrideService);
|
||||
certOverrideService.clearValidityOverride("expired.example.com", -1);
|
||||
}
|
||||
|
||||
BrowserTestUtils.removeTab(gBrowser.selectedTab);
|
||||
}
|
||||
}
|
||||
|
||||
let enableCertErrorUITelemetry =
|
||||
Services.prefs.getBoolPref("security.certerrors.recordEventTelemetry");
|
||||
Services.telemetry.setEventRecordingEnabled("security.ui.certerror",
|
||||
enableCertErrorUITelemetry);
|
||||
});
|
||||
|
|
@ -1,5 +1,42 @@
|
|||
/* eslint-env mozilla/frame-script */
|
||||
|
||||
function injectErrorPageFrame(tab, src) {
|
||||
return ContentTask.spawn(tab.linkedBrowser, {frameSrc: src}, async function({frameSrc}) {
|
||||
let loaded = ContentTaskUtils.waitForEvent(content.wrappedJSObject, "DOMFrameContentLoaded");
|
||||
let iframe = content.document.createElement("iframe");
|
||||
iframe.src = frameSrc;
|
||||
content.document.body.appendChild(iframe);
|
||||
await loaded;
|
||||
// We will have race conditions when accessing the frame content after setting a src,
|
||||
// so we can't wait for AboutNetErrorLoad. Let's wait for the certerror class to
|
||||
// appear instead (which should happen at the same time as AboutNetErrorLoad).
|
||||
await ContentTaskUtils.waitForCondition(() =>
|
||||
iframe.contentDocument.body.classList.contains("certerror"));
|
||||
});
|
||||
}
|
||||
|
||||
async function openErrorPage(src, useFrame) {
|
||||
let dummyPage = getRootDirectory(gTestPath).replace("chrome://mochitests/content", "https://example.com") + "dummy_page.html";
|
||||
|
||||
let tab;
|
||||
if (useFrame) {
|
||||
info("Loading cert error page in an iframe");
|
||||
tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, dummyPage);
|
||||
await injectErrorPageFrame(tab, src);
|
||||
} else {
|
||||
let certErrorLoaded;
|
||||
tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, () => {
|
||||
gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser, src);
|
||||
let browser = gBrowser.selectedBrowser;
|
||||
certErrorLoaded = BrowserTestUtils.waitForErrorPage(browser);
|
||||
}, false);
|
||||
info("Loading and waiting for the cert error");
|
||||
await certErrorLoaded;
|
||||
}
|
||||
|
||||
return tab;
|
||||
}
|
||||
|
||||
function waitForCondition(condition, nextTest, errorMsg, retryTimes) {
|
||||
retryTimes = typeof retryTimes !== "undefined" ? retryTimes : 30;
|
||||
var tries = 0;
|
||||
|
|
|
|||
|
|
@ -1552,6 +1552,13 @@ BrowserGlue.prototype = {
|
|||
ContextualIdentityService.load();
|
||||
});
|
||||
|
||||
Services.tm.idleDispatchToMainThread(() => {
|
||||
let enableCertErrorUITelemetry =
|
||||
Services.prefs.getBoolPref("security.certerrors.recordEventTelemetry", false);
|
||||
Services.telemetry.setEventRecordingEnabled("security.ui.certerror",
|
||||
enableCertErrorUITelemetry);
|
||||
});
|
||||
|
||||
// Load the Login Manager data from disk off the main thread, some time
|
||||
// after startup. If the data is required before this runs, for example
|
||||
// because a restored page contains a password field, it will be loaded on
|
||||
|
|
|
|||
|
|
@ -4545,15 +4545,6 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI,
|
|||
cssClass.AssignLiteral("badStsCert");
|
||||
}
|
||||
|
||||
uint32_t bucketId;
|
||||
if (isStsHost) {
|
||||
// measuring STS separately allows us to measure click through
|
||||
// rates easily
|
||||
bucketId = nsISecurityUITelemetry::WARNING_BAD_CERT_TOP_STS;
|
||||
} else {
|
||||
bucketId = nsISecurityUITelemetry::WARNING_BAD_CERT_TOP;
|
||||
}
|
||||
|
||||
// See if an alternate cert error page is registered
|
||||
nsAutoCString alternateErrorPage;
|
||||
nsresult rv =
|
||||
|
|
@ -4562,10 +4553,6 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI,
|
|||
if (NS_SUCCEEDED(rv)) {
|
||||
errorPage.Assign(alternateErrorPage);
|
||||
}
|
||||
|
||||
if (!IsFrame() && errorPage.EqualsIgnoreCase("certerror")) {
|
||||
Telemetry::Accumulate(mozilla::Telemetry::SECURITY_UI, bucketId);
|
||||
}
|
||||
} else {
|
||||
error = "nssFailure2";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -116,13 +116,13 @@ const uint32_t WARNING_GEOLOCATION_REQUEST_NEVER_SHARE = 49;
|
|||
// const uint32_t WARNING_PHISHING_PAGE_FRAME_GET_ME_OUT_OF_HERE = 66;
|
||||
// const uint32_t WARNING_PHISHING_PAGE_FRAME_IGNORE_WARNING = 67;
|
||||
|
||||
const uint32_t WARNING_BAD_CERT_TOP = 68;
|
||||
const uint32_t WARNING_BAD_CERT_TOP_STS = 69;
|
||||
const uint32_t WARNING_BAD_CERT_TOP_CLICK_ADD_EXCEPTION = 70;
|
||||
//const uint32_t WARNING_BAD_CERT_TOP = 68;
|
||||
//const uint32_t WARNING_BAD_CERT_TOP_STS = 69;
|
||||
//const uint32_t WARNING_BAD_CERT_TOP_CLICK_ADD_EXCEPTION = 70;
|
||||
const uint32_t WARNING_BAD_CERT_TOP_CLICK_VIEW_CERT = 71;
|
||||
const uint32_t WARNING_BAD_CERT_TOP_DONT_REMEMBER_EXCEPTION = 72;
|
||||
const uint32_t WARNING_BAD_CERT_TOP_GET_ME_OUT_OF_HERE = 73;
|
||||
const uint32_t WARNING_BAD_CERT_TOP_UNDERSTAND_RISKS = 74;
|
||||
//const uint32_t WARNING_BAD_CERT_TOP_GET_ME_OUT_OF_HERE = 73;
|
||||
//const uint32_t WARNING_BAD_CERT_TOP_UNDERSTAND_RISKS = 74;
|
||||
// removed WARNING_BAD_CERT_TOP_TECHNICAL_DETAILS = 75;
|
||||
|
||||
const uint32_t WARNING_BAD_CERT_TOP_ADD_EXCEPTION_BASE = 76;
|
||||
|
|
|
|||
|
|
@ -552,6 +552,53 @@ devtools.main:
|
|||
os: The OS name and version e.g. "Linux 4.4.0-1014-aws", "Darwin 14.5.0", "Windows_NT 6.1.7601" or "Windows_NT 10.0.15063." This can be used to make sense of data when a feature is only available from a particular operating system build number.
|
||||
session_id: The start time of the session in milliseconds since epoch (Unix Timestamp) e.g. 1396381378123.
|
||||
|
||||
security.ui.certerror:
|
||||
load:
|
||||
objects: ["aboutcerterror"]
|
||||
bug_numbers:
|
||||
- 1484255
|
||||
description: >
|
||||
The about:certerror page is loaded, keyed by error code, see https://searchfox.org/mozilla-central/source/security/nss/lib/mozpkix/include/pkix/Result.h
|
||||
expiry_version: "70"
|
||||
notification_emails:
|
||||
- jhofmann@mozilla.com
|
||||
- seceng-telemetry@mozilla.com
|
||||
release_channel_collection: opt-in
|
||||
record_in_processes: ["content"]
|
||||
products:
|
||||
- firefox
|
||||
extra_keys:
|
||||
is_frame: If the error page is loaded in an iframe.
|
||||
has_sts: If the error page is for a site with HSTS headers or with a pinned key.
|
||||
click:
|
||||
objects: [
|
||||
"advanced_button",
|
||||
"exception_button",
|
||||
"return_button_top",
|
||||
"return_button_adv",
|
||||
"learn_more_link",
|
||||
"auto_report_cb",
|
||||
"error_code_link",
|
||||
"clipboard_button_top",
|
||||
"clipboard_button_bot",
|
||||
]
|
||||
bug_numbers:
|
||||
- 1484255
|
||||
description: >
|
||||
User interaction by click events on the cert error page. Keyed by error code, see https://searchfox.org/mozilla-central/source/security/nss/lib/mozpkix/include/pkix/Result.h
|
||||
expiry_version: "70"
|
||||
notification_emails:
|
||||
- jhofmann@mozilla.com
|
||||
- seceng-telemetry@mozilla.com
|
||||
release_channel_collection: opt-in
|
||||
record_in_processes: ["content"]
|
||||
products:
|
||||
- firefox
|
||||
extra_keys:
|
||||
is_frame: If the error page is loaded in an iframe.
|
||||
has_sts: If the error page is for a site with HSTS headers or with a pinned key.
|
||||
panel_open: If the advanced panel was open at the time of the interaction.
|
||||
|
||||
security.ui.identitypopup:
|
||||
open:
|
||||
objects: ["identity_popup"]
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче