Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(233)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/quic/crypto/proof_verifier_chromium_test.cc

Issue 1458883007: QUIC - minor cleanup of duplicated code in ProofVerifierChromiumTest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ssl_reorg
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/crypto/proof_verifier_chromium_test.cc
diff --git a/net/quic/crypto/proof_verifier_chromium_test.cc b/net/quic/crypto/proof_verifier_chromium_test.cc
index 9a7f0db86ff96bae69ab8436dc63e32781f70b0f..63ce6cfc5eea90b06404f0b8526fa66e4e0ce888 100644
--- a/net/quic/crypto/proof_verifier_chromium_test.cc
+++ b/net/quic/crypto/proof_verifier_chromium_test.cc
@@ -91,107 +91,108 @@ class DummyProofVerifierCallback : public ProofVerifierCallback {
}
};
-scoped_refptr<X509Certificate> GetTestServerCertificate() {
- static const char kTestCert[] = "quic_test.example.com.crt";
- return ImportCertFromFile(GetTestCertsDirectory(), kTestCert);
-}
+const char kTestHostname[] = "test.example.com";
+const char kTestConfig[] = "server config bytes";
-void GetTestCertificates(std::vector<std::string>* certs) {
- scoped_refptr<X509Certificate> cert = GetTestServerCertificate();
- ASSERT_TRUE(cert);
+} // namespace
- std::string der_bytes;
- ASSERT_TRUE(
- X509Certificate::GetDEREncoded(cert->os_cert_handle(), &der_bytes));
+class ProofVerifierChromiumTest : public ::testing::Test {
+ public:
+ ProofVerifierChromiumTest()
+ : verify_context_(new ProofVerifyContextChromium(0 /*cert_verify_flags*/,
+ BoundNetLog())) {}
- certs->clear();
- certs->push_back(der_bytes);
-}
+ void SetUp() override {
+ ASSERT_NO_FATAL_FAILURE(GetTestCertificates(&certs_));
+ }
-std::string GetTestSignature() {
- // Sample known answer test from ProofTest.VerifyRSAKnownAnswerTest.
- // Generated by dumping the bytes of the |signature| output of
- // ProofSource::GetProof().
- static const unsigned char kTestSignature[] = {
- 0x31, 0xd5, 0xfb, 0x40, 0x30, 0x75, 0xd2, 0x7d, 0x61, 0xf9, 0xd7, 0x54,
- 0x30, 0x06, 0xaf, 0x54, 0x0d, 0xb0, 0x0a, 0xda, 0x63, 0xca, 0x7e, 0x9e,
- 0xce, 0xba, 0x10, 0x05, 0x1b, 0xa6, 0x7f, 0xef, 0x2b, 0xa3, 0xff, 0x3c,
- 0xbb, 0x9a, 0xe4, 0xbf, 0xb8, 0x0c, 0xc1, 0xbd, 0xed, 0xc2, 0x90, 0x68,
- 0xeb, 0x45, 0x48, 0xea, 0x3c, 0x95, 0xf8, 0xa2, 0xb9, 0xe7, 0x62, 0x29,
- 0x00, 0xc3, 0x18, 0xb4, 0x16, 0x6f, 0x5e, 0xb0, 0xc1, 0x26, 0xc0, 0x4b,
- 0x84, 0xf5, 0x97, 0xfc, 0x17, 0xf9, 0x1c, 0x43, 0xb8, 0xf2, 0x3f, 0x38,
- 0x32, 0xad, 0x36, 0x52, 0x2c, 0x26, 0x92, 0x7a, 0xea, 0x2c, 0xa2, 0xf4,
- 0x28, 0x2f, 0x19, 0x4d, 0x1f, 0x11, 0x46, 0x82, 0xd0, 0xc4, 0x86, 0x56,
- 0x5c, 0x97, 0x9e, 0xc6, 0x37, 0x8e, 0xaf, 0x9d, 0x69, 0xe9, 0x4f, 0x5a,
- 0x6d, 0x70, 0x75, 0xc7, 0x41, 0x95, 0x68, 0x53, 0x94, 0xca, 0x31, 0x63,
- 0x61, 0x9f, 0xb8, 0x8c, 0x3b, 0x75, 0x36, 0x8b, 0x69, 0xa2, 0x35, 0xc0,
- 0x4b, 0x77, 0x55, 0x08, 0xc2, 0xb4, 0x56, 0xd2, 0x81, 0xce, 0x9e, 0x25,
- 0xdb, 0x50, 0x74, 0xb3, 0x8a, 0xd9, 0x20, 0x42, 0x3f, 0x85, 0x2d, 0xaa,
- 0xfd, 0x66, 0xfa, 0xd6, 0x95, 0x55, 0x6b, 0x63, 0x63, 0x04, 0xf8, 0x6c,
- 0x3e, 0x08, 0x22, 0x39, 0xb9, 0x9a, 0xe0, 0xd7, 0x01, 0xff, 0xeb, 0x8a,
- 0xb9, 0xe2, 0x34, 0xa5, 0xa0, 0x51, 0xe9, 0xbe, 0x15, 0x12, 0xbf, 0xbe,
- 0x64, 0x3d, 0x3f, 0x98, 0xce, 0xc1, 0xa6, 0x33, 0x32, 0xd3, 0x5c, 0xa8,
- 0x39, 0x93, 0xdc, 0x1c, 0xb9, 0xab, 0x3c, 0x80, 0x62, 0xb3, 0x76, 0x21,
- 0xdf, 0x47, 0x1e, 0xa9, 0x0e, 0x5e, 0x8a, 0xbe, 0x66, 0x5b, 0x7c, 0x21,
- 0xfa, 0x78, 0x2d, 0xd1, 0x1d, 0x5c, 0x35, 0x8a, 0x34, 0xb2, 0x1a, 0xc2,
- 0xc4, 0x4b, 0x53, 0x54,
- };
- return std::string(reinterpret_cast<const char*>(kTestSignature),
- sizeof(kTestSignature));
-}
+ scoped_refptr<X509Certificate> GetTestServerCertificate() {
+ static const char kTestCert[] = "quic_test.example.com.crt";
+ return ImportCertFromFile(GetTestCertsDirectory(), kTestCert);
+ }
-const char kTestHostname[] = "test.example.com";
-const char kTestConfig[] = "server config bytes";
+ void GetTestCertificates(std::vector<std::string>* certs) {
+ scoped_refptr<X509Certificate> cert = GetTestServerCertificate();
+ ASSERT_TRUE(cert);
-} // namespace
+ std::string der_bytes;
+ ASSERT_TRUE(
+ X509Certificate::GetDEREncoded(cert->os_cert_handle(), &der_bytes));
+
+ certs->clear();
+ certs->push_back(der_bytes);
+ }
+
+ std::string GetTestSignature() {
+ // Sample known answer test from ProofTest.VerifyRSAKnownAnswerTest.
+ // Generated by dumping the bytes of the |signature| output of
+ // ProofSource::GetProof().
+ static const unsigned char kTestSignature[] = {
+ 0x31, 0xd5, 0xfb, 0x40, 0x30, 0x75, 0xd2, 0x7d, 0x61, 0xf9, 0xd7, 0x54,
+ 0x30, 0x06, 0xaf, 0x54, 0x0d, 0xb0, 0x0a, 0xda, 0x63, 0xca, 0x7e, 0x9e,
+ 0xce, 0xba, 0x10, 0x05, 0x1b, 0xa6, 0x7f, 0xef, 0x2b, 0xa3, 0xff, 0x3c,
+ 0xbb, 0x9a, 0xe4, 0xbf, 0xb8, 0x0c, 0xc1, 0xbd, 0xed, 0xc2, 0x90, 0x68,
+ 0xeb, 0x45, 0x48, 0xea, 0x3c, 0x95, 0xf8, 0xa2, 0xb9, 0xe7, 0x62, 0x29,
+ 0x00, 0xc3, 0x18, 0xb4, 0x16, 0x6f, 0x5e, 0xb0, 0xc1, 0x26, 0xc0, 0x4b,
+ 0x84, 0xf5, 0x97, 0xfc, 0x17, 0xf9, 0x1c, 0x43, 0xb8, 0xf2, 0x3f, 0x38,
+ 0x32, 0xad, 0x36, 0x52, 0x2c, 0x26, 0x92, 0x7a, 0xea, 0x2c, 0xa2, 0xf4,
+ 0x28, 0x2f, 0x19, 0x4d, 0x1f, 0x11, 0x46, 0x82, 0xd0, 0xc4, 0x86, 0x56,
+ 0x5c, 0x97, 0x9e, 0xc6, 0x37, 0x8e, 0xaf, 0x9d, 0x69, 0xe9, 0x4f, 0x5a,
+ 0x6d, 0x70, 0x75, 0xc7, 0x41, 0x95, 0x68, 0x53, 0x94, 0xca, 0x31, 0x63,
+ 0x61, 0x9f, 0xb8, 0x8c, 0x3b, 0x75, 0x36, 0x8b, 0x69, 0xa2, 0x35, 0xc0,
+ 0x4b, 0x77, 0x55, 0x08, 0xc2, 0xb4, 0x56, 0xd2, 0x81, 0xce, 0x9e, 0x25,
+ 0xdb, 0x50, 0x74, 0xb3, 0x8a, 0xd9, 0x20, 0x42, 0x3f, 0x85, 0x2d, 0xaa,
+ 0xfd, 0x66, 0xfa, 0xd6, 0x95, 0x55, 0x6b, 0x63, 0x63, 0x04, 0xf8, 0x6c,
+ 0x3e, 0x08, 0x22, 0x39, 0xb9, 0x9a, 0xe0, 0xd7, 0x01, 0xff, 0xeb, 0x8a,
+ 0xb9, 0xe2, 0x34, 0xa5, 0xa0, 0x51, 0xe9, 0xbe, 0x15, 0x12, 0xbf, 0xbe,
+ 0x64, 0x3d, 0x3f, 0x98, 0xce, 0xc1, 0xa6, 0x33, 0x32, 0xd3, 0x5c, 0xa8,
+ 0x39, 0x93, 0xdc, 0x1c, 0xb9, 0xab, 0x3c, 0x80, 0x62, 0xb3, 0x76, 0x21,
+ 0xdf, 0x47, 0x1e, 0xa9, 0x0e, 0x5e, 0x8a, 0xbe, 0x66, 0x5b, 0x7c, 0x21,
+ 0xfa, 0x78, 0x2d, 0xd1, 0x1d, 0x5c, 0x35, 0x8a, 0x34, 0xb2, 0x1a, 0xc2,
+ 0xc4, 0x4b, 0x53, 0x54,
+ };
+ return std::string(reinterpret_cast<const char*>(kTestSignature),
+ sizeof(kTestSignature));
+ }
+
+ protected:
+ scoped_ptr<ProofVerifyContext> verify_context_;
+ scoped_ptr<ProofVerifyDetails> details_;
+ std::string error_details_;
+ std::vector<std::string> certs_;
+};
// Tests that the ProofVerifier fails verification if certificate
// verification fails.
-TEST(ProofVerifierChromiumTest, FailsIfCertFails) {
+TEST_F(ProofVerifierChromiumTest, FailsIfCertFails) {
MockCertVerifier dummy_verifier;
ProofVerifierChromium proof_verifier(&dummy_verifier, nullptr, nullptr);
- scoped_ptr<ProofVerifyContext> verify_context(
- new ProofVerifyContextChromium(0 /*cert_verify_flags*/, BoundNetLog()));
- scoped_ptr<ProofVerifyDetails> details;
- std::string error_details;
-
- std::vector<std::string> certs;
- ASSERT_NO_FATAL_FAILURE(GetTestCertificates(&certs));
-
DummyProofVerifierCallback* callback = new DummyProofVerifierCallback;
QuicAsyncStatus status = proof_verifier.VerifyProof(
- kTestHostname, kTestConfig, certs, "", GetTestSignature(),
- verify_context.get(), &error_details, &details, callback);
+ kTestHostname, kTestConfig, certs_, "", GetTestSignature(),
+ verify_context_.get(), &error_details_, &details_, callback);
ASSERT_EQ(QUIC_FAILURE, status);
delete callback;
}
// Tests that the ProofVerifier doesn't verify certificates if the config
// signature fails.
-TEST(ProofVerifierChromiumTest, FailsIfSignatureFails) {
+TEST_F(ProofVerifierChromiumTest, FailsIfSignatureFails) {
FailsTestCertVerifier cert_verifier;
ProofVerifierChromium proof_verifier(&cert_verifier, nullptr, nullptr);
- scoped_ptr<ProofVerifyContext> verify_context(
- new ProofVerifyContextChromium(0 /*cert_verify_flags*/, BoundNetLog()));
- scoped_ptr<ProofVerifyDetails> details;
- std::string error_details;
-
- std::vector<std::string> certs;
- ASSERT_NO_FATAL_FAILURE(GetTestCertificates(&certs));
-
DummyProofVerifierCallback* callback = new DummyProofVerifierCallback;
QuicAsyncStatus status = proof_verifier.VerifyProof(
- kTestHostname, kTestConfig, certs, "", kTestConfig, verify_context.get(),
- &error_details, &details, callback);
+ kTestHostname, kTestConfig, certs_, "", kTestConfig,
+ verify_context_.get(), &error_details_, &details_, callback);
ASSERT_EQ(QUIC_FAILURE, status);
delete callback;
}
// Tests that EV certificates are left as EV if there is no certificate
// policy enforcement.
-TEST(ProofVerifierChromiumTest, PreservesEVIfNoPolicy) {
+TEST_F(ProofVerifierChromiumTest, PreservesEVIfNoPolicy) {
scoped_refptr<X509Certificate> test_cert = GetTestServerCertificate();
ASSERT_TRUE(test_cert);
@@ -204,31 +205,23 @@ TEST(ProofVerifierChromiumTest, PreservesEVIfNoPolicy) {
ProofVerifierChromium proof_verifier(&dummy_verifier, nullptr, nullptr);
- scoped_ptr<ProofVerifyContext> verify_context(
- new ProofVerifyContextChromium(0 /*cert_verify_flags*/, BoundNetLog()));
- scoped_ptr<ProofVerifyDetails> details;
- std::string error_details;
-
- std::vector<std::string> certs;
- ASSERT_NO_FATAL_FAILURE(GetTestCertificates(&certs));
-
DummyProofVerifierCallback* callback = new DummyProofVerifierCallback;
QuicAsyncStatus status = proof_verifier.VerifyProof(
- kTestHostname, kTestConfig, certs, "", GetTestSignature(),
- verify_context.get(), &error_details, &details, callback);
+ kTestHostname, kTestConfig, certs_, "", GetTestSignature(),
+ verify_context_.get(), &error_details_, &details_, callback);
ASSERT_EQ(QUIC_SUCCESS, status);
delete callback;
- ASSERT_TRUE(details.get());
+ ASSERT_TRUE(details_.get());
ProofVerifyDetailsChromium* verify_details =
- static_cast<ProofVerifyDetailsChromium*>(details.get());
+ static_cast<ProofVerifyDetailsChromium*>(details_.get());
EXPECT_EQ(dummy_result.cert_status,
verify_details->cert_verify_result.cert_status);
}
// Tests that the certificate policy enforcer is consulted for EV
// and the certificate is allowed to be EV.
-TEST(ProofVerifierChromiumTest, PreservesEVIfAllowed) {
+TEST_F(ProofVerifierChromiumTest, PreservesEVIfAllowed) {
scoped_refptr<X509Certificate> test_cert = GetTestServerCertificate();
ASSERT_TRUE(test_cert);
@@ -244,31 +237,23 @@ TEST(ProofVerifierChromiumTest, PreservesEVIfAllowed) {
ProofVerifierChromium proof_verifier(&dummy_verifier, &policy_enforcer,
nullptr);
- scoped_ptr<ProofVerifyContext> verify_context(
- new ProofVerifyContextChromium(0 /*cert_verify_flags*/, BoundNetLog()));
- scoped_ptr<ProofVerifyDetails> details;
- std::string error_details;
-
- std::vector<std::string> certs;
- ASSERT_NO_FATAL_FAILURE(GetTestCertificates(&certs));
-
DummyProofVerifierCallback* callback = new DummyProofVerifierCallback;
QuicAsyncStatus status = proof_verifier.VerifyProof(
- kTestHostname, kTestConfig, certs, "", GetTestSignature(),
- verify_context.get(), &error_details, &details, callback);
+ kTestHostname, kTestConfig, certs_, "", GetTestSignature(),
+ verify_context_.get(), &error_details_, &details_, callback);
ASSERT_EQ(QUIC_SUCCESS, status);
delete callback;
- ASSERT_TRUE(details.get());
+ ASSERT_TRUE(details_.get());
ProofVerifyDetailsChromium* verify_details =
- static_cast<ProofVerifyDetailsChromium*>(details.get());
+ static_cast<ProofVerifyDetailsChromium*>(details_.get());
EXPECT_EQ(dummy_result.cert_status,
verify_details->cert_verify_result.cert_status);
}
// Tests that the certificate policy enforcer is consulted for EV
// and the certificate is not allowed to be EV.
-TEST(ProofVerifierChromiumTest, StripsEVIfNotAllowed) {
+TEST_F(ProofVerifierChromiumTest, StripsEVIfNotAllowed) {
scoped_refptr<X509Certificate> test_cert = GetTestServerCertificate();
ASSERT_TRUE(test_cert);
@@ -284,24 +269,16 @@ TEST(ProofVerifierChromiumTest, StripsEVIfNotAllowed) {
ProofVerifierChromium proof_verifier(&dummy_verifier, &policy_enforcer,
nullptr);
- scoped_ptr<ProofVerifyContext> verify_context(
- new ProofVerifyContextChromium(0 /*cert_verify_flags*/, BoundNetLog()));
- scoped_ptr<ProofVerifyDetails> details;
- std::string error_details;
-
- std::vector<std::string> certs;
- ASSERT_NO_FATAL_FAILURE(GetTestCertificates(&certs));
-
DummyProofVerifierCallback* callback = new DummyProofVerifierCallback;
QuicAsyncStatus status = proof_verifier.VerifyProof(
- kTestHostname, kTestConfig, certs, "", GetTestSignature(),
- verify_context.get(), &error_details, &details, callback);
+ kTestHostname, kTestConfig, certs_, "", GetTestSignature(),
+ verify_context_.get(), &error_details_, &details_, callback);
ASSERT_EQ(QUIC_SUCCESS, status);
delete callback;
- ASSERT_TRUE(details.get());
+ ASSERT_TRUE(details_.get());
ProofVerifyDetailsChromium* verify_details =
- static_cast<ProofVerifyDetailsChromium*>(details.get());
+ static_cast<ProofVerifyDetailsChromium*>(details_.get());
EXPECT_EQ(CERT_STATUS_CT_COMPLIANCE_FAILED,
verify_details->cert_verify_result.cert_status &
(CERT_STATUS_CT_COMPLIANCE_FAILED | CERT_STATUS_IS_EV));
@@ -309,7 +286,7 @@ TEST(ProofVerifierChromiumTest, StripsEVIfNotAllowed) {
// Tests that the certificate policy enforcer is not consulted if
// the certificate is not EV.
-TEST(ProofVerifierChromiumTest, IgnoresPolicyEnforcerIfNotEV) {
+TEST_F(ProofVerifierChromiumTest, IgnoresPolicyEnforcerIfNotEV) {
scoped_refptr<X509Certificate> test_cert = GetTestServerCertificate();
ASSERT_TRUE(test_cert);
@@ -325,24 +302,16 @@ TEST(ProofVerifierChromiumTest, IgnoresPolicyEnforcerIfNotEV) {
ProofVerifierChromium proof_verifier(&dummy_verifier, &policy_enforcer,
nullptr);
- scoped_ptr<ProofVerifyContext> verify_context(
- new ProofVerifyContextChromium(0 /*cert_verify_flags*/, BoundNetLog()));
- scoped_ptr<ProofVerifyDetails> details;
- std::string error_details;
-
- std::vector<std::string> certs;
- ASSERT_NO_FATAL_FAILURE(GetTestCertificates(&certs));
-
DummyProofVerifierCallback* callback = new DummyProofVerifierCallback;
QuicAsyncStatus status = proof_verifier.VerifyProof(
- kTestHostname, kTestConfig, certs, "", GetTestSignature(),
- verify_context.get(), &error_details, &details, callback);
+ kTestHostname, kTestConfig, certs_, "", GetTestSignature(),
+ verify_context_.get(), &error_details_, &details_, callback);
ASSERT_EQ(QUIC_SUCCESS, status);
delete callback;
- ASSERT_TRUE(details.get());
+ ASSERT_TRUE(details_.get());
ProofVerifyDetailsChromium* verify_details =
- static_cast<ProofVerifyDetailsChromium*>(details.get());
+ static_cast<ProofVerifyDetailsChromium*>(details_.get());
EXPECT_EQ(0u, verify_details->cert_verify_result.cert_status);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698