Embedding-CSP: Fixing path matching

third_party/WebKit/Source/core/frame/csp/CSPSourceTest.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/frame/csp/CSPSource.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/weborigin/KURL.h"
@@ skipping 35 matching lines @@
   EXPECT_TRUE(source.matches(KURL(base, "http://example.com:8000/foo/bar")));
   EXPECT_TRUE(source.matches(KURL(base, "HTTP://EXAMPLE.com:8000/foo/BAR")));
 
   EXPECT_FALSE(source.matches(KURL(base, "http://example.com:8000/bar/")));
   EXPECT_FALSE(source.matches(KURL(base, "https://example.com:8000/bar/")));
   EXPECT_FALSE(source.matches(KURL(base, "http://example.com:9000/bar/")));
   EXPECT_FALSE(source.matches(KURL(base, "HTTP://example.com:8000/FOO/bar")));
   EXPECT_FALSE(source.matches(KURL(base, "HTTP://example.com:8000/FOO/BAR")));
 }
 
+TEST_F(CSPSourceTest, BasicPathMatching) {

[amalika, 2016/12/08 19:31:00]

Added path matching test

+  KURL base;
+  CSPSource A(csp.get(), "http", "example.com", 8000, "/",
+              CSPSource::NoWildcard, CSPSource::NoWildcard);
+
+  EXPECT_TRUE(A.matches(KURL(base, "http://example.com:8000")));
+  EXPECT_TRUE(A.matches(KURL(base, "http://example.com:8000/")));
+  EXPECT_TRUE(A.matches(KURL(base, "http://example.com:8000/foo/bar")));
+
+  EXPECT_FALSE(A.matches(KURL(base, "http://example.com:8000path")));
+  EXPECT_FALSE(A.matches(KURL(base, "http://example.com:9000/")));
+
+  CSPSource B(csp.get(), "http", "example.com", 8000, "", CSPSource::NoWildcard,
+              CSPSource::NoWildcard);
+  EXPECT_TRUE(B.matches(KURL(base, "http://example.com:8000")));
+  EXPECT_TRUE(B.matches(KURL(base, "http://example.com:8000/")));
+  EXPECT_TRUE(A.matches(KURL(base, "http://example.com:8000/foo/bar")));
+
+  EXPECT_FALSE(B.matches(KURL(base, "http://example.com:8000path")));
+  EXPECT_FALSE(B.matches(KURL(base, "http://example.com:9000/")));
+}
+
 TEST_F(CSPSourceTest, WildcardMatching) {
   KURL base;
   CSPSource source(csp.get(), "http", "example.com", 0, "/",
                    CSPSource::HasWildcard, CSPSource::HasWildcard);
 
   EXPECT_TRUE(source.matches(KURL(base, "http://foo.example.com:8000/")));
   EXPECT_TRUE(source.matches(KURL(base, "http://foo.example.com:8000/foo")));
   EXPECT_TRUE(source.matches(KURL(base, "http://foo.example.com:9000/foo/")));
   EXPECT_TRUE(
       source.matches(KURL(base, "HTTP://FOO.EXAMPLE.com:8000/foo/BAR")));
@@ skipping 121 matching lines @@
   } cases[] = {
       // Equal signals
       {{"http", "/", 0}, {"http", "/", 0}, true, true},
       {{"https", "/", 0}, {"https", "/", 0}, true, true},
       {{"https", "/page1.html", 0}, {"https", "/page1.html", 0}, true, true},
       {{"http", "/", 70}, {"http", "/", 70}, true, true},
       {{"https", "/", 70}, {"https", "/", 70}, true, true},
       {{"https", "/page1.html", 0}, {"https", "/page1.html", 0}, true, true},
       {{"http", "/page1.html", 70}, {"http", "/page1.html", 70}, true, true},
       {{"https", "/page1.html", 70}, {"https", "/page1.html", 70}, true, true},
+      {{"http", "/", 0}, {"http", "", 0}, true, true},
+      {{"http", "/", 80}, {"http", "", 80}, true, true},
+      {{"http", "/", 80}, {"https", "", 443}, false, true},
       // One stronger signal in the first CSPSource
       {{"https", "/", 0}, {"http", "/", 0}, true, false},
       {{"http", "/page1.html", 0}, {"http", "/", 0}, true, false},
       {{"http", "/", 80}, {"http", "/", 0}, true, true},
       {{"http", "/", 700}, {"http", "/", 0}, false, false},
       // Two stronger signals in the first CSPSource
       {{"https", "/page1.html", 0}, {"http", "/", 0}, true, false},
       {{"https", "/", 80}, {"http", "/", 0}, false, false},
       {{"http", "/page1.html", 80}, {"http", "/", 0}, true, false},
       // Three stronger signals in the first CSPSource
@@ skipping 548 matching lines @@
     normalized = B->intersect(A);
     Source intersectBA = {
         normalized->m_scheme,       normalized->m_host,
         normalized->m_path,         normalized->m_port,
         normalized->m_hostWildcard, normalized->m_portWildcard};
     EXPECT_TRUE(equalSources(intersectBA, test.normalized));
   }
 }
 
 }  // namespace blink