Issue 3363 - Implement IsDocumentWhitelisted and IsElemhideWhitelisted

src/FilterEngine.cpp

 /*
  * 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 307 matching lines @@
                                                     CONTENT_TYPE_DOCUMENT,
                                                     lastDocumentUrl);
     if (match && match->GetType() == AdblockPlus::Filter::TYPE_EXCEPTION)
       return match;
     lastDocumentUrl = documentUrl;
   }
 
   return CheckFilterMatch(url, contentType, lastDocumentUrl);
 }
 
+bool FilterEngine::IsDocumentWhitelisted(const std::string& url,
+    const std::vector<std::string>& documentUrls) const
+{
+    return !GetWhitelistingFilter(url, documentUrls,
+        CONTENT_TYPE_DOCUMENT).empty();
+}
+
+bool FilterEngine::IsElemhideWhitelisted(const std::string& url,
+    const std::vector<std::string>& documentUrls) const
+{
+    return !GetWhitelistingFilter(url, documentUrls,
+        CONTENT_TYPE_ELEMHIDE).empty();
+}
+
 AdblockPlus::FilterPtr FilterEngine::CheckFilterMatch(const std::string& url,
     ContentType contentType,
     const std::string& documentUrl) const
 {
   JsValuePtr func = jsEngine->Evaluate("API.checkFilterMatch");
   JsValueList params;
   params.push_back(jsEngine->NewValue(url));
   params.push_back(jsEngine->NewValue(ContentTypeToString(contentType)));
   params.push_back(jsEngine->NewValue(documentUrl));
   JsValuePtr result = func->Call(params);
@@ skipping 117 matching lines @@
 
 
 int FilterEngine::CompareVersions(const std::string& v1, const std::string& v2)
 {
   JsValueList params;
   params.push_back(jsEngine->NewValue(v1));
   params.push_back(jsEngine->NewValue(v2));
   JsValuePtr func = jsEngine->Evaluate("API.compareVersions");
   return func->Call(params)->AsInt();
 }
+
+std::string FilterEngine::GetWhitelistingFilter(const std::string& url,
+  const std::string& parent, ContentType contentType) const
+{
+  FilterPtr match = Matches(url, contentType, parent);
+
+  if (match && match->GetType() == Filter::TYPE_EXCEPTION)
+  {
+    return match->GetProperty("text")->AsString();

[Felix Dahlke, 2015/12/02 17:27:44]

Why return the filter text and not the filter object here, and an empty one in
the error case? IIRC we always work with filter objects, and there's no reason
to go ahead and extract the filter text - we don't really care.

Same below.

[René Jeschke, 2015/12/02 17:38:40]

Done.

+  }
+  return "";
+}
+
+std::string FilterEngine::GetWhitelistingFilter(const std::string& urlArg,
+  const std::vector<std::string>& documentUrls,
+  ContentType contentType) const
+{
+  if (documentUrls.empty())
+  {
+    return GetWhitelistingFilter(urlArg, "", contentType);
+  }
+
+  std::vector<std::string>::const_iterator urlIterator = documentUrls.begin();
+  std::string url = urlArg;
+  do
+  {
+    std::string parentUrl = *urlIterator++;
+    std::string filterText = GetWhitelistingFilter(url, parentUrl, contentType);
+    if (!filterText.empty())
+    {
+      return filterText;
+    }
+    url = parentUrl;
+  }
+  while (urlIterator != documentUrls.end());
+  return "";
+}