AppCacheExecutableHandlers - parse manifest file and store the 'bit' indicating executable.

webkit/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 13 matching lines @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "webkit/appcache/manifest_parser.h"
 
+#include "base/command_line.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 
 namespace appcache {
 
 namespace {
 
 // Helper function used to identify 'isPattern' annotations.
 bool HasPatternMatchingAnnotation(const wchar_t* line_p,
                                   const wchar_t* line_end) {
   // Skip whitespace separating the resource url from the annotation.
   // Note: trailing whitespace has already been trimmed from the line.
   while (line_p < line_end && (*line_p == '\t' || *line_p == ' '))
     ++line_p;
   if (line_p == line_end)
     return false;
   std::wstring annotation(line_p, line_end - line_p);
   return annotation == L"isPattern";
 }
 
 }
 
 enum Mode {
   EXPLICIT,
   INTERCEPT,
   FALLBACK,
   ONLINE_WHITELIST,
-  UNKNOWN,
+  UNKNOWN_MODE,
+};
+
+enum InterceptVerb {
+  RETURN,
+  EXECUTE,
+  UNKNOWN_VERB,
 };
 
 Manifest::Manifest() : online_whitelist_all(false) {}
 
 Manifest::~Manifest() {}
 
 bool ParseManifest(const GURL& manifest_url, const char* data, int length,
                    Manifest& manifest) {
   // This is an implementation of the parsing algorithm specified in
   // the HTML5 offline web application docs:
@@ skipping 84 matching lines @@
 
     if (line == L"CACHE:") {
       mode = EXPLICIT;
     } else if (line == L"FALLBACK:") {
       mode = FALLBACK;
     } else if (line == L"NETWORK:") {
       mode = ONLINE_WHITELIST;
     } else if (line == L"CHROMIUM-INTERCEPT:") {
       mode = INTERCEPT;
     } else if (*(line.end() - 1) == ':') {
-      mode = UNKNOWN;
-    } else if (mode == UNKNOWN) {
+      mode = UNKNOWN_MODE;
+    } else if (mode == UNKNOWN_MODE) {
       continue;
     } else if (line == L"*" && mode == ONLINE_WHITELIST) {
       manifest.online_whitelist_all = true;
       continue;
     } else if (mode == EXPLICIT || mode == ONLINE_WHITELIST) {
       const wchar_t *line_p = line.c_str();
       const wchar_t *line_end = line_p + line.length();
 
       // Look for whitespace separating the URL from subsequent ignored tokens.
       while (line_p < line_end && *line_p != '\t' && *line_p != ' ')
@@ skipping 63 matching lines @@
       // Skip whitespace separating namespace from the type.
       while (line_p < line_end && (*line_p == '\t' || *line_p == ' '))
         ++line_p;
 
       // Look for whitespace separating the type from the target url.
       const wchar_t* type_start = line_p;
       while (line_p < line_end && *line_p != '\t' && *line_p != ' ')
         ++line_p;
 
       // Look for a type value we understand, otherwise skip the line.
+      InterceptVerb verb = UNKNOWN_VERB;
       std::wstring type(type_start, line_p - type_start);
-      if (type != L"return")
+      if (type == L"return")

[Greg Billock, 2013/04/10 23:25:30]

Can you put braces given the multi-line?

[michaeln, 2013/04/10 23:47:59]

will do

+        verb = RETURN;
+      else if (type == L"execute" &&
+               CommandLine::ForCurrentProcess()->HasSwitch(
+                  kEnableExecutableHandlers))
+        verb = EXECUTE;
+      if (verb == UNKNOWN_VERB)
         continue;
 
       // Skip whitespace separating type from the target_url.
       while (line_p < line_end && (*line_p == '\t' || *line_p == ' '))
         ++line_p;
 
       // Look for whitespace separating the URL from subsequent ignored tokens.
       const wchar_t* target_url_start = line_p;
       while (line_p < line_end && *line_p != '\t' && *line_p != ' ')
         ++line_p;
 
       base::string16 target_url16;
       WideToUTF16(target_url_start, line_p - target_url_start, &target_url16);
       GURL target_url = manifest_url.Resolve(target_url16);
       if (!target_url.is_valid())
         continue;
 
       if (target_url.has_ref()) {
         GURL::Replacements replacements;
         replacements.ClearRef();
         target_url = target_url.ReplaceComponents(replacements);
       }
       if (manifest_url.GetOrigin() != target_url.GetOrigin())
         continue;
 
       bool is_pattern = HasPatternMatchingAnnotation(line_p, line_end);
       manifest.intercept_namespaces.push_back(
           Namespace(INTERCEPT_NAMESPACE, namespace_url,
-                    target_url, is_pattern));
+                    target_url, is_pattern, verb == EXECUTE));
     } else if (mode == FALLBACK) {
       const wchar_t* line_p = line.c_str();
       const wchar_t* line_end = line_p + line.length();
 
       // Look for whitespace separating the two URLs
       while (line_p < line_end && *line_p != '\t' && *line_p != ' ')
         ++line_p;
 
       if (line_p == line_end) {
         // There was no whitespace separating the URLs.
@@ skipping 52 matching lines @@
                     fallback_url, is_pattern));
     } else {
       NOTREACHED();
     }
   }
 
   return true;
 }
 
 }  // namespace appcache