Merge branch 'master' into release

4 files changed, 61 insertions, 47 deletions

diff --git a/application/palemoon/components/nsBrowserGlue.js b/application/palemoon/components/nsBrowserGlue.js
index 01a133833..31a8bf40c 100644
--- a/application/palemoon/components/nsBrowserGlue.js
+++ b/application/palemoon/components/nsBrowserGlue.js
@@ -1198,7 +1198,7 @@ BrowserGlue.prototype = {
   },
 
   _migrateUI: function BG__migrateUI() {
-    const UI_VERSION = 19;
+    const UI_VERSION = 20;
     const BROWSER_DOCURL = "chrome://browser/content/browser.xul#";
     let currentUIVersion = 0;
     try {
@@ -1433,6 +1433,11 @@ BrowserGlue.prototype = {
     }
 #endif
 
+    if (currentUIVersion < 20) {
+      // HPKP change of UI preference; reset enforcement level
+      Services.prefs.clearUserPref("security.cert_pinning.enforcement_level");
+    }
+
     // Update the migration version.
     Services.prefs.setIntPref("browser.migration.version", UI_VERSION);
   },
diff --git a/application/palemoon/components/preferences/security.js b/application/palemoon/components/preferences/security.js
index 9d5f302a2..54fab68ac 100644
--- a/application/palemoon/components/preferences/security.js
+++ b/application/palemoon/components/preferences/security.js
@@ -18,7 +18,6 @@ var gSecurityPane = {
   {
     this._pane = document.getElementById("paneSecurity");
     this._initMasterPasswordUI();
-    this._initHPKPUI();
   },
 
   // ADD-ONS
@@ -233,31 +232,5 @@ var gSecurityPane = {
     document.documentElement.openWindow("Toolkit:PasswordManager",
                                         "chrome://passwordmgr/content/passwordManager.xul",
                                         "", null);
-  },
-  
-  _initHPKPUI: function() {
-    let checkbox = document.getElementById("enableHPKP");
-    let HPKPpref = document.getElementById("security.cert_pinning.enforcement_level");
-
-    if (HPKPpref.value == 0) {
-      checkbox.checked = false;
-    } else {
-      checkbox.checked = true;
-    }
-  },
-      
-  /**
-   * Updates the HPKP enforcement level to the proper value depending on checkbox
-   * state.
-   */
-  updateHPKPPref: function() {
-    let checkbox = document.getElementById("enableHPKP");
-    let HPKPpref = document.getElementById("security.cert_pinning.enforcement_level");
-    
-    if (checkbox.checked) {
-      HPKPpref.value = 2;
-    } else {
-      HPKPpref.value = 0;
-    }
   }
 };
diff --git a/application/palemoon/components/preferences/security.xul b/application/palemoon/components/preferences/security.xul
index bc1625275..9aa3f7a8a 100644
--- a/application/palemoon/components/preferences/security.xul
+++ b/application/palemoon/components/preferences/security.xul
@@ -46,9 +46,9 @@
       <preference id="network.stricttransportsecurity.enabled"
                   name="network.stricttransportsecurity.enabled"
                   type="bool"/>
-      <preference id="security.cert_pinning.enforcement_level"
-                  name="security.cert_pinning.enforcement_level"
-                  type="int"/>
+      <preference id="security.cert_pinning.hpkp.enabled"
+                  name="security.cert_pinning.hpkp.enabled"
+                  type="bool"/>
       
       <!-- Opportunistic Encryption -->
                   
@@ -150,7 +150,7 @@
         <checkbox id="enableHPKP"
                   label="&enableHPKP.label;"
                   accesskey="&enableHPKP.accesskey;"
-                  oncommand="gSecurityPane.updateHPKPPref();"/>
+                  preference="security.cert_pinning.hpkp.enabled"/>
       </vbox>
     </groupbox>
     
diff --git a/application/palemoon/components/statusbar/Status.jsm b/application/palemoon/components/statusbar/Status.jsm
index 19e12ddfd..dbdd1fc49 100644
--- a/application/palemoon/components/statusbar/Status.jsm
+++ b/application/palemoon/components/statusbar/Status.jsm
@@ -120,6 +120,57 @@ S4EStatusService.prototype =
   },
 
   buildBinding: function() {
+  
+    // Object.prototype.watch() shim, based on Eli Grey's polyfill    
+    // object.watch
+    if (!this._window.XULBrowserWindow.watch) {
+      Object.defineProperty(this._window.XULBrowserWindow, "watch", {
+        enumerable: false,
+        configurable: true,
+        writable: false,
+        value: function (prop, handler) {
+          var oldval = this[prop],
+              newval = oldval,
+              getter = function () {
+                return newval;
+              },
+              setter = function (val) {
+                oldval = newval;
+                return newval = handler.call(this, prop, oldval, val);
+              }
+            ;
+
+          try {
+            if (delete this[prop]) { // can't watch constants
+              Object.defineProperty(this, prop, {
+                get: getter,
+                set: setter,
+                enumerable: true,
+                configurable: true
+              });
+            }
+          } catch(e) {
+            // This fails fatally on non-configurable props, so just
+            // ignore errors if it does.
+          }
+        }
+      });
+    }
+
+    // object.unwatch
+    if (!this._window.XULBrowserWindow.unwatch) {
+      Object.defineProperty(this._window.XULBrowserWindow, "unwatch", {
+        enumerable: false,
+        configurable: true,
+        writable: false,
+        value: function (prop) {
+          var val = this[prop];
+          delete this[prop]; // remove accessors
+          this[prop] = val;
+        }
+      });
+    }
+  
     let XULBWPropHandler = function(prop, oldval, newval) {
       CU.reportError("Attempt to modify XULBrowserWindow." + prop);
       return oldval;
@@ -139,21 +190,6 @@ S4EStatusService.prototype =
       this._window.XULBrowserWindow[prop] = this[prop].bind(this);
       this._window.XULBrowserWindow.watch(prop, XULBWPropHandler);
     }, this);
-
-    let XULBWHandler = function(prop, oldval, newval) {
-      if(!newval)
-      {
-        return newval;
-      }
-      CU.reportError("XULBrowserWindow changed. Updating S4E bindings.");
-      this._window.setTimeout(function(self)
-      {
-        self.buildBinding();
-      }, 0, this);
-      return newval;
-    };
-
-    this._window.watch("XULBrowserWindow", XULBWHandler);
   },
 
   destroy: function()