Issue 2396 - Add CSS property filter message responder

messageResponder.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 180 matching lines @@
           FilterStorage.addFilter(result.filter);
         break;
       case "filters.blocked":
         var filter = defaultMatcher.matchesAny(message.url, message.requestType,
           message.docDomain, message.thirdParty);
         callback(filter instanceof BlockingFilter);
         break;
       case "filters.get":
         if (message.what == "cssproperties")
         {
-          if (!message.domain)
+          var filters = [];
+          var isFrameWhitelisted = require("whitelisting").isFrameWhitelisted;
+
+          if (!isFrameWhitelisted(sender.page, sender.frame,
+                                  RegExpFilter.typeMap.DOCUMENT |
+                                  RegExpFilter.typeMap.ELEMHIDE))
           {
-            callback([]);
-            break;
+            filters = CSSRules.getRulesForDomain(sender.frame.url.hostname);
+            filters = filters.map(function(filter)
+            {
+              return {
+                prefix: filter.selectorPrefix,
+                suffix: filter.selectorSuffix,
+                regexp: filter.regexpString
+              };
+            });
           }
-          var specificOnly = require("whitelisting").isFrameWhitelisted(

[Thomas Greiner, 2015/11/03 14:26:02]

I noticed that in "get-selectors" (see
https://hg.adblockplus.org/adblockpluschrome/file/tip/background.js#l302), it
also checks whether the frame is whitelisted to avoid injecting element hiding
filters into whitelisted frames. Because the issue is that content scripts are
running in every frame regardless of whether it is whitelisted or not.

[kzar, 2015/11/03 15:49:49]

Done.

-            sender.page, sender.frame, RegExpFilter.typeMap.GENERICHIDE
-          );
-          var filters = CSSRules.getRulesForDomain(message.domain, specificOnly);
-          filters = filters.map(function(filter)
-          {
-            return {
-              prefix: filter.selectorPrefix,
-              suffix: filter.selectorSuffix,
-              regexp: filter.regexpString
-            };
-          });
           callback(filters);
           break;
         }
 
         var subscription = Subscription.fromURL(message.subscriptionUrl);
         if (!subscription)
         {
           callback([]);
           break;
         }
@@ skipping 113 matching lines @@
           subscription.title = message.title;
           subscription.homepage = message.homepage;
           FilterStorage.addSubscription(subscription);
           if (!subscription.lastDownload)
             Synchronizer.execute(subscription);
         }
         break;
     }
   });
 })(this);