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 12 matching lines @@
   var Prefs = require("prefs").Prefs;
   var Utils = require("utils").Utils;
   var FilterStorage = require("filterStorage").FilterStorage;
   var FilterNotifier = require("filterNotifier").FilterNotifier;
   var defaultMatcher = require("matcher").defaultMatcher;
   var CSSRules = require("cssRules").CSSRules;
 
   var filterClasses = require("filterClasses");
   var Filter = filterClasses.Filter;
   var BlockingFilter = filterClasses.BlockingFilter;
+  var RegExpFilter = filterClasses.RegExpFilter;
   var Synchronizer = require("synchronizer").Synchronizer;
 
   var subscriptionClasses = require("subscriptionClasses");
   var Subscription = subscriptionClasses.Subscription;
   var DownloadableSubscription = subscriptionClasses.DownloadableSubscription;
   var SpecialSubscription = subscriptionClasses.SpecialSubscription;
 
   function convertObject(keys, obj)
   {
     var result = {};
@@ skipping 145 matching lines @@
           sendMessage("app", "error", [result.error.toString()], sender.page);
         else if (result.filter)
           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" && "domain" in message)

[Thomas Greiner, 2015/11/03 10:57:02]

This condition allows the following invalid message to succeed even though it
shouldn't:

{
  what: "cssproperties",
  subscriptionUrl: "http://..."
}

[kzar, 2015/11/03 14:09:51]

Done.

-        {
-          callback(CSSRules.getRulesForDomain(

[Thomas Greiner, 2015/11/03 10:57:02]

Please avoid forcing everything into a single statement. Splitting it up into
several statements gives us not only better readability but also more useful
stack traces in case of errors.

[kzar, 2015/11/03 14:09:51]

I thought it was pretty readable as it was but fair enough, Done.

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

Thanks, I appreciate it. It would've even allowed you to break and call the
callback once but that'd be more of a personal preference so I'll leave that up
to you.

e.g.
var filters = [];
if ("domain" in message)
{
  ...
  filters = ...
}
callback(filters);
break;

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

Done.

-            message.domain, message.specificOnly).map(function(filter)

[Thomas Greiner, 2015/11/03 10:57:03]

The content script doesn't know whether it's supposed to request only specific
filters or not.

Currently, that is being determined by the background page right before calling
`ElemHide.getSelectorsByDomain()` (see "get-selectors" message type in
adblockpluschrome/background.js).

[kzar, 2015/11/03 14:09:51]

Done.

+        if (message.what == "cssproperties")
+        {
+          var filters = [];
+          var isFrameWhitelisted = require("whitelisting").isFrameWhitelisted;
+
+          if (!isFrameWhitelisted(sender.page, sender.frame,
+                                  RegExpFilter.typeMap.DOCUMENT |
+                                  RegExpFilter.typeMap.ELEMHIDE))
+          {
+            filters = CSSRules.getRulesForDomain(sender.frame.url.hostname);
+            filters = filters.map(function(filter)
             {
               return {
                 prefix: filter.selectorPrefix,
                 suffix: filter.selectorSuffix,
-                regexp: filter.regexpString()

[Thomas Greiner, 2015/11/03 10:57:03]

`CSSPropertyFilter.prototype.regexpString` is a string, not a function.

[kzar, 2015/11/03 14:09:51]

Whoops good point, Done.

+                regexp: filter.regexpString
               };
-            })
-          );
+            });
+          }
+          callback(filters);
           break;
         }
 
         var subscription = Subscription.fromURL(message.subscriptionUrl);
         if (!subscription)
         {
           callback([]);
           break;
         }
 
@@ skipping 112 matching lines @@
           subscription.title = message.title;
           subscription.homepage = message.homepage;
           FilterStorage.addSubscription(subscription);
           if (!subscription.lastDownload)
             Synchronizer.execute(subscription);
         }
         break;
     }
   });
 })(this);