appcache content-type check

webkit/browser/appcache/manifest_parser.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.
 //
 // This is a port of ManifestParser.cc from WebKit/WebCore/loader/appcache.
 
 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ skipping 52 matching lines @@
   ONLINE_WHITELIST,
   UNKNOWN_MODE,
 };
 
 enum InterceptVerb {
   RETURN,
   EXECUTE,
   UNKNOWN_VERB,
 };
 
-Manifest::Manifest() : online_whitelist_all(false) {}
+Manifest::Manifest()
+    : online_whitelist_all(false),
+      did_ignore_intercept_namespaces(false) {
+}
 
 Manifest::~Manifest() {}
 
 bool ParseManifest(const GURL& manifest_url, const char* data, int length,
-                   Manifest& manifest) {
+                   ParseMode parse_mode, Manifest& manifest) {
   // This is an implementation of the parsing algorithm specified in
   // the HTML5 offline web application docs:
   //   http://www.w3.org/TR/html5/offline.html
   // Do not modify it without consulting those docs.
   // Though you might be tempted to convert these wstrings to UTF-8 or
   // base::string16, this implementation seems simpler given the constraints.
 
   const wchar_t kSignature[] = L"CACHE MANIFEST";
   const size_t kSignatureLength = arraysize(kSignature) - 1;
   const wchar_t kChromiumSignature[] = L"CHROMIUM CACHE MANIFEST";
   const size_t kChromiumSignatureLength = arraysize(kChromiumSignature) - 1;
 
   DCHECK(manifest.explicit_urls.empty());
   DCHECK(manifest.fallback_namespaces.empty());
   DCHECK(manifest.online_whitelist_namespaces.empty());
   DCHECK(!manifest.online_whitelist_all);
+  DCHECK(!manifest.did_ignore_intercept_namespaces);
 
   Mode mode = EXPLICIT;
 
   std::wstring data_string;
   // TODO(jennb): cannot do UTF8ToWide(data, length, &data_string);
   // until UTF8ToWide uses 0xFFFD Unicode replacement character.
   base::CodepageToWide(std::string(data, length), base::kCodepageUTF8,
                        base::OnStringConversionError::SUBSTITUTE, &data_string);
   const wchar_t* p = data_string.c_str();
   const wchar_t* end = p + data_string.length();
@@ skipping 106 matching lines @@
       // condition is enforced in AppCacheUpdateJob.
 
       if (mode == EXPLICIT) {
         manifest.explicit_urls.insert(url.spec());
       } else {
         bool is_pattern = HasPatternMatchingAnnotation(line_p, line_end);
         manifest.online_whitelist_namespaces.push_back(
             Namespace(NETWORK_NAMESPACE, url, GURL(), is_pattern));
       }
     } else if (mode == INTERCEPT) {
+      if (parse_mode != PARSE_MANIFEST_ALLOWING_INTERCEPTS) {
+        manifest.did_ignore_intercept_namespaces = true;
+        continue;
+      }
+
       // Lines of the form,
       // <urlnamespace> <intercept_type> <targeturl>
       const wchar_t* line_p = line.c_str();
       const wchar_t* line_end = line_p + line.length();
 
       // Look for first whitespace separating the url namespace from
       // the intercept type.
       while (line_p < line_end && *line_p != '\t' && *line_p != ' ')
         ++line_p;
 
@@ skipping 132 matching lines @@
                     fallback_url, is_pattern));
     } else {
       NOTREACHED();
     }
   }
 
   return true;
 }
 
 }  // namespace appcache