Added support for file URI path wildcards in content settings

chrome/common/content_settings_pattern_unittest.cc

 // Copyright (c) 2011 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 "chrome/common/content_settings_pattern.h"
 
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
@@ skipping 66 matching lines @@
   EXPECT_FALSE(pattern.Matches(GURL("https://www.google.com:444")));
   EXPECT_FALSE(pattern.Matches(GURL("http://www.google.com:443")));
 
   pattern = ContentSettingsPattern::FromURL(GURL("https://127.0.0.1"));
   EXPECT_TRUE(pattern.IsValid());
   EXPECT_STREQ("https://127.0.0.1:443", pattern.ToString().c_str());
 
   pattern = ContentSettingsPattern::FromURL(GURL("http://[::1]"));
   EXPECT_TRUE(pattern.IsValid());
 
+  GURL url("file:///foo/bar.html");
   pattern = ContentSettingsPattern::FromURL(GURL("file:///foo/bar.html"));
   EXPECT_TRUE(pattern.IsValid());
-  EXPECT_STREQ("file:///foo/bar.html", pattern.ToString().c_str());
+  EXPECT_EQ("file:///foo/bar.html", pattern.ToString());
+
+  pattern = ContentSettingsPattern::FromURL(GURL("file:///"));
+  EXPECT_TRUE(pattern.IsValid());

[markusheintz_, 2012/01/18 19:45:24]

I should have been more precise here. Sorry.

These lines should be added as well.

EXPECT_TRUE(pattern.Matches(GURL("file:///")));
EXPECT_TRUE(pattern.Matches(GURL("file:///foo")));
EXPECT_TRUE(pattern.Matches(GURL("file:///foo/bar.html")));

[Francois, 2012/01/19 08:43:07]

Done. Also added
  EXPECT_EQ("file:///*", pattern.ToString());

 }
 
 TEST(ContentSettingsPatternTest, FromURLNoWildcard) {
   // If no port is specifed GURLs always use the default port for the schemes
   // HTTP and HTTPS. Hence a GURL always carries a port specification either
   // explicitly or implicitly. Therefore if a content settings pattern is
   // created from a GURL with no wildcard, specific values are used for the
   // scheme, host and port part of the pattern.
   // Creating content settings patterns from strings behaves different. Pattern
   // parts that are omitted in pattern specifications (strings), are completed
@@ skipping 65 matching lines @@
   EXPECT_TRUE(Pattern("https://www.example.com:443").IsValid());
   EXPECT_STREQ("https://www.example.com:443",
                Pattern("https://www.example.com:443").ToString().c_str());
   // HTTPS patterns with none default port.
   EXPECT_TRUE(Pattern("https://www.example.com:8080").IsValid());
   EXPECT_STREQ("https://www.example.com:8080",
                Pattern("https://www.example.com:8080").ToString().c_str());
 }
 
 TEST(ContentSettingsPatternTest, FromString_FilePatterns) {
-  EXPECT_FALSE(Pattern("file:///").IsValid());
-
   // Non-empty domains aren't allowed in file patterns.
   EXPECT_FALSE(Pattern("file://foo/").IsValid());
-
-  // Domain wildcards aren't allowed in file patterns.
+  EXPECT_FALSE(Pattern("file://localhost/foo/bar/test.html").IsValid());
+  EXPECT_FALSE(Pattern("file://*").IsValid());
   EXPECT_FALSE(Pattern("file://*/").IsValid());
+  EXPECT_FALSE(Pattern("file://*/*").IsValid());
+  EXPECT_FALSE(Pattern("file://*/foo/bar/test.html").IsValid());
   EXPECT_FALSE(Pattern("file://[*.]/").IsValid());
 
-  // These specify a path that contains '*', which isn't allowed to avoid
-  // user confusion.
-  EXPECT_FALSE(Pattern("file:///*").IsValid());
+  // This is the only valid file path wildcard format.
+  EXPECT_TRUE(Pattern("file:///*").IsValid());
+  EXPECT_EQ("file:///*", Pattern("file:///*").ToString());
+
+  // Wildcards are not allowed anywhere in the file path.
+  EXPECT_FALSE(Pattern("file:///f*o/bar/file.html").IsValid());
+  EXPECT_FALSE(Pattern("file:///*/bar/file.html").IsValid());
+  EXPECT_FALSE(Pattern("file:///foo/*").IsValid());
   EXPECT_FALSE(Pattern("file:///foo/bar/*").IsValid());
+  EXPECT_FALSE(Pattern("file:///foo/*/file.html").IsValid());
+  EXPECT_FALSE(Pattern("file:///foo/bar/*.html").IsValid());
+  EXPECT_FALSE(Pattern("file:///foo/bar/file.*").IsValid());
 
   EXPECT_TRUE(Pattern("file:///tmp/test.html").IsValid());
-  EXPECT_STREQ("file:///tmp/file.html",
-               Pattern("file:///tmp/file.html").ToString().c_str());
+  EXPECT_EQ("file:///tmp/file.html",
+            Pattern("file:///tmp/file.html").ToString());
   EXPECT_TRUE(Pattern("file:///tmp/test.html").Matches(
       GURL("file:///tmp/test.html")));
   EXPECT_FALSE(Pattern("file:///tmp/test.html").Matches(
       GURL("file:///tmp/other.html")));
   EXPECT_FALSE(Pattern("file:///tmp/test.html").Matches(
       GURL("http://example.org/")));
+
+  EXPECT_TRUE(Pattern("file:///*").Matches(GURL("file:///tmp/test.html")));
+  EXPECT_TRUE(Pattern("file:///*").Matches(
+      GURL("file://localhost/tmp/test.html")));
 }
 
 TEST(ContentSettingsPatternTest, FromString_ExtensionPatterns) {
   EXPECT_TRUE(Pattern("chrome-extension://peoadpeiejnhkmpaakpnompolbglelel/")
       .IsValid());
-  EXPECT_STREQ("chrome-extension://peoadpeiejnhkmpaakpnompolbglelel/",
+  EXPECT_EQ("chrome-extension://peoadpeiejnhkmpaakpnompolbglelel/",
       Pattern("chrome-extension://peoadpeiejnhkmpaakpnompolbglelel/")
-          .ToString().c_str());
+          .ToString());
   EXPECT_TRUE(Pattern("chrome-extension://peoadpeiejnhkmpaakpnompolbglelel/")
       .Matches(GURL("chrome-extension://peoadpeiejnhkmpaakpnompolbglelel/")));
 }
 
 TEST(ContentSettingsPatternTest, FromString_WithIPAdresses) {
   // IPv4
   EXPECT_TRUE(Pattern("192.168.0.1").IsValid());
   EXPECT_STREQ("192.168.1.1", Pattern("192.168.1.1").ToString().c_str());
   EXPECT_TRUE(Pattern("https://192.168.0.1:8080").IsValid());
   EXPECT_STREQ("https://192.168.0.1:8080",
@@ skipping 369 matching lines @@
   // file:/// normalization.
   EXPECT_STREQ("file:///tmp/test.html",
                Pattern("file:///tmp/bar/../test.html").ToString().c_str());
 
   // Invalid patterns.
   EXPECT_STREQ("", Pattern("*example.com").ToString().c_str());
   EXPECT_STREQ("", Pattern("example.*").ToString().c_str());
   EXPECT_STREQ("", Pattern("*\xC4\x87ira.com").ToString().c_str());
   EXPECT_STREQ("", Pattern("\xC4\x87ira.*").ToString().c_str());
 }