Consider the frame structure in Matches()

test/FilterEngine.cpp

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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 184 matching lines @@
   ASSERT_FALSE(match10);
 
   AdblockPlus::FilterPtr match11 = filterEngine->Matches("http://example.org/orgbanner.gif", "IMAGE", "http://example.com/");
   ASSERT_FALSE(match11);
 
   AdblockPlus::FilterPtr match12 = filterEngine->Matches("http://example.org/orgbanner.gif", "IMAGE", "http://example.org/");
   ASSERT_TRUE(match12);
   ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match12->GetType());
 }
 
-TEST_F(FilterEngineTest, MatchesWithFrameStructure)
+TEST_F(FilterEngineTest, MatchesOnWhitelistedDomain)
+{
+  filterEngine->GetFilter("adbanner.gif")->AddToList();
+  filterEngine->GetFilter("@@||example.org^$document")->AddToList();
+
+  AdblockPlus::FilterPtr match1 =
+    filterEngine->Matches("http://ads.com/adbanner.gif", "IMAGE",
+                          "http://example.com/");
+  ASSERT_TRUE(match1);
+  ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match1->GetType());
+
+  AdblockPlus::FilterPtr match2 =
+    filterEngine->Matches("http://ads.com/adbanner.gif", "IMAGE",
+                          "http://example.org/");
+  ASSERT_TRUE(match2);
+  ASSERT_EQ(AdblockPlus::Filter::TYPE_EXCEPTION, match2->GetType());
+}
+
+TEST_F(FilterEngineTest, MatchesNestedFrameRequest)
 {
   filterEngine->GetFilter("adbanner.gif")->AddToList();
   filterEngine->GetFilter("@@adbanner.gif$domain=example.org")->AddToList();

[Wladimir Palant, 2013/10/30 07:39:56]

@@||example.org^$document is the exception rule you want to test with, it should
apply if http://example.com/ is anywhere in the frame hierarchy.
@@adbanner.gif$domain=example.org should only apply if the request is being
initiated by the example.org frame immediately, feel free to test this as well.
You probably want to test @@||example.org^document,domain=example.com as well -
that should only match if example.org is a subframe of a document originating
from example.com. And a test for the document domain of the top-level frame
won't hurt either.

 
   std::vector<std::string> documentUrls1;
   documentUrls1.push_back("http://ads.com/frame/");
   documentUrls1.push_back("http://example.com/");
   AdblockPlus::FilterPtr match1 =
     filterEngine->Matches("http://ads.com/adbanner.gif", "IMAGE",
                           documentUrls1);
   ASSERT_TRUE(match1);
   ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match1->GetType());
 
   std::vector<std::string> documentUrls2;
   documentUrls2.push_back("http://ads.com/frame/");
   documentUrls2.push_back("http://example.org/");
   AdblockPlus::FilterPtr match2 =
     filterEngine->Matches("http://ads.com/adbanner.gif", "IMAGE",
                           documentUrls2);
   ASSERT_TRUE(match2);
   ASSERT_EQ(AdblockPlus::Filter::TYPE_EXCEPTION, match2->GetType());
+
+  std::vector<std::string> documentUrls3;
+  documentUrls3.push_back("http://example.org/");
+  documentUrls3.push_back("http://ads.com/frame/");
+  AdblockPlus::FilterPtr match3 =
+    filterEngine->Matches("http://ads.com/adbanner.gif", "IMAGE",
+                          documentUrls3);
+  ASSERT_TRUE(match3);
+  ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match3->GetType());
+}
+
+TEST_F(FilterEngineTest, MatchesNestedFrameOnWhitelistedDomain)
+{
+  filterEngine->GetFilter("adbanner.gif")->AddToList();
+  filterEngine->GetFilter("@@||example.org^$document,domain=ads.com")->AddToList();
+
+  std::vector<std::string> documentUrls1;
+  documentUrls1.push_back("http://ads.com/frame/");
+  documentUrls1.push_back("http://example.com/");
+  AdblockPlus::FilterPtr match1 =
+    filterEngine->Matches("http://ads.com/adbanner.gif", "IMAGE",
+                          documentUrls1);
+  ASSERT_TRUE(match1);
+  ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match1->GetType());
+
+  std::vector<std::string> documentUrls2;
+  documentUrls2.push_back("http://ads.com/frame/");
+  documentUrls2.push_back("http://example.org/");
+  AdblockPlus::FilterPtr match2 =
+    filterEngine->Matches("http://ads.com/adbanner.gif", "IMAGE",
+                          documentUrls2);
+  ASSERT_TRUE(match2);
+  ASSERT_EQ(AdblockPlus::Filter::TYPE_EXCEPTION, match2->GetType());
+
+  std::vector<std::string> documentUrls3;
+  documentUrls3.push_back("http://example.org/");
+  AdblockPlus::FilterPtr match3 =
+    filterEngine->Matches("http://ads.com/adbanner.gif", "IMAGE",
+                          documentUrls3);
+  ASSERT_TRUE(match3);
+  ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match3->GetType());
+
+  std::vector<std::string> documentUrls4;
+  documentUrls4.push_back("http://example.org/");
+  documentUrls4.push_back("http://ads.com/frame/");
+  AdblockPlus::FilterPtr match4 =
+    filterEngine->Matches("http://ads.com/adbanner.gif", "IMAGE",
+                          documentUrls4);
+  ASSERT_TRUE(match4);
+  ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match4->GetType());
+
+  std::vector<std::string> documentUrls5;
+  documentUrls5.push_back("http://ads.com/frame/");
+  documentUrls5.push_back("http://example.org/");
+  documentUrls5.push_back("http://example.com/");
+  AdblockPlus::FilterPtr match5 =
+    filterEngine->Matches("http://ads.com/adbanner.gif", "IMAGE",
+                          documentUrls5);
+  ASSERT_TRUE(match5);
+  ASSERT_EQ(AdblockPlus::Filter::TYPE_EXCEPTION, match5->GetType());
 }
 
 TEST_F(FilterEngineTest, FirstRunFlag)
 {
   ASSERT_FALSE(filterEngine->IsFirstRun());
 }
 
 TEST_F(FilterEngineTestNoData, FirstRunFlag)
 {
   ASSERT_FALSE(filterEngine->IsFirstRun());
 }