Bug 339445 - Session store should save/restore sessionStorage data (from DOMStorage), r=mano

browser/components/sessionstore/src/nsSessionStore.js

@@ -956,6 +956,9 @@ SessionStoreService.prototype = {
     else if (tabData.extData)
       delete tabData.extData;
     
+    if (history && browser.docShell instanceof Ci.nsIDocShell)
+      this._serializeSessionStorage(tabData, history, browser.docShell, aFullData);
+    
     return tabData;
   },
 
@@ -1072,6 +1075,52 @@ SessionStoreService.prototype = {
     return entry;
   },
 
+  /**
+   * Updates all sessionStorage "super cookies"
+   * @param aTabData
+   *        The data object for a specific tab
+   * @param aHistory
+   *        That tab's session history
+   * @param aDocShell
+   *        That tab's docshell (containing the sessionStorage)
+   * @param aFullData
+   *        always return privacy sensitive data (use with care)
+   */
+  _serializeSessionStorage:
+    function sss_serializeSessionStorage(aTabData, aHistory, aDocShell, aFullData) {
+    let storageData = {};
+    let hasContent = false;
+
+    for (let i = 0; i < aHistory.count; i++) {
+      let uri = aHistory.getEntryAtIndex(i, false).URI.clone();
+      // sessionStorage is saved per domain (cf. nsDocShell::GetSessionStorageForURI)
+      if (uri instanceof Ci.nsIURL)
+        uri.path = "";
+      if (storageData[uri.spec] || !(aFullData || this._checkPrivacyLevel(uri.schemeIs("https"))))
+        continue;
+
+      let storage = aDocShell.getSessionStorageForURI(uri);
+      if (!storage || storage.length == 0)
+        continue;
+
+      let data = storageData[uri.spec] = {};
+      for (let j = 0; j < storage.length; j++) {
+        try {
+          let key = storage.key(j);
+          let item = storage.getItem(key);
+          data[key] = { value: item.value };
+          if (uri.schemeIs("https") && item.secure)
+            data[key].secure = true;
+        }
+        catch (ex) { /* XXXzeniko this currently throws for secured items (cf. bug 442048) */ }
+      }
+      hasContent = true;
+    }
+
+    if (hasContent)
+      aTabData.storage = storageData;
+  },
+
   /**
    * go through all tabs and store the current scroll positions
    * and innerHTML content of WYSIWYG editors
@@ -1617,6 +1666,9 @@ SessionStoreService.prototype = {
     for (let name in tabData.attributes)
       tab.setAttribute(name, tabData.attributes[name]);
     
+    if (tabData.storage && browser.docShell instanceof Ci.nsIDocShell)
+      this._deserializeSessionStorage(tabData.storage, browser.docShell);
+    
     // notify the tabbrowser that the tab chrome has been restored
     var event = aWindow.document.createEvent("Events");
     event.initEvent("SSTabRestoring", true, false);
@@ -1736,6 +1788,29 @@ SessionStoreService.prototype = {
     return shEntry;
   },
 
+  /**
+   * restores all sessionStorage "super cookies"
+   * @param aStorageData
+   *        Storage data to be restored
+   * @param aDocShell
+   *        A tab's docshell (containing the sessionStorage)
+   */
+  _deserializeSessionStorage: function sss_deserializeSessionStorage(aStorageData, aDocShell) {
+    let ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
+    for (let url in aStorageData) {
+      let uri = ioService.newURI(url, null, null);
+      let storage = aDocShell.getSessionStorageForURI(uri);
+      for (let key in aStorageData[url]) {
+        try {
+          storage.setItem(key, aStorageData[url][key].value);
+          if (uri.schemeIs("https"))
+            storage.getItem(key).secure = aStorageData[url][key].secure || false;
+        }
+        catch (ex) { Cu.reportError(ex); } // throws e.g. for URIs that can't have sessionStorage
+      }
+    }
+  },
+
   /**
    * Restore properties to a loaded document
    */

browser/components/sessionstore/test/browser/Makefile.in

@@ -45,6 +45,8 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _BROWSER_TEST_FILES = \
+	browser_339445.js \
+	browser_339445_sample.html \
 	browser_346337.js \
 	browser_346337_sample.html \
 	browser_350525.js \