Backed out changeset bc87945ba833 (bug 1342178)

MozReview-Commit-ID: 2TLlzk8hOZY

browser/base/content/browser.js

@@ -3024,8 +3024,7 @@ var BrowserOnClick = {
       case "Browser:CertExceptionError":
         this.onCertError(msg.target, msg.data.elementId,
                          msg.data.isTopFrame, msg.data.location,
-                         msg.data.securityInfoAsString,
+                         msg.data.securityInfoAsString);
-                         msg.data.originAttributesAsString);
       break;
       case "Browser:OpenCaptivePortalPage":
         CaptivePortalWatcher.ensureCaptivePortalTab();
@@ -3089,8 +3088,7 @@ var BrowserOnClick = {
                                  uri.host, uri.port);
   },
 
-  onCertError(browser, elementId, isTopFrame, location, securityInfoAsString,
+  onCertError(browser, elementId, isTopFrame, location, securityInfoAsString) {
-              originAttributesAsString) {
     let secHistogram = Services.telemetry.getHistogramById("SECURITY_UI");
     let securityInfo;
 
@@ -3140,8 +3138,7 @@ var BrowserOnClick = {
 
         securityInfo = getSecurityInfo(securityInfoAsString);
         let errorInfo = getDetailedCertErrorInfo(location,
-                                                 securityInfo,
+                                                 securityInfo);
-                                                 JSON.parse(originAttributesAsString));
         browser.messageManager.sendAsyncMessage( "CertErrorDetails", {
             code: securityInfo.errorCode,
             info: errorInfo
@@ -3153,8 +3150,7 @@ var BrowserOnClick = {
                                     .getService(Ci.nsIClipboardHelper);
         securityInfo = getSecurityInfo(securityInfoAsString);
         let detailedInfo = getDetailedCertErrorInfo(location,
-                                                    securityInfo,
+                                                    securityInfo);
-                                                    JSON.parse(originAttributesAsString));
         gClipboardHelper.copyString(detailedInfo);
         break;
 
@@ -3419,7 +3415,7 @@ function getSecurityInfo(securityInfoAsString) {
  * Returns a string with detailed information about the certificate validation
  * failure from the specified URI that can be used to send a report.
  */
-function getDetailedCertErrorInfo(location, securityInfo, originAttributes) {
+function getDetailedCertErrorInfo(location, securityInfo) {
   if (!securityInfo)
     return "";
 
@@ -3440,8 +3436,8 @@ function getDetailedCertErrorInfo(location, securityInfo, originAttributes) {
 
   let uri = Services.io.newURI(location);
 
-  let hasHSTS = sss.isSecureURI(sss.HEADER_HSTS, uri, flags, originAttributes);
+  let hasHSTS = sss.isSecureURI(sss.HEADER_HSTS, uri, flags);
-  let hasHPKP = sss.isSecureURI(sss.HEADER_HPKP, uri, flags, originAttributes);
+  let hasHPKP = sss.isSecureURI(sss.HEADER_HPKP, uri, flags);
   certErrorDetails += "\r\n\r\n" +
                       gNavigatorBundle.getFormattedString("certErrorDetailsHSTS.label",
                                                           [hasHSTS]);

browser/base/content/content.js

@@ -293,14 +293,6 @@ addMessageListener("DeceptiveBlockedDetails", (message) => {
   });
 });
 
-function getSerializedOriginAttributes(docShell) {
-  let originAttributes = {};
-  if (docShell.failedChannel) {
-    originAttributes = docShell.failedChannel.loadInfo.originAttributes;
-  }
-  return JSON.stringify(originAttributes);
-}
-
 var AboutNetAndCertErrorListener = {
   init(chromeGlobal) {
     addMessageListener("CertErrorDetails", this);
@@ -609,7 +601,6 @@ var ClickEventHandler = {
       elementId: targetElement.getAttribute("id"),
       isTopFrame: (ownerDoc.defaultView.parent === ownerDoc.defaultView),
       securityInfoAsString: getSerializedSecurityInfo(docShell),
-      originAttributesAsString: getSerializedOriginAttributes(docShell),
     });
   },
 

browser/base/content/test/general/browser_aboutCertError.js

@@ -259,13 +259,10 @@ add_task(function* checkAdvancedDetails() {
                                 .QueryInterface(Ci.nsITransportSecurityInfo)
                                 .QueryInterface(Ci.nsISerializable);
     let serializedSecurityInfo = serhelper.serializeToString(serializable);
-    let originAttributes = docShell.failedChannel.loadInfo.originAttributes;
-    let serializedOriginAttributes = JSON.stringify(originAttributes);
     return {
       divDisplay: content.getComputedStyle(div).display,
       text: text.textContent,
-      securityInfoAsString: serializedSecurityInfo,
+      securityInfoAsString: serializedSecurityInfo
-      originAttributesAsString: serializedOriginAttributes,
     };
   });
   isnot(message.divDisplay, "none", "Debug information is visible");
@@ -331,13 +328,10 @@ add_task(function* checkAdvancedDetailsForHSTS() {
                                 .QueryInterface(Ci.nsITransportSecurityInfo)
                                 .QueryInterface(Ci.nsISerializable);
     let serializedSecurityInfo = serhelper.serializeToString(serializable);
-    let originAttributes = docShell.failedChannel.loadInfo.originAttributes;
-    let serializedOriginAttributes = JSON.stringify(originAttributes);
     return {
       divDisplay: content.getComputedStyle(div).display,
       text: text.textContent,
-      securityInfoAsString: serializedSecurityInfo,
+      securityInfoAsString: serializedSecurityInfo
-      originAttributesAsString: serializedOriginAttributes,
     };
   });
   isnot(message.divDisplay, "none", "Debug information is visible");

devtools/client/debugger/new/debugger.js

@@ -8940,20 +8940,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	        let flags = (httpActivity.private) ?
 	                      Ci.nsISocketProvider.NO_PERMANENT_STORAGE : 0;
 
-	        if (!uri) {
-	          // isSecureURI only cares about the host, not the scheme.
 	        let host = httpActivity.hostname;
-	          uri = Services.io.newURI("https://" + host);
-	        }
 
-	        let originAttributes = {};
+	        info.hsts = sss.isSecureHost(sss.HEADER_HSTS, host, flags);
-	        if (httpActivity.channel) {
+	        info.hpkp = sss.isSecureHost(sss.HEADER_HPKP, host, flags);
-	          originAttributes = httpActivity.channel.loadInfo.originAttributes;
-	        }
-	        info.hsts = sss.isSecureURI(sss.HEADER_HSTS, uri, flags,
-	                                    originAttributes);
-	        info.hpkp = sss.isSecureURI(sss.HEADER_HPKP, uri, flags,
-	                                    originAttributes);
 	      } else {
 	        DevToolsUtils.reportException("NetworkHelper.parseSecurityInfo",
 	          "Could not get HSTS/HPKP status as hostname is not available.");

devtools/shared/webconsole/network-helper.js

@@ -644,14 +644,8 @@ var NetworkHelper = {
           uri = Services.io.newURI("https://" + host);
         }
 
-        let originAttributes = {};
+        info.hsts = sss.isSecureURI(sss.HEADER_HSTS, uri, flags);
-        if (httpActivity.channel) {
+        info.hpkp = sss.isSecureURI(sss.HEADER_HPKP, uri, flags);
-          originAttributes = httpActivity.channel.loadInfo.originAttributes;
-        }
-        info.hsts = sss.isSecureURI(sss.HEADER_HSTS, uri, flags,
-                                    originAttributes);
-        info.hpkp = sss.isSecureURI(sss.HEADER_HPKP, uri, flags,
-                                    originAttributes);
       } else {
         DevToolsUtils.reportException("NetworkHelper.parseSecurityInfo",
           "Could not get HSTS/HPKP status as hostname is not available.");