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

Unified Diff: net/test/spawned_test_server/base_test_server.cc

Issue 1270043004: Add URLRequest unit tests for HPKP violation reports (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: GetLocalCertificatesDir() Created 5 years, 4 months 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 | « net/test/spawned_test_server/base_test_server.h ('k') | net/url_request/url_request_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/test/spawned_test_server/base_test_server.cc
diff --git a/net/test/spawned_test_server/base_test_server.cc b/net/test/spawned_test_server/base_test_server.cc
index bff9babefac4fd19b3fa9ac547088f1a6fbdd817..59a274954244c2b6d21e7619a72123dcd2df7041 100644
--- a/net/test/spawned_test_server/base_test_server.cc
+++ b/net/test/spawned_test_server/base_test_server.cc
@@ -19,6 +19,7 @@
#include "net/base/port_util.h"
#include "net/base/test_completion_callback.h"
#include "net/cert/test_root_certs.h"
+#include "net/cert/x509_certificate.h"
#include "net/dns/host_resolver.h"
#include "net/log/net_log.h"
#include "url/gurl.h"
@@ -95,6 +96,21 @@ base::StringValue* GetTLSIntoleranceType(
}
}
+bool GetLocalCertificatesDir(const base::FilePath& certificates_dir,
+ base::FilePath* local_certificates_dir) {
+ if (certificates_dir.IsAbsolute()) {
+ *local_certificates_dir = certificates_dir;
+ return true;
+ }
+
+ base::FilePath src_dir;
+ if (!PathService::Get(base::DIR_SOURCE_ROOT, &src_dir))
+ return false;
+
+ *local_certificates_dir = src_dir.Append(certificates_dir);
+ return true;
+}
+
} // namespace
BaseTestServer::SSLOptions::SSLOptions()
@@ -323,18 +339,38 @@ bool BaseTestServer::LoadTestRootCert() const {
return false;
// Should always use absolute path to load the root certificate.
- base::FilePath root_certificate_path = certificates_dir_;
- if (!certificates_dir_.IsAbsolute()) {
- base::FilePath src_dir;
- if (!PathService::Get(base::DIR_SOURCE_ROOT, &src_dir))
- return false;
- root_certificate_path = src_dir.Append(certificates_dir_);
- }
+ base::FilePath root_certificate_path;
+ if (!GetLocalCertificatesDir(certificates_dir_, &root_certificate_path))
+ return false;
return root_certs->AddFromFile(
root_certificate_path.AppendASCII("root_ca_cert.pem"));
}
+scoped_refptr<X509Certificate> BaseTestServer::GetCertificate() const {
+ base::FilePath certificate_path;
+ if (!GetLocalCertificatesDir(certificates_dir_, &certificate_path))
+ return nullptr;
+
+ base::FilePath certificate_file(ssl_options_.GetCertificateFile());
+ if (certificate_file.value().empty())
+ return nullptr;
+
+ certificate_path = certificate_path.Append(certificate_file);
+
+ std::string cert_data;
+ if (!base::ReadFileToString(certificate_path, &cert_data))
+ return nullptr;
+
+ CertificateList certs_in_file =
+ X509Certificate::CreateCertificateListFromBytes(
+ cert_data.data(), cert_data.size(),
+ X509Certificate::FORMAT_PEM_CERT_SEQUENCE);
+ if (certs_in_file.empty())
+ return nullptr;
+ return certs_in_file[0];
+}
+
void BaseTestServer::Init(const std::string& host) {
host_port_pair_ = HostPortPair(host, 0);
« no previous file with comments | « net/test/spawned_test_server/base_test_server.h ('k') | net/url_request/url_request_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698