Add end to end client cert auth test for wss

net/test/base_test_server.cc

 // Copyright (c) 2012 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 "net/test/base_test_server.h"
 
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 321 matching lines @@
 bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const {
   DCHECK(arguments);
 
   arguments->SetString("host", host_port_pair_.host());
   arguments->SetInteger("port", host_port_pair_.port());
   arguments->SetString("data-dir", document_root_.value());
 
   if (VLOG_IS_ON(1) || log_to_console_)
     arguments->Set("log-to-console", base::Value::CreateNullValue());
 
-  if (type_ == TYPE_HTTPS) {
-    arguments->Set("https", base::Value::CreateNullValue());
-
+  if (UsingSSL(type_)) {
     // Check the certificate arguments of the HTTPS server.
     FilePath certificate_path(certificates_dir_);
     FilePath certificate_file(ssl_options_.GetCertificateFile());
     if (!certificate_file.value().empty()) {
       certificate_path = certificate_path.Append(certificate_file);
       if (certificate_path.IsAbsolute() &&
           !file_util::PathExists(certificate_path)) {
         LOG(ERROR) << "Certificate path " << certificate_path.value()
                    << " doesn't exist. Can't launch https server.";
         return false;
       }
       arguments->SetString("cert-and-key-file", certificate_path.value());
     }
 
-    std::string ocsp_arg = ssl_options_.GetOCSPArgument();
-    if (!ocsp_arg.empty())
-      arguments->SetString("ocsp", ocsp_arg);
-
     // Check the client certificate related arguments.
     if (ssl_options_.request_client_certificate)
       arguments->Set("ssl-client-auth", base::Value::CreateNullValue());
     scoped_ptr<base::ListValue> ssl_client_certs(new base::ListValue());
 
     std::vector<FilePath>::const_iterator it;
     for (it = ssl_options_.client_authorities.begin();
          it != ssl_options_.client_authorities.end(); ++it) {
       if (it->IsAbsolute() && !file_util::PathExists(*it)) {
         LOG(ERROR) << "Client authority path " << it->value()
                    << " doesn't exist. Can't launch https server.";
         return false;
       }
       ssl_client_certs->Append(base::Value::CreateStringValue(it->value()));
     }
 
     if (ssl_client_certs->GetSize())
       arguments->Set("ssl-client-ca", ssl_client_certs.release());
+  }
+
+  if (type_ == TYPE_HTTPS) {

[Ryan Sleevi, 2012/10/15 17:04:52]

Seems you have duplicated this change on other CLs. Seems like those should land
first?

[Takashi Toyoshima, 2012/10/16 08:23:10]

OK, I split changes on testserver.py and base_test_server.cc to another CL.

+    arguments->Set("https", base::Value::CreateNullValue());
+
+    std::string ocsp_arg = ssl_options_.GetOCSPArgument();
+    if (!ocsp_arg.empty())
+      arguments->SetString("ocsp", ocsp_arg);
 
     // Check bulk cipher argument.
     scoped_ptr<base::ListValue> bulk_cipher_values(new base::ListValue());
     GetCiphersList(ssl_options_.bulk_ciphers, bulk_cipher_values.get());
     if (bulk_cipher_values->GetSize())
       arguments->Set("ssl-bulk-cipher", bulk_cipher_values.release());
     if (ssl_options_.record_resume)
       arguments->Set("https-record-resume", base::Value::CreateNullValue());
     if (ssl_options_.tls_intolerant != SSLOptions::TLS_INTOLERANT_NONE) {
       arguments->Set("tls-intolerant",
           base::Value::CreateIntegerValue(ssl_options_.tls_intolerant));
     }
   }
   return true;
 }
 
 }  // namespace net