| Index: net/base/sdch_filter_unittest.cc
|
| diff --git a/net/base/sdch_filter_unittest.cc b/net/base/sdch_filter_unittest.cc
|
| index ca73923869cc4bb8ef9bf68776a55d89574e3746..696b4809b821e4506dbbfc221be1d20c9c1a9044 100644
|
| --- a/net/base/sdch_filter_unittest.cc
|
| +++ b/net/base/sdch_filter_unittest.cc
|
| @@ -1115,7 +1115,6 @@ TEST_F(SdchFilterTest, AcceptGzipGzipSdchIfGzip) {
|
| filter_context.SetURL(url);
|
| scoped_ptr<Filter> filter(Filter::Factory(filter_types, filter_context));
|
|
|
| -
|
| // Verify that chained filter is waiting for data.
|
| char tiny_output_buffer[10];
|
| int tiny_output_size = sizeof(tiny_output_buffer);
|
| @@ -1140,331 +1139,4 @@ TEST_F(SdchFilterTest, AcceptGzipGzipSdchIfGzip) {
|
| EXPECT_EQ(output, expanded_);
|
| }
|
|
|
| -TEST_F(SdchFilterTest, DomainSupported) {
|
| - GURL google_url("http://www.google.com");
|
| -
|
| - net::SdchManager::EnableSdchSupport(false);
|
| - EXPECT_FALSE(SdchManager::Global()->IsInSupportedDomain(google_url));
|
| - net::SdchManager::EnableSdchSupport(true);
|
| - EXPECT_TRUE(SdchManager::Global()->IsInSupportedDomain(google_url));
|
| -}
|
| -
|
| -TEST_F(SdchFilterTest, DomainBlacklisting) {
|
| - GURL test_url("http://www.test.com");
|
| - GURL google_url("http://www.google.com");
|
| -
|
| - SdchManager::BlacklistDomain(test_url);
|
| - EXPECT_FALSE(SdchManager::Global()->IsInSupportedDomain(test_url));
|
| - EXPECT_TRUE(SdchManager::Global()->IsInSupportedDomain(google_url));
|
| -
|
| - SdchManager::BlacklistDomain(google_url);
|
| - EXPECT_FALSE(SdchManager::Global()->IsInSupportedDomain(google_url));
|
| -}
|
| -
|
| -TEST_F(SdchFilterTest, DomainBlacklistingCaseSensitivity) {
|
| - GURL test_url("http://www.TesT.com");
|
| - GURL test2_url("http://www.tEst.com");
|
| -
|
| - EXPECT_TRUE(SdchManager::Global()->IsInSupportedDomain(test_url));
|
| - EXPECT_TRUE(SdchManager::Global()->IsInSupportedDomain(test2_url));
|
| - SdchManager::BlacklistDomain(test_url);
|
| - EXPECT_FALSE(SdchManager::Global()->IsInSupportedDomain(test2_url));
|
| -}
|
| -
|
| -TEST_F(SdchFilterTest, BlacklistingReset) {
|
| - GURL gurl("http://mytest.DoMain.com");
|
| - std::string domain(gurl.host());
|
| -
|
| - SdchManager::ClearBlacklistings();
|
| - EXPECT_EQ(SdchManager::BlackListDomainCount(domain), 0);
|
| - EXPECT_EQ(SdchManager::BlacklistDomainExponential(domain), 0);
|
| - EXPECT_TRUE(SdchManager::Global()->IsInSupportedDomain(gurl));
|
| -}
|
| -
|
| -TEST_F(SdchFilterTest, BlacklistingSingleBlacklist) {
|
| - GURL gurl("http://mytest.DoMain.com");
|
| - std::string domain(gurl.host());
|
| - SdchManager::ClearBlacklistings();
|
| -
|
| - SdchManager::Global()->BlacklistDomain(gurl);
|
| - EXPECT_EQ(SdchManager::BlackListDomainCount(domain), 1);
|
| - EXPECT_EQ(SdchManager::BlacklistDomainExponential(domain), 1);
|
| -
|
| - // Check that any domain lookup reduces the blacklist counter.
|
| - EXPECT_FALSE(SdchManager::Global()->IsInSupportedDomain(gurl));
|
| - EXPECT_EQ(SdchManager::BlackListDomainCount(domain), 0);
|
| - EXPECT_TRUE(SdchManager::Global()->IsInSupportedDomain(gurl));
|
| -}
|
| -
|
| -TEST_F(SdchFilterTest, BlacklistingExponential) {
|
| - GURL gurl("http://mytest.DoMain.com");
|
| - std::string domain(gurl.host());
|
| - SdchManager::ClearBlacklistings();
|
| -
|
| - int exponential = 1;
|
| - for (int i = 1; i < 100; ++i) {
|
| - SdchManager::Global()->BlacklistDomain(gurl);
|
| - EXPECT_EQ(SdchManager::BlacklistDomainExponential(domain), exponential);
|
| -
|
| - EXPECT_EQ(SdchManager::BlackListDomainCount(domain), exponential);
|
| - EXPECT_FALSE(SdchManager::Global()->IsInSupportedDomain(gurl));
|
| - EXPECT_EQ(SdchManager::BlackListDomainCount(domain), exponential - 1);
|
| -
|
| - // Simulate a large number of domain checks (which eventually remove the
|
| - // blacklisting).
|
| - SdchManager::ClearDomainBlacklisting(domain);
|
| - EXPECT_EQ(SdchManager::BlackListDomainCount(domain), 0);
|
| - EXPECT_TRUE(SdchManager::Global()->IsInSupportedDomain(gurl));
|
| -
|
| - // Predict what exponential backoff will be.
|
| - exponential = 1 + 2 * exponential;
|
| - if (exponential < 0)
|
| - exponential = INT_MAX; // We don't wrap.
|
| - }
|
| -}
|
| -
|
| -TEST_F(SdchFilterTest, CanSetExactMatchDictionary) {
|
| - std::string dictionary_domain("x.y.z.google.com");
|
| - std::string dictionary_text(NewSdchDictionary(dictionary_domain));
|
| -
|
| - // Perfect match should work.
|
| - EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary_text,
|
| - GURL("http://" + dictionary_domain)));
|
| -}
|
| -
|
| -TEST_F(SdchFilterTest, CanAdvertiseDictionaryOverHTTP) {
|
| - std::string dictionary_domain("x.y.z.google.com");
|
| - std::string dictionary_text(NewSdchDictionary(dictionary_domain));
|
| -
|
| - EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary_text,
|
| - GURL("http://" + dictionary_domain)));
|
| -
|
| - std::string dictionary_list;
|
| - // HTTP target URL can advertise dictionary.
|
| - sdch_manager_->GetAvailDictionaryList(
|
| - GURL("http://" + dictionary_domain + "/test"),
|
| - &dictionary_list);
|
| - EXPECT_FALSE(dictionary_list.empty());
|
| -}
|
| -
|
| -TEST_F(SdchFilterTest, CanNotAdvertiseDictionaryOverHTTPS) {
|
| - std::string dictionary_domain("x.y.z.google.com");
|
| - std::string dictionary_text(NewSdchDictionary(dictionary_domain));
|
| -
|
| - EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary_text,
|
| - GURL("http://" + dictionary_domain)));
|
| -
|
| - std::string dictionary_list;
|
| - // HTTPS target URL should NOT advertise dictionary.
|
| - sdch_manager_->GetAvailDictionaryList(
|
| - GURL("https://" + dictionary_domain + "/test"),
|
| - &dictionary_list);
|
| - EXPECT_TRUE(dictionary_list.empty());
|
| -}
|
| -
|
| -TEST_F(SdchFilterTest, CanUseHTTPSDictionaryOverHTTPSIfEnabled) {
|
| - std::string dictionary_domain("x.y.z.google.com");
|
| - std::string dictionary_text(NewSdchDictionary(dictionary_domain));
|
| -
|
| - EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary_text,
|
| - GURL("https://" + dictionary_domain)));
|
| -
|
| - GURL target_url("https://" + dictionary_domain + "/test");
|
| - std::string dictionary_list;
|
| - // HTTPS target URL should advertise dictionary if secure scheme support is
|
| - // enabled.
|
| - sdch_manager_->EnableSecureSchemeSupport(true);
|
| - sdch_manager_->GetAvailDictionaryList(target_url, &dictionary_list);
|
| - EXPECT_FALSE(dictionary_list.empty());
|
| -
|
| - // Dictionary should be available.
|
| - SdchManager::Dictionary* dictionary = NULL;
|
| - std::string client_hash;
|
| - std::string server_hash;
|
| - sdch_manager_->GenerateHash(dictionary_text, &client_hash, &server_hash);
|
| - sdch_manager_->GetVcdiffDictionary(server_hash, target_url, &dictionary);
|
| - EXPECT_TRUE(dictionary != NULL);
|
| -}
|
| -
|
| -TEST_F(SdchFilterTest, CanNotUseHTTPDictionaryOverHTTPS) {
|
| - std::string dictionary_domain("x.y.z.google.com");
|
| - std::string dictionary_text(NewSdchDictionary(dictionary_domain));
|
| -
|
| - EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary_text,
|
| - GURL("http://" + dictionary_domain)));
|
| -
|
| - GURL target_url("https://" + dictionary_domain + "/test");
|
| - std::string dictionary_list;
|
| - // HTTPS target URL should not advertise dictionary acquired over HTTP even if
|
| - // secure scheme support is enabled.
|
| - sdch_manager_->EnableSecureSchemeSupport(true);
|
| - sdch_manager_->GetAvailDictionaryList(target_url, &dictionary_list);
|
| - EXPECT_TRUE(dictionary_list.empty());
|
| -
|
| - SdchManager::Dictionary* dictionary = NULL;
|
| - std::string client_hash;
|
| - std::string server_hash;
|
| - sdch_manager_->GenerateHash(dictionary_text, &client_hash, &server_hash);
|
| - sdch_manager_->GetVcdiffDictionary(server_hash, target_url, &dictionary);
|
| - EXPECT_TRUE(dictionary == NULL);
|
| -}
|
| -
|
| -TEST_F(SdchFilterTest, FailToSetDomainMismatchDictionary) {
|
| - std::string dictionary_domain("x.y.z.google.com");
|
| - std::string dictionary_text(NewSdchDictionary(dictionary_domain));
|
| -
|
| - // Fail the "domain match" requirement.
|
| - EXPECT_FALSE(sdch_manager_->AddSdchDictionary(dictionary_text,
|
| - GURL("http://y.z.google.com")));
|
| -}
|
| -
|
| -TEST_F(SdchFilterTest, FailToSetDotHostPrefixDomainDictionary) {
|
| - std::string dictionary_domain("x.y.z.google.com");
|
| - std::string dictionary_text(NewSdchDictionary(dictionary_domain));
|
| -
|
| - // Fail the HD with D being the domain and H having a dot requirement.
|
| - EXPECT_FALSE(sdch_manager_->AddSdchDictionary(dictionary_text,
|
| - GURL("http://w.x.y.z.google.com")));
|
| -}
|
| -
|
| -TEST_F(SdchFilterTest, FailToSetRepeatPrefixWithDotDictionary) {
|
| - // Make sure that a prefix that matches the domain postfix won't confuse
|
| - // the validation checks.
|
| - std::string dictionary_domain("www.google.com");
|
| - std::string dictionary_text(NewSdchDictionary(dictionary_domain));
|
| -
|
| - // Fail the HD with D being the domain and H having a dot requirement.
|
| - EXPECT_FALSE(sdch_manager_->AddSdchDictionary(dictionary_text,
|
| - GURL("http://www.google.com.www.google.com")));
|
| -}
|
| -
|
| -TEST_F(SdchFilterTest, CanSetLeadingDotDomainDictionary) {
|
| - // Make sure that a prefix that matches the domain postfix won't confuse
|
| - // the validation checks.
|
| - std::string dictionary_domain(".google.com");
|
| - std::string dictionary_text(NewSdchDictionary(dictionary_domain));
|
| -
|
| - // Verify that a leading dot in the domain is acceptable, as long as the host
|
| - // name does not contain any dots preceding the matched domain name.
|
| - EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary_text,
|
| - GURL("http://www.google.com")));
|
| -}
|
| -
|
| -// Make sure the order of the tests is not helping us or confusing things.
|
| -// See test CanSetExactMatchDictionary above for first try.
|
| -TEST_F(SdchFilterTest, CanStillSetExactMatchDictionary) {
|
| - std::string dictionary_domain("x.y.z.google.com");
|
| - std::string dictionary_text(NewSdchDictionary(dictionary_domain));
|
| -
|
| - // Perfect match should *STILL* work.
|
| - EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary_text,
|
| - GURL("http://" + dictionary_domain)));
|
| -}
|
| -
|
| -// Make sure the DOS protection precludes the addition of too many dictionaries.
|
| -TEST_F(SdchFilterTest, TooManyDictionaries) {
|
| - std::string dictionary_domain(".google.com");
|
| - std::string dictionary_text(NewSdchDictionary(dictionary_domain));
|
| -
|
| - size_t count = 0;
|
| - while (count <= SdchManager::kMaxDictionaryCount + 1) {
|
| - if (!sdch_manager_->AddSdchDictionary(dictionary_text,
|
| - GURL("http://www.google.com")))
|
| - break;
|
| -
|
| - dictionary_text += " "; // Create dictionary with different SHA signature.
|
| - ++count;
|
| - }
|
| - EXPECT_EQ(SdchManager::kMaxDictionaryCount, count);
|
| -}
|
| -
|
| -TEST_F(SdchFilterTest, DictionaryNotTooLarge) {
|
| - std::string dictionary_domain(".google.com");
|
| - std::string dictionary_text(NewSdchDictionary(dictionary_domain));
|
| -
|
| - dictionary_text.append(
|
| - SdchManager::kMaxDictionarySize - dictionary_text.size(), ' ');
|
| - EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary_text,
|
| - GURL("http://" + dictionary_domain)));
|
| -}
|
| -
|
| -TEST_F(SdchFilterTest, DictionaryTooLarge) {
|
| - std::string dictionary_domain(".google.com");
|
| - std::string dictionary_text(NewSdchDictionary(dictionary_domain));
|
| -
|
| - dictionary_text.append(
|
| - SdchManager::kMaxDictionarySize + 1 - dictionary_text.size(), ' ');
|
| - EXPECT_FALSE(sdch_manager_->AddSdchDictionary(dictionary_text,
|
| - GURL("http://" + dictionary_domain)));
|
| -}
|
| -
|
| -TEST_F(SdchFilterTest, PathMatch) {
|
| - bool (*PathMatch)(const std::string& path, const std::string& restriction) =
|
| - SdchManager::Dictionary::PathMatch;
|
| - // Perfect match is supported.
|
| - EXPECT_TRUE(PathMatch("/search", "/search"));
|
| - EXPECT_TRUE(PathMatch("/search/", "/search/"));
|
| -
|
| - // Prefix only works if last character of restriction is a slash, or first
|
| - // character in path after a match is a slash. Validate each case separately.
|
| -
|
| - // Rely on the slash in the path (not at the end of the restriction).
|
| - EXPECT_TRUE(PathMatch("/search/something", "/search"));
|
| - EXPECT_TRUE(PathMatch("/search/s", "/search"));
|
| - EXPECT_TRUE(PathMatch("/search/other", "/search"));
|
| - EXPECT_TRUE(PathMatch("/search/something", "/search"));
|
| -
|
| - // Rely on the slash at the end of the restriction.
|
| - EXPECT_TRUE(PathMatch("/search/something", "/search/"));
|
| - EXPECT_TRUE(PathMatch("/search/s", "/search/"));
|
| - EXPECT_TRUE(PathMatch("/search/other", "/search/"));
|
| - EXPECT_TRUE(PathMatch("/search/something", "/search/"));
|
| -
|
| - // Make sure less that sufficient prefix match is false.
|
| - EXPECT_FALSE(PathMatch("/sear", "/search"));
|
| - EXPECT_FALSE(PathMatch("/", "/search"));
|
| - EXPECT_FALSE(PathMatch(std::string(), "/search"));
|
| -
|
| - // Add examples with several levels of direcories in the restriction.
|
| - EXPECT_FALSE(PathMatch("/search/something", "search/s"));
|
| - EXPECT_FALSE(PathMatch("/search/", "/search/s"));
|
| -
|
| - // Make sure adding characters to path will also fail.
|
| - EXPECT_FALSE(PathMatch("/searching", "/search/"));
|
| - EXPECT_FALSE(PathMatch("/searching", "/search"));
|
| -
|
| - // Make sure we're case sensitive.
|
| - EXPECT_FALSE(PathMatch("/ABC", "/abc"));
|
| - EXPECT_FALSE(PathMatch("/abc", "/ABC"));
|
| -}
|
| -
|
| -// The following are only applicable while we have a latency test in the code,
|
| -// and can be removed when that functionality is stripped.
|
| -TEST_F(SdchFilterTest, LatencyTestControls) {
|
| - GURL url("http://www.google.com");
|
| - GURL url2("http://www.google2.com");
|
| -
|
| - // First make sure we default to false.
|
| - EXPECT_FALSE(sdch_manager_->AllowLatencyExperiment(url));
|
| - EXPECT_FALSE(sdch_manager_->AllowLatencyExperiment(url2));
|
| -
|
| - // That we can set each to true.
|
| - sdch_manager_->SetAllowLatencyExperiment(url, true);
|
| - EXPECT_TRUE(sdch_manager_->AllowLatencyExperiment(url));
|
| - EXPECT_FALSE(sdch_manager_->AllowLatencyExperiment(url2));
|
| -
|
| - sdch_manager_->SetAllowLatencyExperiment(url2, true);
|
| - EXPECT_TRUE(sdch_manager_->AllowLatencyExperiment(url));
|
| - EXPECT_TRUE(sdch_manager_->AllowLatencyExperiment(url2));
|
| -
|
| - // And can reset them to false.
|
| - sdch_manager_->SetAllowLatencyExperiment(url, false);
|
| - EXPECT_FALSE(sdch_manager_->AllowLatencyExperiment(url));
|
| - EXPECT_TRUE(sdch_manager_->AllowLatencyExperiment(url2));
|
| -
|
| - sdch_manager_->SetAllowLatencyExperiment(url2, false);
|
| - EXPECT_FALSE(sdch_manager_->AllowLatencyExperiment(url));
|
| - EXPECT_FALSE(sdch_manager_->AllowLatencyExperiment(url2));
|
| -}
|
| -
|
| } // namespace net
|
|
|