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

src/engine/Main.cpp

 #include <AdblockPlus.h>
 #include <functional>
 #include <vector>
 #include <thread>
 #include <Windows.h>
 
 #include "../shared/AutoHandle.h"
 #include "../shared/Communication.h"
 #include "../shared/Dictionary.h"
 #include "../shared/Utils.h"
 #include "../shared/Version.h"
 #include "../shared/CriticalSection.h"
 #include "../shared/IE_version.h"
 #include "AdblockPlus.h"
 #include "Debug.h"
 #include "Updater.h"
 
 namespace
 {
   std::auto_ptr<AdblockPlus::FilterEngine> filterEngine;
   std::auto_ptr<Updater> updater;
   int activeConnections = 0;
   CriticalSection activeConnectionsLock;
   HWND callbackWindow;
 
+  bool IsWhitelisted(const std::string& urlArg,
+    const std::vector<std::string>& frameHierarchy, const std::string& type)
+  {
+    auto IsWhitelisted = [&type](const std::string& url, const std::string& parent)->bool
+    {
+      AdblockPlus::FilterPtr match = filterEngine->Matches(url, type, parent);
+      return match && match->GetType() == AdblockPlus::Filter::TYPE_EXCEPTION;
+    };
+    bool isWhitelisted = false;

[Eric, 2015/01/13 19:52:52]

I dislike identifiers that differ only in capitalization.

In any case, it's not necessary to declare this variable here to use as a return
variable. It's actually not necessary at all, even later.

[sergei, 2015/04/13 08:06:41]

fixed

+    if (frameHierarchy.empty())
+    {
+      isWhitelisted = IsWhitelisted(urlArg, "");

[Eric, 2015/01/13 19:52:52]

We can simply return here and skip the subsequent 'else'

[sergei, 2015/04/13 08:06:41]

fixed

+    }
+    else
+    {
+      auto frame_ii = frameHierarchy.begin();

[Eric, 2015/01/13 19:52:52]

As much as I prefer underscores, ABP doesn't use them in identifiers.

[sergei, 2015/04/13 08:06:41]

fixed

+      std::string parentUrl;
+      std::string url = urlArg;
+      while (!isWhitelisted && frame_ii != frameHierarchy.end())

[Eric, 2015/01/13 19:52:52]

We only need the second term here.

[sergei, 2015/04/13 08:06:41]

fixed

+      {
+        parentUrl = *frame_ii;
+        isWhitelisted = IsWhitelisted(url, parentUrl);

[Eric, 2015/01/13 19:52:52]

if (IsWhitelisted(...)) return true;

[sergei, 2015/04/13 08:06:41]

fixed

+        url = parentUrl;
+        ++frame_ii;
+      }

[Eric, 2015/01/13 19:52:52]

Just return false if the loop terminates having reached the end.

[sergei, 2015/04/13 08:06:41]

fixed

+    }
+    return isWhitelisted;
+  }
+
   void WriteStrings(Communication::OutputBuffer& response,
       const std::vector<std::string>& strings)
   {
     int32_t count = static_cast<int32_t>(strings.size());
     response << count;
     for (int32_t i = 0; i < count; i++)
       response << strings[i];
   }
 
   void WriteSubscriptions(Communication::OutputBuffer& response,
@@ skipping 150 matching lines @@
           }
         }
 
         WriteStrings(response, domains);
         break;
       }
       case Communication::PROC_IS_WHITELISTED_URL:
       {
         std::string url;
         request >> url;
-        AdblockPlus::FilterPtr match = filterEngine->Matches(url, "DOCUMENT", url);
-        response << (match && match->GetType() == AdblockPlus::Filter::TYPE_EXCEPTION);
+        std::vector<std::string> frameHierarchy;
+        request >> frameHierarchy;
+        response << IsWhitelisted(url, frameHierarchy, "DOCUMENT");;
         break;
       }
       case Communication::PROC_IS_ELEMHIDE_WHITELISTED_ON_URL:
       {
         std::string url;
         request >> url;
-        AdblockPlus::FilterPtr match = filterEngine->Matches(url, "ELEMHIDE", url);
-        response << (match && match->GetType() == AdblockPlus::Filter::TYPE_EXCEPTION);
+        std::vector<std::string> frameHierarchy;
+        request >> frameHierarchy;
+        response << IsWhitelisted(url, frameHierarchy, "ELEMHIDE");
         break;
       }
       case Communication::PROC_ADD_FILTER:
       {
         std::string text;
         request >> text;
 
         filterEngine->GetFilter(text)->AddToList();
         break;
       }
@@ skipping 269 matching lines @@
     }
     catch (const std::runtime_error& e)
     {
       DebugException(e);
       return 1;
     }
   }
 
   return 0;
 }