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 154 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) {
+  // "/" is an invalid file path.
   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());

[markusheintz_, 2012/01/09 15:01:00]

Maybe we could also add: 
EXPECT_FALSE(Pattern("file:///foo/*").IsValid());

[Francois, 2012/01/09 15:33:01]

Done, but added it a few lines further down.

   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_STREQ("file:///*", Pattern("file:///*").ToString().c_str());

[Bernhard Bauer, 2012/01/09 13:23:41]

You can use EXPECT_EQ and remove the |.c_str()|.

[Francois, 2012/01/09 14:51:03]

Done.

+
+  // Wildcards are not allowed anywhere in the file path.
+  EXPECT_FALSE(Pattern("file:///*/bar/file.html").IsValid());
+  EXPECT_FALSE(Pattern("file:///f*o/bar/file.html").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_FALSE(Pattern("file:///foo/bar/*").IsValid());
 
   EXPECT_TRUE(Pattern("file:///tmp/test.html").IsValid());
   EXPECT_STREQ("file:///tmp/file.html",
                Pattern("file:///tmp/file.html").ToString().c_str());
   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/",
       Pattern("chrome-extension://peoadpeiejnhkmpaakpnompolbglelel/")
           .ToString().c_str());
   EXPECT_TRUE(Pattern("chrome-extension://peoadpeiejnhkmpaakpnompolbglelel/")
       .Matches(GURL("chrome-extension://peoadpeiejnhkmpaakpnompolbglelel/")));
@@ skipping 377 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());
 }