From ba390859a2f5b21510b8808915d57afe22317a75 Mon Sep 17 00:00:00 2001 From: Kunihiko Sakamoto Date: Wed, 11 Jul 2018 01:08:55 +0000 Subject: [PATCH] Rename content/test/data/htxg to content/test/data/sxg Bug: 856530 Change-Id: I8da043903712003379603b443ad2c584ebc1c244 Reviewed-on: https://chromium-review.googlesource.com/1131022 Reviewed-by: Kinuko Yasuda Commit-Queue: Kunihiko Sakamoto Cr-Commit-Position: refs/heads/master@{#574024} --- WATCHLISTS | 2 +- ...ned_exchange_certificate_chain_unittest.cc | 2 +- .../signed_exchange_envelope_unittest.cc | 8 +++--- .../signed_exchange_handler_unittest.cc | 4 +-- ...ed_exchange_request_handler_browsertest.cc | 26 +++++++++--------- ...ed_exchange_signature_verifier_unittest.cc | 6 ++-- .../test/data/{htxg => sxg}/.gitattributes | 0 .../{htxg => sxg}/127.0.0.1.public.pem.cbor | Bin content/test/data/{htxg => sxg}/404.msg | 0 .../{htxg => sxg}/404.msg.mock-http-headers | 0 content/test/data/{htxg => sxg}/README | 0 content/test/data/{htxg => sxg}/hello.txt | 0 .../prime256v1-sha256-noext.public.pem | 0 .../data/{htxg => sxg}/prime256v1-sha256.csr | 0 .../prime256v1-sha256.public.pem | 0 .../test/data/{htxg => sxg}/prime256v1.key | 0 .../data/{htxg => sxg}/secp384r1-sha256.csr | 0 .../{htxg => sxg}/secp384r1-sha256.public.pem | 0 content/test/data/{htxg => sxg}/secp384r1.key | 0 .../test.example.com_invalid_test.htxg | Bin ...le.com_invalid_test.htxg.mock-http-headers | 0 .../test.example.org-noext.public.pem.cbor | Bin .../test.example.org.public.pem.cbor | Bin ...mple.org.public.pem.cbor.mock-http-headers | 0 .../test.example.org_hello.txt.htxg | Bin .../test.example.org_noext_test.htxg | Bin .../{htxg => sxg}/test.example.org_test.htxg | Bin ...st.example.org_test.htxg.mock-http-headers | 0 ...example.org_test_invalid_content_type.htxg | Bin ...nvalid_content_type.htxg.mock-http-headers | 0 content/test/data/{htxg => sxg}/test.html | 0 content/test/data/{htxg => sxg}/x509.ext | 0 content/test/fuzzer/BUILD.gn | 2 +- 33 files changed, 25 insertions(+), 25 deletions(-) rename content/test/data/{htxg => sxg}/.gitattributes (100%) rename content/test/data/{htxg => sxg}/127.0.0.1.public.pem.cbor (100%) rename content/test/data/{htxg => sxg}/404.msg (100%) rename content/test/data/{htxg => sxg}/404.msg.mock-http-headers (100%) rename content/test/data/{htxg => sxg}/README (100%) rename content/test/data/{htxg => sxg}/hello.txt (100%) rename content/test/data/{htxg => sxg}/prime256v1-sha256-noext.public.pem (100%) rename content/test/data/{htxg => sxg}/prime256v1-sha256.csr (100%) rename content/test/data/{htxg => sxg}/prime256v1-sha256.public.pem (100%) rename content/test/data/{htxg => sxg}/prime256v1.key (100%) rename content/test/data/{htxg => sxg}/secp384r1-sha256.csr (100%) rename content/test/data/{htxg => sxg}/secp384r1-sha256.public.pem (100%) rename content/test/data/{htxg => sxg}/secp384r1.key (100%) rename content/test/data/{htxg => sxg}/test.example.com_invalid_test.htxg (100%) rename content/test/data/{htxg => sxg}/test.example.com_invalid_test.htxg.mock-http-headers (100%) rename content/test/data/{htxg => sxg}/test.example.org-noext.public.pem.cbor (100%) rename content/test/data/{htxg => sxg}/test.example.org.public.pem.cbor (100%) rename content/test/data/{htxg => sxg}/test.example.org.public.pem.cbor.mock-http-headers (100%) rename content/test/data/{htxg => sxg}/test.example.org_hello.txt.htxg (100%) rename content/test/data/{htxg => sxg}/test.example.org_noext_test.htxg (100%) rename content/test/data/{htxg => sxg}/test.example.org_test.htxg (100%) rename content/test/data/{htxg => sxg}/test.example.org_test.htxg.mock-http-headers (100%) rename content/test/data/{htxg => sxg}/test.example.org_test_invalid_content_type.htxg (100%) rename content/test/data/{htxg => sxg}/test.example.org_test_invalid_content_type.htxg.mock-http-headers (100%) rename content/test/data/{htxg => sxg}/test.html (100%) rename content/test/data/{htxg => sxg}/x509.ext (100%) diff --git a/WATCHLISTS b/WATCHLISTS index 7991166b0dd87a..e984014e6a900c 100644 --- a/WATCHLISTS +++ b/WATCHLISTS @@ -1608,7 +1608,7 @@ 'web_package': { 'filepath': 'content/browser/loader/prefetch_url_loader'\ '|content/browser/web_package/'\ - '|content/test/data/htxg/' + '|content/test/data/sxg/' }, 'web_share': { 'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/webshare/'\ diff --git a/content/browser/web_package/signed_exchange_certificate_chain_unittest.cc b/content/browser/web_package/signed_exchange_certificate_chain_unittest.cc index 1854c7b90cdddb..6389105c3a0953 100644 --- a/content/browser/web_package/signed_exchange_certificate_chain_unittest.cc +++ b/content/browser/web_package/signed_exchange_certificate_chain_unittest.cc @@ -196,7 +196,7 @@ TEST(SignedExchangeCertificateParseB1Test, ParseGoldenFile) { base::FilePath path; base::PathService::Get(content::DIR_TEST_DATA, &path); path = - path.AppendASCII("htxg").AppendASCII("test.example.org.public.pem.cbor"); + path.AppendASCII("sxg").AppendASCII("test.example.org.public.pem.cbor"); std::string contents; ASSERT_TRUE(base::ReadFileToString(path, &contents)); diff --git a/content/browser/web_package/signed_exchange_envelope_unittest.cc b/content/browser/web_package/signed_exchange_envelope_unittest.cc index a3e1abad845502..16cfc3baa86fdb 100644 --- a/content/browser/web_package/signed_exchange_envelope_unittest.cc +++ b/content/browser/web_package/signed_exchange_envelope_unittest.cc @@ -57,13 +57,13 @@ base::Optional GenerateHeaderAndParse( } // namespace TEST(SignedExchangeEnvelopeTest, ParseGoldenFile) { - base::FilePath test_htxg_path; - base::PathService::Get(content::DIR_TEST_DATA, &test_htxg_path); - test_htxg_path = test_htxg_path.AppendASCII("htxg").AppendASCII( + base::FilePath test_sxg_path; + base::PathService::Get(content::DIR_TEST_DATA, &test_sxg_path); + test_sxg_path = test_sxg_path.AppendASCII("sxg").AppendASCII( "test.example.org_test.htxg"); std::string contents; - ASSERT_TRUE(base::ReadFileToString(test_htxg_path, &contents)); + ASSERT_TRUE(base::ReadFileToString(test_sxg_path, &contents)); auto* contents_bytes = reinterpret_cast(contents.data()); ASSERT_GT(contents.size(), SignedExchangePrologue::kEncodedPrologueInBytes); diff --git a/content/browser/web_package/signed_exchange_handler_unittest.cc b/content/browser/web_package/signed_exchange_handler_unittest.cc index 94b7c3cf68f159..56f6f91e745b77 100644 --- a/content/browser/web_package/signed_exchange_handler_unittest.cc +++ b/content/browser/web_package/signed_exchange_handler_unittest.cc @@ -53,7 +53,7 @@ constexpr base::StringPiece kDummySCTList = "SCT"; std::string GetTestFileContents(base::StringPiece name) { base::FilePath path; base::PathService::Get(content::DIR_TEST_DATA, &path); - path = path.AppendASCII("htxg").AppendASCII(name); + path = path.AppendASCII("sxg").AppendASCII(name); std::string contents; CHECK(base::ReadFileToString(path, &contents)); @@ -64,7 +64,7 @@ scoped_refptr LoadCertificate( const std::string& cert_file) { base::FilePath dir_path; base::PathService::Get(content::DIR_TEST_DATA, &dir_path); - dir_path = dir_path.AppendASCII("htxg"); + dir_path = dir_path.AppendASCII("sxg"); base::ScopedAllowBlockingForTesting allow_io; return net::CreateCertificateChainFromFile( diff --git a/content/browser/web_package/signed_exchange_request_handler_browsertest.cc b/content/browser/web_package/signed_exchange_request_handler_browsertest.cc index c3a485b6b92b6e..a191269c679645 100644 --- a/content/browser/web_package/signed_exchange_request_handler_browsertest.cc +++ b/content/browser/web_package/signed_exchange_request_handler_browsertest.cc @@ -109,7 +109,7 @@ class SignedExchangeRequestHandlerBrowserTest : public ContentBrowserTest { base::ScopedAllowBlockingForTesting allow_io; base::FilePath dir_path; base::PathService::Get(content::DIR_TEST_DATA, &dir_path); - dir_path = dir_path.AppendASCII("htxg"); + dir_path = dir_path.AppendASCII("sxg"); return net::CreateCertificateChainFromFile( dir_path, cert_file, net::X509Certificate::FORMAT_PEM_CERT_SEQUENCE); @@ -172,7 +172,7 @@ class SignedExchangeRequestHandlerWithNetworkServiceBrowserTest IN_PROC_BROWSER_TEST_F(SignedExchangeRequestHandlerBrowserTest, Simple) { InstallUrlInterceptor( GURL("https://cert.example.org/cert.msg"), - "content/test/data/htxg/test.example.org.public.pem.cbor"); + "content/test/data/sxg/test.example.org.public.pem.cbor"); // Make the MockCertVerifier treat the certificate // "prime256v1-sha256.public.pem" as valid for "test.example.org". @@ -188,7 +188,7 @@ IN_PROC_BROWSER_TEST_F(SignedExchangeRequestHandlerBrowserTest, Simple) { embedded_test_server()->RegisterRequestMonitor( base::BindRepeating([](const net::test_server::HttpRequest& request) { - if (request.relative_url == "/htxg/test.example.org_test.htxg") { + if (request.relative_url == "/sxg/test.example.org_test.htxg") { const auto& accept_value = request.headers.find("accept")->second; EXPECT_THAT(accept_value, ::testing::HasSubstr("application/signed-exchange;v=b1")); @@ -196,7 +196,7 @@ IN_PROC_BROWSER_TEST_F(SignedExchangeRequestHandlerBrowserTest, Simple) { })); embedded_test_server()->ServeFilesFromSourceDirectory("content/test/data"); ASSERT_TRUE(embedded_test_server()->Start()); - GURL url = embedded_test_server()->GetURL("/htxg/test.example.org_test.htxg"); + GURL url = embedded_test_server()->GetURL("/sxg/test.example.org_test.htxg"); base::string16 title = base::ASCIIToUTF16("https://test.example.org/test/"); TitleWatcher title_watcher(shell()->web_contents(), title); NavigateToURL(shell(), url); @@ -225,7 +225,7 @@ IN_PROC_BROWSER_TEST_F(SignedExchangeRequestHandlerBrowserTest, InvalidContentType) { InstallUrlInterceptor( GURL("https://cert.example.org/cert.msg"), - "content/test/data/htxg/test.example.org.public.pem.cbor"); + "content/test/data/sxg/test.example.org.public.pem.cbor"); // Make the MockCertVerifier treat the certificate // "prime256v1-sha256.public.pem" as valid for "test.example.org". @@ -242,7 +242,7 @@ IN_PROC_BROWSER_TEST_F(SignedExchangeRequestHandlerBrowserTest, embedded_test_server()->ServeFilesFromSourceDirectory("content/test/data"); ASSERT_TRUE(embedded_test_server()->Start()); GURL url = embedded_test_server()->GetURL( - "/htxg/test.example.org_test_invalid_content_type.htxg"); + "/sxg/test.example.org_test_invalid_content_type.htxg"); NavigationFailureObserver failure_observer(shell()->web_contents()); NavigateToURL(shell(), url); @@ -254,11 +254,11 @@ IN_PROC_BROWSER_TEST_F(SignedExchangeRequestHandlerBrowserTest, IN_PROC_BROWSER_TEST_F(SignedExchangeRequestHandlerBrowserTest, CertNotFound) { InstallUrlInterceptor(GURL("https://cert.example.org/cert.msg"), - "content/test/data/htxg/404.msg"); + "content/test/data/sxg/404.msg"); embedded_test_server()->ServeFilesFromSourceDirectory("content/test/data"); ASSERT_TRUE(embedded_test_server()->Start()); - GURL url = embedded_test_server()->GetURL("/htxg/test.example.org_test.htxg"); + GURL url = embedded_test_server()->GetURL("/sxg/test.example.org_test.htxg"); NavigationFailureObserver failure_observer(shell()->web_contents()); NavigateToURL(shell(), url); @@ -273,7 +273,7 @@ IN_PROC_BROWSER_TEST_F( NetworkServiceEnabled) { InstallUrlInterceptor( GURL("https://test.example.org/cert.msg"), - "content/test/data/htxg/test.example.org.public.pem.cbor"); + "content/test/data/sxg/test.example.org.public.pem.cbor"); // Make the MockCertVerifier treat the certificate // "prime256v1-sha256.public.pem" as valid for "test.example.org". @@ -289,7 +289,7 @@ IN_PROC_BROWSER_TEST_F( embedded_test_server()->ServeFilesFromSourceDirectory("content/test/data"); ASSERT_TRUE(embedded_test_server()->Start()); - GURL url = embedded_test_server()->GetURL("/htxg/test.example.org_test.htxg"); + GURL url = embedded_test_server()->GetURL("/sxg/test.example.org_test.htxg"); NavigationFailureObserver failure_observer(shell()->web_contents()); NavigateToURL(shell(), url); @@ -303,14 +303,14 @@ IN_PROC_BROWSER_TEST_F(SignedExchangeRequestHandlerBrowserTest, RealCertVerifier) { InstallUrlInterceptor( GURL("https://cert.example.org/cert.msg"), - "content/test/data/htxg/test.example.org.public.pem.cbor"); + "content/test/data/sxg/test.example.org.public.pem.cbor"); // Use "real" CertVerifier. SignedExchangeHandler::SetCertVerifierForTesting(nullptr); embedded_test_server()->RegisterRequestMonitor( base::BindRepeating([](const net::test_server::HttpRequest& request) { - if (request.relative_url == "/htxg/test.example.org_test.htxg") { + if (request.relative_url == "/sxg/test.example.org_test.htxg") { const auto& accept_value = request.headers.find("accept")->second; EXPECT_THAT(accept_value, ::testing::HasSubstr("application/signed-exchange;v=b1")); @@ -318,7 +318,7 @@ IN_PROC_BROWSER_TEST_F(SignedExchangeRequestHandlerBrowserTest, })); embedded_test_server()->ServeFilesFromSourceDirectory("content/test/data"); ASSERT_TRUE(embedded_test_server()->Start()); - GURL url = embedded_test_server()->GetURL("/htxg/test.example.org_test.htxg"); + GURL url = embedded_test_server()->GetURL("/sxg/test.example.org_test.htxg"); // "test.example.org_test.htxg" should pass CertVerifier::Verify() and then // fail at SignedExchangeHandler::CheckOCSPStatus() because of the dummy OCSP diff --git a/content/browser/web_package/signed_exchange_signature_verifier_unittest.cc b/content/browser/web_package/signed_exchange_signature_verifier_unittest.cc index a36e6ebd15420b..36719d063eccac 100644 --- a/content/browser/web_package/signed_exchange_signature_verifier_unittest.cc +++ b/content/browser/web_package/signed_exchange_signature_verifier_unittest.cc @@ -62,7 +62,7 @@ TEST(SignedExchangeSignatureVerifier, EncodeCanonicalExchangeHeaders) { const uint64_t kSignatureHeaderDate = 1517892341; const uint64_t kSignatureHeaderExpires = 1517895941; -// See content/testdata/htxg/README on how to generate this data. +// See content/testdata/sxg/README on how to generate this data. // clang-format off constexpr char kSignatureHeaderRSA[] = "label; " @@ -78,7 +78,7 @@ constexpr char kSignatureHeaderRSA[] = "date=1517892341; expires=1517895941"; // clang-format on -// See content/testdata/htxg/README on how to generate this data. +// See content/testdata/sxg/README on how to generate this data. // clang-format off constexpr char kSignatureHeaderECDSAP256[] = "label; " @@ -91,7 +91,7 @@ constexpr char kSignatureHeaderECDSAP256[] = "date=1517892341; expires=1517895941"; // clang-format on -// See content/testdata/htxg/README on how to generate this data. +// See content/testdata/sxg/README on how to generate this data. // clang-format off constexpr char kSignatureHeaderECDSAP384[] = "label; " diff --git a/content/test/data/htxg/.gitattributes b/content/test/data/sxg/.gitattributes similarity index 100% rename from content/test/data/htxg/.gitattributes rename to content/test/data/sxg/.gitattributes diff --git a/content/test/data/htxg/127.0.0.1.public.pem.cbor b/content/test/data/sxg/127.0.0.1.public.pem.cbor similarity index 100% rename from content/test/data/htxg/127.0.0.1.public.pem.cbor rename to content/test/data/sxg/127.0.0.1.public.pem.cbor diff --git a/content/test/data/htxg/404.msg b/content/test/data/sxg/404.msg similarity index 100% rename from content/test/data/htxg/404.msg rename to content/test/data/sxg/404.msg diff --git a/content/test/data/htxg/404.msg.mock-http-headers b/content/test/data/sxg/404.msg.mock-http-headers similarity index 100% rename from content/test/data/htxg/404.msg.mock-http-headers rename to content/test/data/sxg/404.msg.mock-http-headers diff --git a/content/test/data/htxg/README b/content/test/data/sxg/README similarity index 100% rename from content/test/data/htxg/README rename to content/test/data/sxg/README diff --git a/content/test/data/htxg/hello.txt b/content/test/data/sxg/hello.txt similarity index 100% rename from content/test/data/htxg/hello.txt rename to content/test/data/sxg/hello.txt diff --git a/content/test/data/htxg/prime256v1-sha256-noext.public.pem b/content/test/data/sxg/prime256v1-sha256-noext.public.pem similarity index 100% rename from content/test/data/htxg/prime256v1-sha256-noext.public.pem rename to content/test/data/sxg/prime256v1-sha256-noext.public.pem diff --git a/content/test/data/htxg/prime256v1-sha256.csr b/content/test/data/sxg/prime256v1-sha256.csr similarity index 100% rename from content/test/data/htxg/prime256v1-sha256.csr rename to content/test/data/sxg/prime256v1-sha256.csr diff --git a/content/test/data/htxg/prime256v1-sha256.public.pem b/content/test/data/sxg/prime256v1-sha256.public.pem similarity index 100% rename from content/test/data/htxg/prime256v1-sha256.public.pem rename to content/test/data/sxg/prime256v1-sha256.public.pem diff --git a/content/test/data/htxg/prime256v1.key b/content/test/data/sxg/prime256v1.key similarity index 100% rename from content/test/data/htxg/prime256v1.key rename to content/test/data/sxg/prime256v1.key diff --git a/content/test/data/htxg/secp384r1-sha256.csr b/content/test/data/sxg/secp384r1-sha256.csr similarity index 100% rename from content/test/data/htxg/secp384r1-sha256.csr rename to content/test/data/sxg/secp384r1-sha256.csr diff --git a/content/test/data/htxg/secp384r1-sha256.public.pem b/content/test/data/sxg/secp384r1-sha256.public.pem similarity index 100% rename from content/test/data/htxg/secp384r1-sha256.public.pem rename to content/test/data/sxg/secp384r1-sha256.public.pem diff --git a/content/test/data/htxg/secp384r1.key b/content/test/data/sxg/secp384r1.key similarity index 100% rename from content/test/data/htxg/secp384r1.key rename to content/test/data/sxg/secp384r1.key diff --git a/content/test/data/htxg/test.example.com_invalid_test.htxg b/content/test/data/sxg/test.example.com_invalid_test.htxg similarity index 100% rename from content/test/data/htxg/test.example.com_invalid_test.htxg rename to content/test/data/sxg/test.example.com_invalid_test.htxg diff --git a/content/test/data/htxg/test.example.com_invalid_test.htxg.mock-http-headers b/content/test/data/sxg/test.example.com_invalid_test.htxg.mock-http-headers similarity index 100% rename from content/test/data/htxg/test.example.com_invalid_test.htxg.mock-http-headers rename to content/test/data/sxg/test.example.com_invalid_test.htxg.mock-http-headers diff --git a/content/test/data/htxg/test.example.org-noext.public.pem.cbor b/content/test/data/sxg/test.example.org-noext.public.pem.cbor similarity index 100% rename from content/test/data/htxg/test.example.org-noext.public.pem.cbor rename to content/test/data/sxg/test.example.org-noext.public.pem.cbor diff --git a/content/test/data/htxg/test.example.org.public.pem.cbor b/content/test/data/sxg/test.example.org.public.pem.cbor similarity index 100% rename from content/test/data/htxg/test.example.org.public.pem.cbor rename to content/test/data/sxg/test.example.org.public.pem.cbor diff --git a/content/test/data/htxg/test.example.org.public.pem.cbor.mock-http-headers b/content/test/data/sxg/test.example.org.public.pem.cbor.mock-http-headers similarity index 100% rename from content/test/data/htxg/test.example.org.public.pem.cbor.mock-http-headers rename to content/test/data/sxg/test.example.org.public.pem.cbor.mock-http-headers diff --git a/content/test/data/htxg/test.example.org_hello.txt.htxg b/content/test/data/sxg/test.example.org_hello.txt.htxg similarity index 100% rename from content/test/data/htxg/test.example.org_hello.txt.htxg rename to content/test/data/sxg/test.example.org_hello.txt.htxg diff --git a/content/test/data/htxg/test.example.org_noext_test.htxg b/content/test/data/sxg/test.example.org_noext_test.htxg similarity index 100% rename from content/test/data/htxg/test.example.org_noext_test.htxg rename to content/test/data/sxg/test.example.org_noext_test.htxg diff --git a/content/test/data/htxg/test.example.org_test.htxg b/content/test/data/sxg/test.example.org_test.htxg similarity index 100% rename from content/test/data/htxg/test.example.org_test.htxg rename to content/test/data/sxg/test.example.org_test.htxg diff --git a/content/test/data/htxg/test.example.org_test.htxg.mock-http-headers b/content/test/data/sxg/test.example.org_test.htxg.mock-http-headers similarity index 100% rename from content/test/data/htxg/test.example.org_test.htxg.mock-http-headers rename to content/test/data/sxg/test.example.org_test.htxg.mock-http-headers diff --git a/content/test/data/htxg/test.example.org_test_invalid_content_type.htxg b/content/test/data/sxg/test.example.org_test_invalid_content_type.htxg similarity index 100% rename from content/test/data/htxg/test.example.org_test_invalid_content_type.htxg rename to content/test/data/sxg/test.example.org_test_invalid_content_type.htxg diff --git a/content/test/data/htxg/test.example.org_test_invalid_content_type.htxg.mock-http-headers b/content/test/data/sxg/test.example.org_test_invalid_content_type.htxg.mock-http-headers similarity index 100% rename from content/test/data/htxg/test.example.org_test_invalid_content_type.htxg.mock-http-headers rename to content/test/data/sxg/test.example.org_test_invalid_content_type.htxg.mock-http-headers diff --git a/content/test/data/htxg/test.html b/content/test/data/sxg/test.html similarity index 100% rename from content/test/data/htxg/test.html rename to content/test/data/sxg/test.html diff --git a/content/test/data/htxg/x509.ext b/content/test/data/sxg/x509.ext similarity index 100% rename from content/test/data/htxg/x509.ext rename to content/test/data/sxg/x509.ext diff --git a/content/test/fuzzer/BUILD.gn b/content/test/fuzzer/BUILD.gn index 1f755e335b1933..8c30eb47d2b1aa 100644 --- a/content/test/fuzzer/BUILD.gn +++ b/content/test/fuzzer/BUILD.gn @@ -108,7 +108,7 @@ fuzzer_test("signed_exchange_envelope_fuzzer") { "//base:i18n", "//content/test:test_support", ] - seed_corpus = "//content/test/data/htxg/" + seed_corpus = "//content/test/data/sxg/" } fuzzer_test("signed_exchange_signature_header_field_fuzzer") {