Issue 4483 - Update page structure when sitekey is received

lib/whitelisting.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 116 matching lines @@
   for (; frame != null; frame = frame.parent)
   {
     let key = keys[stringifyURL(frame.url)];
     if (key)
       return key;
   }
 
   return null;
 };
 
-function recordKey(token, page, url)
+function checkKey(token, url)
 {
   let parts = token.split("_");
   if (parts.length < 2)
-    return;
+    return false;
 
   let key = parts[0].replace(/=/g, "");
   let signature = parts[1];
   let data = url.pathname + url.search + "\0" +
              url.host + "\0" +
              window.navigator.userAgent;
   if (!verifySignature(key, signature, data))
-    return;
+    return false;
 
+  return key;
+}
+
+function recordKey(key, page, url)
+{
   let keys = sitekeys.get(page);
   if (!keys)
   {
     keys = Object.create(null);
     sitekeys.set(page, keys);
   }
   keys[stringifyURL(url)] = key;
 }
 
 port.on("filters.addKey", (message, sender) =>
 {
-  recordKey(message.token, sender.page, sender.frame.url);
+  let key = checkKey(message.token, sender.frame.url);
+  if (key)
+    recordKey(key, sender.page, sender.frame.url);
 });
 
 function onHeadersReceived(details)
 {
   let page = new ext.Page({id: details.tabId});
 
   for (let header of details.responseHeaders)
+  {
     if (header.name.toLowerCase() == "x-adblock-key" && header.value)
-      recordKey(header.value, page, new URL(details.url));
+    {
+      let url = new URL(details.url);
+      let key = checkKey(header.value, url);
+      if (key)
+      {
+        // For pre-rendered tabs we don't know for sure the navigation is going
+        // to happen until the onCommitted event fires. Unfortunately if we want
+        // sitekey whitelisting to work for requests made before onCommitted has
+        // been fired we must update the page structure now anyway.
+        ext._updatePageFrameStructure(details.frameId, details.tabId, details.url, true);
+        recordKey(key, page, url);
+        break;
+      }
+    }
+  }
 }
 
 if (typeof chrome == "object")
   chrome.webRequest.onHeadersReceived.addListener(
     onHeadersReceived,
     {
       urls: ["http://*/*", "https://*/*"],
       types: ["main_frame", "sub_frame"]
     },
     ["responseHeaders"]
   );