Bug 463256 - SSL sites sometimes don't load after re-entering regular browsing mode (from Private Browsing); r=mconnor,sdwilsh

browser/components/privatebrowsing/src/nsPrivateBrowsingService.js

@@ -275,6 +275,18 @@ PrivateBrowsingService.prototype = {
                       getService(Ci.nsIHttpAuthManager);
         authMgr.clearAll();
 
+        // Prevent any SSL sockets from remaining open.  Without this, SSL
+        // websites may fail to load after switching the private browsing mode
+        // because the SSL sockets may still be open while the corresponding
+        // NSS resources have been destroyed by the logoutAndTeardown call
+        // above.  See bug 463256 for more information.
+        let ios = Cc["@mozilla.org/network/io-service;1"].
+                  getService(Ci.nsIIOService);
+        if (!ios.offline) {
+          ios.offline = true;
+          ios.offline = false;
+        }
+
         if (!this._inPrivateBrowsing) {
           // Clear the error console
           let consoleService = Cc["@mozilla.org/consoleservice;1"].

browser/components/privatebrowsing/test/browser/Makefile.in

@@ -58,6 +58,8 @@ _BROWSER_TEST_FILES =  \
 		browser_privatebrowsing_windowtitle_page.html \
 		browser_privatebrowsing_urlbarfocus.js \
 		$(NULL)
+# Test for bug 463256 disabled until we figure why it fails intermittently (bug 486640)
+#		browser_privatebrowsing_sslsite_transition.js \
 
 libs:: $(_BROWSER_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)

browser/components/privatebrowsing/test/browser/browser_privatebrowsing_sslsite_transition.js

@@ -0,0 +1,80 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Private Browsing Tests.
+ *
+ * The Initial Developer of the Original Code is
+ * Ehsan Akhgari.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ehsan Akhgari <ehsan.akhgari@gmail.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// This test makes sure that SSL sites load correctly after leaving the
+// Private Browsing mode (bug 463256).
+
+// This test is disabled until we figure why it fails intermittently (bug 486640).
+
+function test() {
+  // initialization
+  let prefBranch = Cc["@mozilla.org/preferences-service;1"].
+                   getService(Ci.nsIPrefBranch);
+  prefBranch.setBoolPref("browser.privatebrowsing.keep_current_session", true);
+  let pb = Cc["@mozilla.org/privatebrowsing;1"].
+           getService(Ci.nsIPrivateBrowsingService);
+
+  const kTestURL = "https://example.com/";
+
+  // load an SSL site in the first tab and wait for it to finish loading
+  let tab = gBrowser.addTab();
+  gBrowser.selectedTab = tab;
+  let browser = gBrowser.getBrowserForTab(tab);
+  browser.addEventListener("load", function() {
+    browser.removeEventListener("load", arguments.callee, true);
+
+    pb.privateBrowsingEnabled = true;
+    pb.privateBrowsingEnabled = false;
+
+    // Note: if the page fails to load, the test will time out
+    browser.addEventListener("load", function() {
+      browser.removeEventListener("load", arguments.callee, true);
+
+      is(browser.contentWindow.location, kTestURL,
+        "The original SSL page should be loaded at this stage");
+
+      gBrowser.removeTab(tab);
+      prefBranch.clearUserPref("browser.privatebrowsing.keep_current_session");
+      finish();
+    }, true);
+
+    executeSoon(function(){
+      browser.contentWindow.location = kTestURL;
+    });
+  }, true);
+  browser.contentWindow.location = kTestURL;
+

browser/components/privatebrowsing/test/unit/test_sslsite_transition.js

@@ -0,0 +1,79 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Private Browsing Tests.
+ *
+ * The Initial Developer of the Original Code is
+ * Ehsan Akhgari.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ehsan Akhgari <ehsan.akhgari@gmail.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// This tests the private browsing service to make sure it switches the offline
+// status as expected (see bug 463256).
+
+function run_test_on_service() {
+  // initialization
+  var pb = Cc[PRIVATEBROWSING_CONTRACT_ID].
+           getService(Ci.nsIPrivateBrowsingService);
+  var os = Cc["@mozilla.org/observer-service;1"].
+           getService(Ci.nsIObserverService);
+  var prefBranch = Cc["@mozilla.org/preferences-service;1"].
+                   getService(Ci.nsIPrefBranch);
+  prefBranch.setBoolPref("browser.privatebrowsing.keep_current_session", true);
+
+  var observer = {
+    observe: function (aSubject, aTopic, aData) {
+      if (aTopic == "network:offline-status-changed")
+        this.events.push(aData);
+    },
+    events: []
+  };
+  os.addObserver(observer, "network:offline-status-changed", false);
+
+  // enter the private browsing mode, and wait for the about:pb page to load
+  pb.privateBrowsingEnabled = true;
+  do_check_eq(observer.events.length, 2);
+  do_check_eq(observer.events[0], "offline");
+  do_check_eq(observer.events[1], "online");
+
+  // leave the private browsing mode, and wait for the SSL page to load again
+  pb.privateBrowsingEnabled = false;
+  do_check_eq(observer.events.length, 4);
+  do_check_eq(observer.events[2], "offline");
+  do_check_eq(observer.events[3], "online");
+
+  os.removeObserver(observer, "network:offline-status-changed", false);
+  prefBranch.clearUserPref("browser.privatebrowsing.keep_current_session");
+}
+
+// Support running tests on both the service itself and its wrapper
+function run_test() {
+  run_test_on_all_services();
+}

toolkit/components/downloads/test/unit/test_privatebrowsing.js

@@ -116,7 +116,6 @@ function run_test() {
   do_test_pending();
   let httpserv = new nsHttpServer();
   httpserv.registerDirectory("/", dirSvc.get("ProfD", Ci.nsILocalFile));
-  httpserv.start(4444);
 
   let tmpDir = Cc["@mozilla.org/file/directory_service;1"].
                getService(Ci.nsIProperties).
@@ -140,7 +139,7 @@ function run_test() {
           if (aDownload.targetFile.exists())
             aDownload.targetFile.remove(false);
           dm.removeListener(this);
-          do_throw("Download failed (name: " + aDownload.name + ", state: " + aDownload.state + ")");
+          do_throw("Download failed (name: " + aDownload.displayName + ", state: " + aDownload.state + ")");
           do_test_finished();
           break;
 
@@ -242,6 +241,7 @@ function run_test() {
             fileB, downloadBName));
 
           // Create Download-C
+          httpserv.start(4444);
           dlC = addDownload({
             targetFile: fileC,
             sourceURI: downloadCSource,