Simple fallback implementation.

chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest.cc

 // Copyright 2013 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 "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest.h"
 
 #include "base/command_line.h"
+#include "base/md5.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings.h"
 #include "chrome/browser/prefs/proxy_prefs.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/metrics/variations/variations_util.h"
 #include "chrome/common/pref_names.h"
 #include "components/variations/entropy_provider.h"
+#include "net/base/auth.h"
+#include "net/base/host_port_pair.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
-const char kDataReductionProxyOrigin[] = "https://foo:443/";
-const char kDataReductionProxyOriginHostPort[] = "foo:443";
+const char kDataReductionProxyOrigin[] = "https://foo.com:443/";
+const char kDataReductionProxyFallback[] = "http://bar.com:80";
 const char kDataReductionProxyAuth[] = "12345";
 
 const char kProbeURLWithOKResponse[] = "http://ok.org/";
 const char kProbeURLWithBadResponse[] = "http://bad.org/";
 const char kProbeURLWithNoResponse[] = "http://no.org/";
 
 class TestDataReductionProxySettings
     : public DataReductionProxySettings {
  public:
   TestDataReductionProxySettings(PrefService* profile_prefs,
                                  PrefService* local_state_prefs)
       : DataReductionProxySettings(),
         success_(false),
         fake_fetcher_request_count_(0),
         profile_prefs_(profile_prefs),
         local_state_prefs_(local_state_prefs) {
   }
 
   // DataReductionProxySettings implementation:
   virtual net::URLFetcher* GetURLFetcher() OVERRIDE {
     if (test_url_.empty())
       return NULL;
     net::URLFetcher* fetcher =
         new net::FakeURLFetcher(GURL(test_url_), this, response_, success_);
     fake_fetcher_request_count_++;
     return fetcher;
   }
 
   virtual PrefService* GetOriginalProfilePrefs() OVERRIDE {

[bengr, 2013/10/22 17:49:30]

Can you use MOCK_METHOD0 for all of these overrides? Then you could test whether
they are called as expected.

[marq (ping after 24h), 2013/10/22 21:18:01]

I was not previously aware of that, and that will actually get rid of some of
the uglier duplication between the test classes. In the interests of our
short-term goals, I'll restructure the tests to use mocks in a later patch.

[bengr, 2013/10/22 21:44:21]

Please add a TODO here and in all locations where you have planned changes.

     return profile_prefs_;
   }
 
   virtual PrefService* GetLocalStatePrefs() OVERRIDE {
     return local_state_prefs_;
   }
 
+  virtual std::string GetDefaultProxyHost() OVERRIDE { return std::string(); }
+  virtual std::string GetDefaultFallbackProxyHost() OVERRIDE {
+    return std::string();
+  }
+
   void set_probe_result(const std::string& test_url,
                         const std::string& response,
                         bool success) {
     test_url_ = test_url;
     response_ = response;
     success_ = success;
   }
 
   const int fake_fetcher_request_count() {
     return fake_fetcher_request_count_;
@@ skipping 11 matching lines @@
 DataReductionProxySettingsTestBase::DataReductionProxySettingsTestBase()
     : testing::Test() {
 }
 
 DataReductionProxySettingsTestBase::~DataReductionProxySettingsTestBase() {}
 
 void DataReductionProxySettingsTestBase::AddProxyToCommandLine() {
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kSpdyProxyAuthOrigin, kDataReductionProxyOrigin);
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+      switches::kSpdyProxyAuthFallback, kDataReductionProxyFallback);
+  CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kSpdyProxyAuthValue, kDataReductionProxyAuth);
 }
 
 // testing::Test implementation:
 void DataReductionProxySettingsTestBase::SetUp() {
   PrefRegistrySimple* registry = pref_service_.registry();
   registry->RegisterListPref(prefs::kDailyHttpOriginalContentLength);
   registry->RegisterListPref(prefs::kDailyHttpReceivedContentLength);
   registry->RegisterInt64Pref(
       prefs::kDailyHttpContentLengthLastUpdateDate, 0L);
@@ skipping 24 matching lines @@
   std::string server;
   dict->GetString("mode", &mode);
   ASSERT_EQ(expected_mode, mode);
   dict->GetString("server", &server);
   ASSERT_EQ(expected_servers, server);
 }
 
 void DataReductionProxySettingsTestBase::CheckProxyConfigs(
     bool expected_enabled) {
   if (expected_enabled) {
+    std::string main_proxy = kDataReductionProxyOrigin;
+    std::string fallback_proxy = kDataReductionProxyFallback;
     std::string servers =
-      "http=" + Settings()->GetDataReductionProxyOrigin() + ",direct://;";
+        "http=" + main_proxy + "," + fallback_proxy + ",direct://;";
     CheckProxyPref(servers,
                    ProxyModeToString(ProxyPrefs::MODE_FIXED_SERVERS));
   } else {
     CheckProxyPref(std::string(), ProxyModeToString(ProxyPrefs::MODE_SYSTEM));
   }
 }
 
 void DataReductionProxySettingsTestBase::CheckProbe(bool initially_enabled,
                                                 const std::string& probe_url,
                                                 const std::string& response,
@@ skipping 66 matching lines @@
   scoped_ptr<TestDataReductionProxySettings> settings_;
 };
 
 TEST_F(DataReductionProxySettingsTest, TestGetDataReductionProxyOrigin) {
   AddProxyToCommandLine();
   // SetUp() adds the origin to the command line, which should be returned here.
   std::string result = settings_->GetDataReductionProxyOrigin();
   EXPECT_EQ(kDataReductionProxyOrigin, result);
 }
 
-TEST_F(DataReductionProxySettingsTest, TestGetDataReductionProxyAuth) {
-  AddProxyToCommandLine();
-  // SetUp() adds the auth string to the command line, which should be returned
-  // here.
-  std::string result = settings_->GetDataReductionProxyAuth();
-  EXPECT_EQ(kDataReductionProxyAuth, result);
+TEST_F(DataReductionProxySettingsTest, TestGetDataReductionProxies) {
+  DataReductionProxySettings::DataReductionProxyList proxies =
+      settings_->GetDataReductionProxies();
+  EXPECT_TRUE(proxies.empty());
+
+  // Adding just the fallback on the command line shouldn't add a proxy.
+  CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+      switches::kSpdyProxyAuthFallback, kDataReductionProxyFallback);
+  proxies = settings_->GetDataReductionProxies();
+  dump_proxies(proxies);
+  EXPECT_EQ(0u, proxies.size());
+  EXPECT_TRUE(proxies.empty());
+
+  CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+    switches::kSpdyProxyAuthOrigin, kDataReductionProxyOrigin);
+  proxies = settings_->GetDataReductionProxies();
+  EXPECT_EQ(2u, proxies.size());
+
+  EXPECT_EQ("foo.com",proxies[0].host());
+  EXPECT_EQ(443u,proxies[0].port());
+  EXPECT_EQ("bar.com",proxies[1].host());
+  EXPECT_EQ(80u,proxies[1].port());
 }
 
-// Test that the auth value set by preprocessor directive is not returned
+TEST_F(DataReductionProxySettingsTest, TestAuthHashGeneration) {
+  AddProxyToCommandLine();
+  std::string salt = "8675309";  // Jenny's number to test the hash generator.

[bengr, 2013/10/22 17:49:30]

:)

[marq (ping after 24h), 2013/10/22 21:18:01]

Ack :-)

+  std::string salted_key = salt + kDataReductionProxyAuth + salt;
+  base::string16 expected_hash = UTF8ToUTF16(base::MD5String(salted_key));
+  EXPECT_EQ(expected_hash, settings_->AuthHashForSalt(8675309));
+}
+
+// Test that the auth key set by preprocessor directive is not used
 // when an origin is set via a switch. This test only does anything useful in
 // Chrome builds.
 TEST_F(DataReductionProxySettingsTest,
-       TestGetDataReductionProxyAuthWithOriginSetViaSwitch) {
+       TestAuthHashGenerationWithOriginSetViaSwitch) {
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kSpdyProxyAuthOrigin, kDataReductionProxyOrigin);
-  std::string result = settings_->GetDataReductionProxyAuth();
-  EXPECT_EQ("", result);
+  EXPECT_EQ(base::string16(), settings_->AuthHashForSalt(8675309));
 }
 
 TEST_F(DataReductionProxySettingsTest, TestIsProxyEnabledOrManaged) {
   settings_->InitPrefMembers();
   EXPECT_FALSE(settings_->IsDataReductionProxyEnabled());
   EXPECT_FALSE(settings_->IsDataReductionProxyManaged());
 
   pref_service_.SetBoolean(prefs::kSpdyProxyAuthEnabled, true);
   EXPECT_TRUE(settings_->IsDataReductionProxyEnabled());
   EXPECT_FALSE(settings_->IsDataReductionProxyManaged());
 
   pref_service_.SetManagedPref(prefs::kSpdyProxyAuthEnabled,
                                base::Value::CreateBooleanValue(true));
   EXPECT_TRUE(settings_->IsDataReductionProxyEnabled());
   EXPECT_TRUE(settings_->IsDataReductionProxyManaged());
 }
 
+TEST_F(DataReductionProxySettingsTest, TestAcceptableChallenges) {
+  AddProxyToCommandLine();
+  typedef struct {
+    std::string host;
+    std::string realm;
+    bool expected_to_succeed;
+  } challenge_test;
+
+  challenge_test tests[] = {
+    {"foo.com:443", "", false},                 // 0. No realm.
+    {"foo.com:443", "xxx", false},              // 1. Wrong realm.
+    {"foo.com:443", "spdyproxy", false},        // 2. Case matters.
+    {"foo.com:443", "SpdyProxy", true},         // 3. OK.
+    {"foo.com:443", "SpdyProxy1234567", true},  // 4. OK
+    {"bar.com:80", "SpdyProxy1234567", true},   // 5. OK.
+    {"foo.com:443", "SpdyProxyxxx", true},      // 6. OK
+    {"", "SpdyProxy1234567", false},        // 7. No challenger.

[bengr, 2013/10/22 17:49:30]

align

[marq (ping after 24h), 2013/10/22 21:18:01]

Done.

+    {"xxx.net:443", "SpdyProxy1234567", false}, // 8. Wrong host.
+    {"foo.com", "SpdyProxy1234567", false},     // 9. No port.
+    {"foo.com:80", "SpdyProxy1234567", false},  // 10.Wrong port.
+    {"bar.com:81", "SpdyProxy1234567", false},  // 11.Wrong port.
+  };
+
+  for (int i = 0; i <= 11; i++) {
+    scoped_refptr<net::AuthChallengeInfo> auth_info(new net::AuthChallengeInfo);
+    auth_info->challenger = net::HostPortPair::FromString(tests[i].host);
+    auth_info->realm = tests[i].realm;
+    EXPECT_EQ(tests[i].expected_to_succeed,
+              settings_->IsAcceptableAuthChallenge(auth_info.get()));
+  }
+}
+
+// More tests:

[bengr, 2013/10/22 17:49:30]

Why is this comment here?

[marq (ping after 24h), 2013/10/22 21:18:01]

To remind me to write more tests. It's gone now and instead there are more
tests.

I realize that reviewing code that's still in progress isn't ideal.

+// -> test auth cache is populated and responds to challenges
+// -> test GetTokenForAuthChellenge
+
+
 TEST_F(DataReductionProxySettingsTest, TestResetDataReductionStatistics) {
   int64 original_content_length;
   int64 received_content_length;
   int64 last_update_time;
   settings_->ResetDataReductionStatistics();
   settings_->GetContentLengths(spdyproxy::kNumDaysInHistory,
                                &original_content_length,
                                &received_content_length,
                                &last_update_time);
   EXPECT_EQ(0L, original_content_length);
@@ skipping 141 matching lines @@
   };
 
   ASSERT_EQ(settings_->bypass_rules_.size(), 6u);
   int i = 0;
   for (std::vector<std::string>::iterator it = settings_->bypass_rules_.begin();
        it != settings_->bypass_rules_.end(); ++it) {
     EXPECT_EQ(expected[i++], *it);
   }
 }
 
+TEST_F(DataReductionProxySettingsTest, TestAcceptableAuthTokens) {
+  AddProxyToCommandLine();

[bengr, 2013/10/22 17:49:30]

?

[marq (ping after 24h), 2013/10/22 21:18:01]

Now gone.

+}
+