Add server certificate request parameters to be stored in SSLCertRequestInfo.

net/socket/ssl_client_socket_unittest.cc

Index: net/socket/ssl_client_socket_unittest.cc
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
index fb658474fe25a8c29cfe9f77e515a87ff07cd8c7..3e7f9b2faeb9c6128faac465a14cc3a849952b40 100644
--- a/net/socket/ssl_client_socket_unittest.cc
+++ b/net/socket/ssl_client_socket_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "net/socket/ssl_client_socket.h"
 
+#include "base/memory/ref_counted.h"
 #include "net/base/address_list.h"
 #include "net/base/cert_test_util.h"
 #include "net/base/host_resolver.h"
@@ -12,6 +13,7 @@
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/base/net_log_unittest.h"
+#include "net/base/ssl_cert_request_info.h"
 #include "net/base/ssl_config_service.h"
 #include "net/base/test_completion_callback.h"
 #include "net/base/test_data_directory.h"
@@ -936,3 +938,109 @@ TEST_F(SSLClientSocketTest, VerifyReturnChainProperlyOrdered) {
   EXPECT_FALSE(sock->IsConnected());
 }
 
+// Verifies the correctness of GetSSLCertRequestInfo.
+class SSLClientSocketCertRequestInfoTest : public SSLClientSocketTest {
+ protected:
+  // Creates a test server with the given SSLOptions, connects to it and returns
+  // the SSLCertRequestInfo reported by the socket.
+  scoped_refptr<net::SSLCertRequestInfo>
+      GetCertRequest(net::TestServer::SSLOptions ssl_options) {

[Ryan Sleevi, 2013/01/07 18:37:58]

Indent: For overly long function names, we don't indent the wrap like this

ReturnType
SomeFunction(SomeVariables) {
}

[ppi, 2013/01/08 17:00:38]

Fixed, thanks!

+    net::TestServer test_server(net::TestServer::TYPE_HTTPS,
+                                ssl_options,
+                                FilePath());
+    EXPECT_TRUE(test_server.Start());

[Ryan Sleevi, 2013/01/07 18:37:58]

ASSERT_TRUE

[ppi, 2013/01/08 17:00:38]

We cannot use hard assertions in non-void returning functions
(http://code.google.com/p/googletest/wiki/AdvancedGuide#Assertion_Placement -
despite the first sentence of the paragraph). I have made the function return
NULL whenever server setup fails in patch set 4. I feel it might be better than
obscuring the interface by adding scoped_refptr<...>* argument. What do you
think?

+
+    net::AddressList addr;
+    EXPECT_TRUE(test_server.GetAddressList(&addr));

[Ryan Sleevi, 2013/01/07 18:37:58]

ASSERT_TRUE

+
+    net::TestCompletionCallback callback;
+    net::CapturingNetLog log;
+    net::StreamSocket* transport = new net::TCPClientSocket(
+        addr, &log, net::NetLog::Source());
+    int rv = transport->Connect(callback.callback());
+    if (rv == net::ERR_IO_PENDING)
+      rv = callback.WaitForResult();
+    EXPECT_EQ(net::OK, rv);
+
+    net::SSLConfig ssl_config = kDefaultSSLConfig;
+    scoped_ptr<net::SSLClientSocket> sock(
+        CreateSSLClientSocket(
+            transport, test_server.host_port_pair(), ssl_config));

[Ryan Sleevi, 2013/01/07 18:37:58]

1) You don't modify ssl_config, so why create the temporary?
2) super minor pedantry - the indent style for this function is inconsistent
with all the other unit tests

[ppi, 2013/01/08 17:00:38]

Thanks, fixed both in patch set 4.

+    EXPECT_FALSE(sock->IsConnected());
+
+    rv = sock->Connect(callback.callback());
+    if (rv == net::ERR_IO_PENDING)
+      rv = callback.WaitForResult();
+    scoped_refptr<net::SSLCertRequestInfo> requestInfo =

[Ryan Sleevi, 2013/01/07 18:37:58]

style: naming: requestInfo -> request_info

[ppi, 2013/01/08 17:00:38]

Thanks, sorry about that!

+        new net::SSLCertRequestInfo();
+    sock->GetSSLCertRequestInfo(requestInfo.get());
+    sock->Disconnect();
+    EXPECT_FALSE(sock->IsConnected());
+
+    return requestInfo;
+  }
+
+  // The following is needed to construct paths to certificates passed as
+  // |client_authorities| in server SSLOptions. Current implementation of
+  // RemoteTestServer (used on Android) expects relative paths, as opposed to
+  // LocalTestServer, which expects absolute paths (what to fix?).
+  FilePath CertDirectory() {
+#ifdef OS_ANDROID
+    return net::GetTestCertsDirectoryRelative();
+#else
+    return net::GetTestCertsDirectory();
+#endif

[Ryan Sleevi, 2013/01/07 18:37:58]

design: This sort of dependency on the implementation of TestServer is something
better expressed in the TestServer interface.

It seems like we should just make client_authorities always expect paths
relative to DIR_SOURCE, so that callers on all platforms can use
GetTestCertsDirectoryRelative(..)

[ppi, 2013/01/08 17:00:38]

I agree - I can see no reasons for LocalTestServer and RemoteTestServer to
implement the common interface differently. I would prefer to address this in a
separate CL though, as I am not sure how big/deep the necessary work will be -
would that be ok with you?

+  }
+};
+
+TEST_F(SSLClientSocketCertRequestInfoTest, NoAuthorities) {
+  net::TestServer::SSLOptions ssl_options;
+  ssl_options.request_client_certificate = true;
+  scoped_refptr<net::SSLCertRequestInfo> requestInfo =

[Ryan Sleevi, 2013/01/07 18:37:58]

style: requestInfo -> request_info

[ppi, 2013/01/08 17:00:38]

Thanks, sorry about that!

+      GetCertRequest(ssl_options);
+  EXPECT_EQ(0, static_cast<int>(requestInfo->cert_authorities.size()));

[Ryan Sleevi, 2013/01/07 18:37:58]

nit: 
EXPECT_EQ(0u, request_info->cert_authorities.size())

[ppi, 2013/01/08 17:00:38]

Thanks, done!

+}
+
+TEST_F(SSLClientSocketCertRequestInfoTest, TwoAuthorities) {
+  const FilePath::CharType kThawteFile[] =
+      FILE_PATH_LITERAL("thawte.single.pem");
+  const unsigned char kThawteDN[] = {
+    0x30, 0x4c, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
+    0x02, 0x5a, 0x41, 0x31, 0x25, 0x30, 0x23, 0x06, 0x03, 0x55, 0x04, 0x0a,
+    0x13, 0x1c, 0x54, 0x68, 0x61, 0x77, 0x74, 0x65, 0x20, 0x43, 0x6f, 0x6e,
+    0x73, 0x75, 0x6c, 0x74, 0x69, 0x6e, 0x67, 0x20, 0x28, 0x50, 0x74, 0x79,
+    0x29, 0x20, 0x4c, 0x74, 0x64, 0x2e, 0x31, 0x16, 0x30, 0x14, 0x06, 0x03,
+    0x55, 0x04, 0x03, 0x13, 0x0d, 0x54, 0x68, 0x61, 0x77, 0x74, 0x65, 0x20,
+    0x53, 0x47, 0x43, 0x20, 0x43, 0x41
+  };
+  const size_t kThawteLen = 78;

[Ryan Sleevi, 2013/01/07 18:37:58]

NACK:
const size_t kThawteLen = sizeof(kThawteDN)

Do not hardcode sizes. The same on line 1031

[ppi, 2013/01/08 17:00:38]

Thanks, done!

+
+  const FilePath::CharType kDiginotarFile[] =
+      FILE_PATH_LITERAL("diginotar_root_ca.pem");
+  const unsigned char kDiginotarDN[] = {
+    0x30, 0x5f, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
+    0x02, 0x4e, 0x4c, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0a,
+    0x13, 0x09, 0x44, 0x69, 0x67, 0x69, 0x4e, 0x6f, 0x74, 0x61, 0x72, 0x31,
+    0x1a, 0x30, 0x18, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x11, 0x44, 0x69,
+    0x67, 0x69, 0x4e, 0x6f, 0x74, 0x61, 0x72, 0x20, 0x52, 0x6f, 0x6f, 0x74,
+    0x20, 0x43, 0x41, 0x31, 0x20, 0x30, 0x1e, 0x06, 0x09, 0x2a, 0x86, 0x48,
+    0x86, 0xf7, 0x0d, 0x01, 0x09, 0x01, 0x16, 0x11, 0x69, 0x6e, 0x66, 0x6f,
+    0x40, 0x64, 0x69, 0x67, 0x69, 0x6e, 0x6f, 0x74, 0x61, 0x72, 0x2e, 0x6e,
+    0x6c
+  };
+  const size_t kDiginotarLen = 97;
+
+  net::TestServer::SSLOptions ssl_options;
+  ssl_options.request_client_certificate = true;
+  ssl_options.client_authorities.push_back(CertDirectory().Append(kThawteFile));
+  ssl_options.client_authorities.push_back(
+      CertDirectory().Append(kDiginotarFile));
+  scoped_refptr<net::SSLCertRequestInfo> requestInfo =
+      GetCertRequest(ssl_options);
+  EXPECT_EQ(2, static_cast<int>(requestInfo->cert_authorities.size()));

[Ryan Sleevi, 2013/01/07 18:37:58]

ASSERT_EQ, since you're about to de-reference.

[ppi, 2013/01/08 17:00:38]

Thanks, done!

+  EXPECT_EQ(std::string(reinterpret_cast<const char*>(kThawteDN), kThawteLen),

[digit1, 2013/01/07 11:24:10]

I'd suggest using EXPECT_STREQ() instead, which will pretty-print the content of
strings in case of error. Same for line 1043 below.

[ppi, 2013/01/07 18:18:48]

I think that would cause troubles whenever the string contains nulls, since the
assertion requires C-style strings.

[Ryan Sleevi, 2013/01/07 18:37:58]

Since the data here is binary, even using the std::string overload of EXPECT_EQ
will lead to meaningless output on the console.

EXPECT_EQ(0, request_info->cert_authorities[0].compare(0, reinterpret_cast<const
char*>(kThawteDN), kThawteLen);

[ppi, 2013/01/08 17:00:38]

The ASCII content of DN fields is readable in the console output - this was
useful to me when I was writing/debugging the patch (in my first draft I have
mistaken cert Issuer with Subject when extracting the test data and knew
immediately what's wrong after seeing the console output). Do you think it can
stay this way?

+            requestInfo->cert_authorities[0]);
+  EXPECT_EQ(
+      std::string(reinterpret_cast<const char*>(kDiginotarDN), kDiginotarLen),
+      requestInfo->cert_authorities[1]);
+}