AppCache INTERCEPT namespace.

webkit/appcache/manifest_parser_unittest.cc

 // Copyright (c) 2010 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 <string>
 
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/appcache/manifest_parser.h"
 
 namespace appcache {
 
-class ManifestParserTest : public testing::Test {
+class AppCacheManifestParserTest : public testing::Test {
 };
 
-TEST(ManifestParserTest, NoData) {
+TEST(AppCacheManifestParserTest, NoData) {
   GURL url;
   Manifest manifest;
   EXPECT_FALSE(ParseManifest(url, "", 0, manifest));
   EXPECT_FALSE(ParseManifest(url, "CACHE MANIFEST\r", 0, manifest));  // 0 len
 }
 
-TEST(ManifestParserTest, CheckSignature) {
+TEST(AppCacheManifestParserTest, CheckSignature) {
   GURL url;
   Manifest manifest;
 
   const std::string kBadSignatures[] = {
     "foo",
     "CACHE MANIFEST;V2\r",          // not followed by whitespace
     "CACHE MANIFEST#bad\r",         // no whitespace before comment
     "cache manifest ",              // wrong case
     "#CACHE MANIFEST\r",            // comment
     "xCACHE MANIFEST\n",            // bad first char
@@ skipping 16 matching lines @@
     "CACHE MANIFEST ignore\r\n",
     "\xEF\xBB\xBF" "CACHE MANIFEST \r\n",   // BOM present
   };
 
   for (size_t i = 0; i < arraysize(kGoodSignatures); ++i) {
     const std::string good = kGoodSignatures[i];
     EXPECT_TRUE(ParseManifest(url, good.c_str(), good.length(), manifest));
   }
 }
 
-TEST(ManifestParserTest, NoManifestUrl) {
+TEST(AppCacheManifestParserTest, NoManifestUrl) {
   Manifest manifest;
   const std::string kData("CACHE MANIFEST\r"
     "relative/tobase.com\r"
     "http://absolute.com/addme.com");
   const GURL kUrl;
   EXPECT_TRUE(ParseManifest(kUrl, kData.c_str(), kData.length(), manifest));
   EXPECT_TRUE(manifest.explicit_urls.empty());
   EXPECT_TRUE(manifest.fallback_namespaces.empty());
   EXPECT_TRUE(manifest.online_whitelist_namespaces.empty());
   EXPECT_FALSE(manifest.online_whitelist_all);
 }
 
-TEST(ManifestParserTest, ExplicitUrls) {
+TEST(AppCacheManifestParserTest, ExplicitUrls) {
   Manifest manifest;
   const GURL kUrl("http://www.foo.com");
   const std::string kData("CACHE MANIFEST\r"
     "relative/one\r"
     "# some comment\r"
     "http://www.foo.com/two#strip\r\n"
     "NETWORK:\r"
     "  \t CACHE:\r"
     "HTTP://www.diff.com/three\r"
     "FALLBACK:\r"
@@ skipping 16 matching lines @@
   ASSERT_EQ(kExpected, urls.size());
   EXPECT_TRUE(urls.find("http://www.foo.com/relative/one") != urls.end());
   EXPECT_TRUE(urls.find("http://www.foo.com/two") != urls.end());
   EXPECT_TRUE(urls.find("http://www.diff.com/three") != urls.end());
   EXPECT_TRUE(urls.find("http://www.foo.com/relative/four") != urls.end());
 
   // Wildcard is treated as a relative URL in explicit section.
   EXPECT_TRUE(urls.find("http://www.foo.com/*") != urls.end());
 }
 
-TEST(ManifestParserTest, WhitelistUrls) {
+TEST(AppCacheManifestParserTest, WhitelistUrls) {
   Manifest manifest;
   const GURL kUrl("http://www.bar.com");
   const std::string kData("CACHE MANIFEST\r"
     "NETWORK:\r"
     "relative/one\r"
     "# a comment\r"
     "http://www.bar.com/two\r"
     "HTTP://www.diff.com/three#strip\n\r"
     "FALLBACK:\r"
     "garbage\r"
     "UNKNOWN:\r"
     "http://www.bar.com/ignore\r"
     "CACHE:\r"
     "NETWORK:\r"
     "https://www.wrongscheme.com\n"
     "relative/four#stripref \t \r"
     "http://www.five.com\r\n"
     "*foo\r");
 
   EXPECT_TRUE(ParseManifest(kUrl, kData.c_str(), kData.length(), manifest));
   EXPECT_TRUE(manifest.explicit_urls.empty());
   EXPECT_TRUE(manifest.fallback_namespaces.empty());
+  EXPECT_TRUE(manifest.intercept_namespaces.empty());
   EXPECT_FALSE(manifest.online_whitelist_all);
 
   std::vector<GURL> online = manifest.online_whitelist_namespaces;
   const size_t kExpected = 6;
   ASSERT_EQ(kExpected, online.size());
   EXPECT_EQ(GURL("http://www.bar.com/relative/one"), online[0]);
   EXPECT_EQ(GURL("http://www.bar.com/two"), online[1]);
   EXPECT_EQ(GURL("http://www.diff.com/three"), online[2]);
   EXPECT_EQ(GURL("http://www.bar.com/relative/four"), online[3]);
   EXPECT_EQ(GURL("http://www.five.com"), online[4]);
   EXPECT_EQ(GURL("http://www.bar.com/*foo"), online[5]);
 }
 
-TEST(ManifestParserTest, FallbackUrls) {
+TEST(AppCacheManifestParserTest, FallbackUrls) {
   Manifest manifest;
   const GURL kUrl("http://glorp.com");
   const std::string kData("CACHE MANIFEST\r"
     "# a comment\r"
     "CACHE:\r"
     "NETWORK:\r"
     "UNKNOWN:\r"
     "FALLBACK:\r"
     "relative/one \t \t http://glorp.com/onefb  \t \r"
     "*\r"
@@ skipping 10 matching lines @@
     "# only fallback urls in this test\r"
     "FALLBACK:\n"
     "relative/four#strip relative/fourfb#strip\r"
     "http://www.glorp.com/notsame relative/skipped\r");
 
   EXPECT_TRUE(ParseManifest(kUrl, kData.c_str(), kData.length(), manifest));
   EXPECT_TRUE(manifest.explicit_urls.empty());
   EXPECT_TRUE(manifest.online_whitelist_namespaces.empty());
   EXPECT_FALSE(manifest.online_whitelist_all);
 
-  std::vector<FallbackNamespace> fallbacks = manifest.fallback_namespaces;
+  const NamespaceVector& fallbacks = manifest.fallback_namespaces;
   const size_t kExpected = 5;
   ASSERT_EQ(kExpected, fallbacks.size());
+  EXPECT_EQ(FALLBACK_NAMESPACE, fallbacks[0].type);
+  EXPECT_EQ(FALLBACK_NAMESPACE, fallbacks[1].type);
+  EXPECT_EQ(FALLBACK_NAMESPACE, fallbacks[2].type);
+  EXPECT_EQ(FALLBACK_NAMESPACE, fallbacks[3].type);
+  EXPECT_EQ(FALLBACK_NAMESPACE, fallbacks[4].type);
   EXPECT_EQ(GURL("http://glorp.com/relative/one"),
-            fallbacks[0].first);
+            fallbacks[0].namespace_url);
   EXPECT_EQ(GURL("http://glorp.com/onefb"),
-            fallbacks[0].second);
+            fallbacks[0].target_url);
   EXPECT_EQ(GURL("http://glorp.com/two"),
-            fallbacks[1].first);
+            fallbacks[1].namespace_url);
   EXPECT_EQ(GURL("http://glorp.com/relative/twofb"),
-            fallbacks[1].second);
+            fallbacks[1].target_url);
   EXPECT_EQ(GURL("http://glorp.com/three"),
-            fallbacks[2].first);
+            fallbacks[2].namespace_url);
   EXPECT_EQ(GURL("http://glorp.com/relative/threefb"),
-            fallbacks[2].second);
+            fallbacks[2].target_url);
   EXPECT_EQ(GURL("http://glorp.com/three"),       // duplicates are stored
-            fallbacks[3].first);
+            fallbacks[3].namespace_url);
   EXPECT_EQ(GURL("http://glorp.com/three-dup"),
-            fallbacks[3].second);
+            fallbacks[3].target_url);
   EXPECT_EQ(GURL("http://glorp.com/relative/four"),
-            fallbacks[4].first);
+            fallbacks[4].namespace_url);
   EXPECT_EQ(GURL("http://glorp.com/relative/fourfb"),
-            fallbacks[4].second);
+            fallbacks[4].target_url);
+
+  EXPECT_TRUE(manifest.intercept_namespaces.empty());
 }
 
-TEST(ManifestParserTest, FallbackUrlsWithPort) {
+TEST(AppCacheManifestParserTest, FallbackUrlsWithPort) {
   Manifest manifest;
   const GURL kUrl("http://www.portme.com:1234");
   const std::string kData("CACHE MANIFEST\r"
     "FALLBACK:\r"
     "http://www.portme.com:1234/one relative/onefb\r"
     "HTTP://www.portme.com:9876/wrong http://www.portme.com:1234/ignore\r"
     "http://www.portme.com:1234/stillwrong http://www.portme.com:42/boo\r"
     "relative/two relative/twofb\r"
     "http://www.portme.com:1234/three HTTP://www.portme.com:1234/threefb\r"
     "http://www.portme.com/noport http://www.portme.com:1234/skipped\r"
     "http://www.portme.com:1234/skipme http://www.portme.com/noport\r");
 
   EXPECT_TRUE(ParseManifest(kUrl, kData.c_str(), kData.length(), manifest));
   EXPECT_TRUE(manifest.explicit_urls.empty());
   EXPECT_TRUE(manifest.online_whitelist_namespaces.empty());
   EXPECT_FALSE(manifest.online_whitelist_all);
 
-  std::vector<FallbackNamespace> fallbacks = manifest.fallback_namespaces;
+  const NamespaceVector& fallbacks = manifest.fallback_namespaces;
   const size_t kExpected = 3;
   ASSERT_EQ(kExpected, fallbacks.size());
+  EXPECT_EQ(FALLBACK_NAMESPACE, fallbacks[0].type);
+  EXPECT_EQ(FALLBACK_NAMESPACE, fallbacks[1].type);
+  EXPECT_EQ(FALLBACK_NAMESPACE, fallbacks[2].type);
   EXPECT_EQ(GURL("http://www.portme.com:1234/one"),
-            fallbacks[0].first);
+            fallbacks[0].namespace_url);
   EXPECT_EQ(GURL("http://www.portme.com:1234/relative/onefb"),
-            fallbacks[0].second);
+            fallbacks[0].target_url);
   EXPECT_EQ(GURL("http://www.portme.com:1234/relative/two"),
-            fallbacks[1].first);
+            fallbacks[1].namespace_url);
   EXPECT_EQ(GURL("http://www.portme.com:1234/relative/twofb"),
-            fallbacks[1].second);
+            fallbacks[1].target_url);
   EXPECT_EQ(GURL("http://www.portme.com:1234/three"),
-            fallbacks[2].first);
+            fallbacks[2].namespace_url);
   EXPECT_EQ(GURL("http://www.portme.com:1234/threefb"),
-            fallbacks[2].second);
+            fallbacks[2].target_url);
+
+  EXPECT_TRUE(manifest.intercept_namespaces.empty());
 }
 
-TEST(ManifestParserTest, ComboUrls) {
+TEST(AppCacheManifestParserTest, InterceptUrls) {
+  Manifest manifest;
+  const GURL kUrl("http://www.portme.com:1234");
+  const std::string kData("CHROMIUM CACHE MANIFEST\r"

[jennb, 2011/12/05 23:23:07]

Do we care if the manifest does not use the CHROMIUM signature, but still has an
INTERCEPT section? I'm not sure what's supposed to happen in that case.

[michaeln, 2011/12/06 02:07:06]

I was going to allow the intercept namespaces to work in that case too.

+    "CHROMIUM-INTERCEPT:\r"
+    "http://www.portme.com:1234/one return relative/onefb\r"

[jennb, 2011/12/05 23:23:07]

the fb in onefb stands for fallback. ;-) 

Not that it matters enough to change for the intercept test.

[michaeln, 2011/12/06 02:07:06]

oh... its not short for facebook :)

+    "HTTP://www.portme.com:9876/wrong return http://www.portme.com:1234/ignore\r"
+    "http://www.portme.com:1234/stillwrong return  http://www.portme.com:42/boo\r"
+    "relative/two return relative/twofb\r"
+    "relative/three wrong relative/threefb\r"
+    "http://www.portme.com:1234/three return HTTP://www.portme.com:1234/threefb\r"
+    "http://www.portme.com/noport return http://www.portme.com:1234/skipped\r"
+    "http://www.portme.com:1234/skipme return http://www.portme.com/noport\r"
+    "relative/wrong/again missing/intercept_type\r");
+
+  EXPECT_TRUE(ParseManifest(kUrl, kData.c_str(), kData.length(), manifest));
+  EXPECT_TRUE(manifest.fallback_namespaces.empty());
+  EXPECT_TRUE(manifest.explicit_urls.empty());
+  EXPECT_TRUE(manifest.online_whitelist_namespaces.empty());
+  EXPECT_FALSE(manifest.online_whitelist_all);
+
+  const NamespaceVector& intercepts = manifest.intercept_namespaces;
+  const size_t kExpected = 3;
+  ASSERT_EQ(kExpected, intercepts.size());
+  EXPECT_EQ(INTERCEPT_NAMESPACE, intercepts[0].type);
+  EXPECT_EQ(INTERCEPT_NAMESPACE, intercepts[1].type);
+  EXPECT_EQ(INTERCEPT_NAMESPACE, intercepts[2].type);
+  EXPECT_EQ(GURL("http://www.portme.com:1234/one"),
+            intercepts[0].namespace_url);
+  EXPECT_EQ(GURL("http://www.portme.com:1234/relative/onefb"),
+            intercepts[0].target_url);
+  EXPECT_EQ(GURL("http://www.portme.com:1234/relative/two"),
+            intercepts[1].namespace_url);
+  EXPECT_EQ(GURL("http://www.portme.com:1234/relative/twofb"),
+            intercepts[1].target_url);
+  EXPECT_EQ(GURL("http://www.portme.com:1234/three"),
+            intercepts[2].namespace_url);
+  EXPECT_EQ(GURL("http://www.portme.com:1234/threefb"),
+            intercepts[2].target_url);
+
+}
+
+TEST(AppCacheManifestParserTest, ComboUrls) {
   Manifest manifest;
   const GURL kUrl("http://combo.com:42");
   const std::string kData("CACHE MANIFEST\r"
     "relative/explicit-1\r"
     "# some comment\r"
     "http://combo.com:99/explicit-2#strip\r"
     "NETWORK:\r"
     "http://combo.com/whitelist-1\r"
     "HTTP://www.diff.com/whitelist-2#strip\r"
     "*\r"
@@ skipping 20 matching lines @@
   EXPECT_TRUE(urls.find("http://www.diff.com/explicit-3") != urls.end());
 
   std::vector<GURL> online = manifest.online_whitelist_namespaces;
   expected = 4;
   ASSERT_EQ(expected, online.size());
   EXPECT_EQ(GURL("http://combo.com/whitelist-1"), online[0]);
   EXPECT_EQ(GURL("http://www.diff.com/whitelist-2"), online[1]);
   EXPECT_EQ(GURL("http://combo.com:42/relative/whitelist-3"), online[2]);
   EXPECT_EQ(GURL("http://combo.com:99/whitelist-4"), online[3]);
 
-  std::vector<FallbackNamespace> fallbacks = manifest.fallback_namespaces;
+  const NamespaceVector& fallbacks = manifest.fallback_namespaces;
   expected = 2;
   ASSERT_EQ(expected, fallbacks.size());
+  EXPECT_EQ(FALLBACK_NAMESPACE, fallbacks[0].type);
+  EXPECT_EQ(FALLBACK_NAMESPACE, fallbacks[1].type);
   EXPECT_EQ(GURL("http://combo.com:42/fallback-1"),
-            fallbacks[0].first);
+            fallbacks[0].namespace_url);
   EXPECT_EQ(GURL("http://combo.com:42/fallback-1b"),
-            fallbacks[0].second);
+            fallbacks[0].target_url);
   EXPECT_EQ(GURL("http://combo.com:42/relative/fallback-2"),
-            fallbacks[1].first);
+            fallbacks[1].namespace_url);
   EXPECT_EQ(GURL("http://combo.com:42/relative/fallback-2b"),
-            fallbacks[1].second);
+            fallbacks[1].target_url);
+
+  EXPECT_TRUE(manifest.intercept_namespaces.empty());
 }
 
-TEST(ManifestParserTest, UnusualUtf8) {
+TEST(AppCacheManifestParserTest, UnusualUtf8) {
   Manifest manifest;
   const GURL kUrl("http://bad.com");
   const std::string kData("CACHE MANIFEST\r"
     "\xC0" "invalidutf8\r"
     "nonbmp" "\xF1\x84\xAB\xBC\r");
   EXPECT_TRUE(ParseManifest(kUrl, kData.c_str(), kData.length(), manifest));
 
   base::hash_set<std::string> urls = manifest.explicit_urls;
   EXPECT_TRUE(urls.find("http://bad.com/%EF%BF%BDinvalidutf8") != urls.end());
   EXPECT_TRUE(urls.find("http://bad.com/nonbmp%F1%84%AB%BC") != urls.end());
 }
 
-TEST(ManifestParserTest, IgnoreAfterSpace) {
+TEST(AppCacheManifestParserTest, IgnoreAfterSpace) {
   Manifest manifest;
   const GURL kUrl("http://smorg.borg");
   const std::string kData(
     "CACHE MANIFEST\r"
     "resource.txt this stuff after the white space should be ignored\r");
   EXPECT_TRUE(ParseManifest(kUrl, kData.c_str(), kData.length(), manifest));
 
   base::hash_set<std::string> urls = manifest.explicit_urls;
   EXPECT_TRUE(urls.find("http://smorg.borg/resource.txt") != urls.end());
 }
 
-TEST(ManifestParserTest, DifferentOriginUrlWithSecureScheme) {
+TEST(AppCacheManifestParserTest, DifferentOriginUrlWithSecureScheme) {
   Manifest manifest;
   const GURL kUrl("https://www.foo.com");
   const std::string kData("CACHE MANIFEST\r"
     "CACHE: \r"
     "relative/secureschemesameorigin\r"
     "https://www.foo.com/secureschemesameorigin\r"
     "http://www.xyz.com/secureschemedifforigin\r"
     "https://www.xyz.com/secureschemedifforigin\r");
 
   EXPECT_TRUE(ParseManifest(kUrl, kData.c_str(), kData.length(), manifest));
   EXPECT_TRUE(manifest.fallback_namespaces.empty());
   EXPECT_TRUE(manifest.online_whitelist_namespaces.empty());
 
   base::hash_set<std::string> urls = manifest.explicit_urls;
   const size_t kExpected = 3;
   ASSERT_EQ(kExpected, urls.size());
   EXPECT_TRUE(urls.find("https://www.foo.com/relative/secureschemesameorigin")
       != urls.end());
   EXPECT_TRUE(urls.find("https://www.foo.com/secureschemesameorigin") !=
       urls.end());
   EXPECT_FALSE(urls.find("http://www.xyz.com/secureschemedifforigin") !=
       urls.end());
   EXPECT_TRUE(urls.find("https://www.xyz.com/secureschemedifforigin") !=
       urls.end());
 }
 
 }  // namespace appcache
-