Don't allow the following content settings patterns:

- Patterns with file scheme and non empty host
- File patterns that user a wildcard '*' symbol in their path
- "file:///"
- Patterns with an IP address and a domain wildcard.

Add tests to check that "[*.]", "http://[*.]", ... are valid patterns.

BUG=104414
TEST=ContentSettingsPattern*


Review URL: http://codereview.chromium.org/8676020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111546 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 8 deletions

diff --git a/chrome/common/content_settings_pattern_parser.cc b/chrome/common/content_settings_pattern_parser.cc
index 437ecb1..e54834a 100644
--- a/chrome/common/content_settings_pattern_parser.cc
+++ b/chrome/common/content_settings_pattern_parser.cc
@@ -140,14 +140,8 @@ void PatternParser::Parse(const std::string& pattern_spec,
       builder->WithDomainWildcard();
     } else if (StartsWithASCII(host, kDomainWildcard, true)) {
       host = host.substr(kDomainWildcardLength);
-      // If the host still contains a wildcard symbol then it is invalid.
-      if (host.find(kHostWildcard) != std::string::npos) {
-        builder->Invalid();
-        return;
-      } else {
-        builder->WithDomainWildcard();
-        builder->WithHost(host);
-      }
+      builder->WithDomainWildcard();
+      builder->WithHost(host);
     } else {
       // If the host contains a wildcard symbol then it is invalid.
       if (host.find(kHostWildcard) != std::string::npos) {