Issue 1793 - check whether the frame is whitelisted before injecting CSS

src/engine/Main.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 75 matching lines @@
     std::deque<std::function<void()>> m_tasks;
     std::unique_ptr<NotificationBorderWindow> m_notificationWindow;
   } _AtlModule;
 
   std::auto_ptr<AdblockPlus::FilterEngine> filterEngine;
   std::auto_ptr<Updater> updater;
   int activeConnections = 0;
   CriticalSection activeConnectionsLock;
   HWND callbackWindow;
 
+  // it's a helper for the function below.
+  std::string GetWhitelistingFilter(const std::string& url, const std::string& parent, AdblockPlus::FilterEngine::ContentType type)
+  {
+    AdblockPlus::FilterPtr match = filterEngine->Matches(url, type, parent);
+    if (match && match->GetType() == AdblockPlus::Filter::TYPE_EXCEPTION)
+    {
+      return match->GetProperty("text")->AsString();
+    }
+    return "";
+  };
+
+  std::string GetWhitelistingFilter(const std::string& urlArg,
+    const std::vector<std::string>& frameHierarchy, AdblockPlus::FilterEngine::ContentType type)
+  {
+    if (frameHierarchy.empty())
+    {
+      return GetWhitelistingFilter(urlArg, "", type);
+    }
+    auto frameIterator = frameHierarchy.begin();
+    std::string parentUrl;

[Eric, 2015/11/14 20:28:13]

This declaration can go inside the loop.

[sergei, 2015/11/17 20:15:59]

Done.

+    std::string url = urlArg;
+    while (frameIterator != frameHierarchy.end())

[Eric, 2015/11/14 20:28:13]

Since you've already taken care of the empty case first, it would be clearer
here to use a do-while loop.

Alternately, use a for loop and declare-and-initialize 'url' as its first
clause.

[sergei, 2015/11/17 20:15:59]

Done.

+    {
+      parentUrl = *frameIterator;

[Eric, 2015/11/14 20:28:13]

The rvalue expression could be "*frameIterator++". There's no need for a
separate increment statement at the end of the loop.

[sergei, 2015/11/17 20:15:59]

Done.

+      auto filterText = GetWhitelistingFilter(url, parentUrl, type);
+      if (!filterText.empty())
+      {
+        return filterText;
+      }
+      url = parentUrl;
+      ++frameIterator;
+    }
+    return "";
+  }
+
   void WriteSubscriptions(Communication::OutputBuffer& response,
       const std::vector<AdblockPlus::SubscriptionPtr>& subscriptions)
   {
     int32_t count = static_cast<int32_t>(subscriptions.size());
     response << count;
     for (int32_t i = 0; i < count; i++)
     {
       AdblockPlus::SubscriptionPtr subscription = subscriptions[i];
       response << subscription->GetProperty("url")->AsString()
                << subscription->GetProperty("title")->AsString()
@@ skipping 143 matching lines @@
           }
         }
 
         response << domains;
         break;
       }
       case Communication::PROC_GET_WHITELISTING_FITER:
       {
         std::string url;
         request >> url;
-        AdblockPlus::FilterPtr match = filterEngine->Matches(url,
-          AdblockPlus::FilterEngine::ContentType::CONTENT_TYPE_DOCUMENT, url);
-        std::string filterText;
-        if (match && match->GetType() == AdblockPlus::Filter::TYPE_EXCEPTION)
-        {
-          filterText = match->GetProperty("text")->AsString();
-        }
-        response << filterText;
+        std::vector<std::string> frameHierarchy;
+        request >> frameHierarchy;
+        response << GetWhitelistingFilter(url, frameHierarchy, AdblockPlus::FilterEngine::CONTENT_TYPE_DOCUMENT);
         break;
       }
       case Communication::PROC_IS_ELEMHIDE_WHITELISTED_ON_URL:
       {
         std::string url;
         request >> url;
-        AdblockPlus::FilterPtr match = filterEngine->Matches(url,
-          AdblockPlus::FilterEngine::ContentType::CONTENT_TYPE_ELEMHIDE, url);
-        response << (match && match->GetType() == AdblockPlus::Filter::TYPE_EXCEPTION);
+        std::vector<std::string> frameHierarchy;
+        request >> frameHierarchy;
+        response << !GetWhitelistingFilter(url, frameHierarchy, AdblockPlus::FilterEngine::CONTENT_TYPE_ELEMHIDE).empty();
         break;
       }
       case Communication::PROC_ADD_FILTER:
       {
         std::string text;
         request >> text;
 
         filterEngine->GetFilter(text)->AddToList();
         break;
       }
@@ skipping 441 matching lines @@
   });
 
   int retValue = _AtlModule.WinMain(cmdShow);
   if (communicationThread.joinable())
   {
     communicationThread.join();
   }
 
   return retValue;
 }