From 3012ff29bd51a0ef88380c55f9c64226b503025e Mon Sep 17 00:00:00 2001 From: Fred Gylys-Colwell Date: Sun, 16 Feb 2020 10:33:24 -0800 Subject: [PATCH] Use staging provisioning server Merge from Widevine repo of http://go/wvgerrit/94067 The android tests should use the staging provisioning server until production is able to support core messages. Test: ran WvCdmRequestLicenseTest.ProvisioningTest with v16 mod mock Bug: 149622735 Change-Id: I4ec0cc8e8474dc4250e092473fef90d7358260de --- .../cdm/core/test/config_test_env.cpp | 3 +++ .../cdm/core/test/config_test_env.h | 3 +++ .../cdm/test/request_license_test.cpp | 22 +++++++++---------- libwvdrmengine/run_all_unit_tests.sh | 6 ++++- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/libwvdrmengine/cdm/core/test/config_test_env.cpp b/libwvdrmengine/cdm/core/test/config_test_env.cpp index 8aced7ac..de3621d4 100644 --- a/libwvdrmengine/cdm/core/test/config_test_env.cpp +++ b/libwvdrmengine/cdm/core/test/config_test_env.cpp @@ -279,6 +279,9 @@ const ConfigTestEnv::LicenseServerConfiguration license_servers[] = { } // namespace +const std::string kDefaultProvisioningServerUrl = + kCpProductionProvisioningServerUrl; + ConfigTestEnv::ConfigTestEnv(ServerConfigurationId server_id) { Init(server_id); } diff --git a/libwvdrmengine/cdm/core/test/config_test_env.h b/libwvdrmengine/cdm/core/test/config_test_env.h index 624206f9..4daa28e9 100644 --- a/libwvdrmengine/cdm/core/test/config_test_env.h +++ b/libwvdrmengine/cdm/core/test/config_test_env.h @@ -118,6 +118,9 @@ class ConfigTestEnv { std::string provisioning_service_certificate_; }; +// The default provisioning server URL for a default provisioning request. +extern const std::string kDefaultProvisioningServerUrl; + } // namespace wvcdm #endif // CDM_TEST_CONFIG_TEST_ENV_H_ diff --git a/libwvdrmengine/cdm/test/request_license_test.cpp b/libwvdrmengine/cdm/test/request_license_test.cpp index 50b2d285..9410d8cb 100644 --- a/libwvdrmengine/cdm/test/request_license_test.cpp +++ b/libwvdrmengine/cdm/test/request_license_test.cpp @@ -2035,7 +2035,7 @@ class WvCdmRequestLicenseTest : public WvCdmTestBase { &key_msg_, &provisioning_server); EXPECT_EQ(wvcdm::NO_ERROR, status); if (NO_ERROR != status) return; - EXPECT_EQ(provisioning_server, config_.provisioning_server()); + EXPECT_EQ(provisioning_server, kDefaultProvisioningServerUrl); CdmProvisioningResponse response = GetCertRequestResponse(config_.provisioning_server()); @@ -2151,7 +2151,7 @@ TEST_F(WvCdmRequestLicenseTest, ProvisioningTest) { decryptor_->GetProvisioningRequest( cert_type, cert_authority, kDefaultCdmIdentifier, kEmptyServiceCertificate, &key_msg_, &provisioning_server)); - EXPECT_EQ(provisioning_server, config_.provisioning_server()); + EXPECT_EQ(provisioning_server, kDefaultProvisioningServerUrl); std::string response = GetCertRequestResponse(config_.provisioning_server()); EXPECT_NE(0, static_cast(response.size())); @@ -2178,7 +2178,7 @@ TEST_F(WvCdmRequestLicenseTest, ProvisioningTestWithServiceCertificate) { cert_type, cert_authority, kDefaultCdmIdentifier, config_.provisioning_service_certificate(), &key_msg_, &provisioning_server)); - EXPECT_EQ(provisioning_server, config_.provisioning_server()); + EXPECT_EQ(provisioning_server, kDefaultProvisioningServerUrl); std::string response = GetCertRequestResponse(config_.provisioning_server()); EXPECT_NE(0, static_cast(response.size())); @@ -2206,7 +2206,7 @@ TEST_F(WvCdmRequestLicenseTest, L3ProvisioningTest) { decryptor_->GetProvisioningRequest( cert_type, cert_authority, kDefaultCdmIdentifier, kEmptyServiceCertificate, &key_msg_, &provisioning_server)); - EXPECT_EQ(provisioning_server, config_.provisioning_server()); + EXPECT_EQ(provisioning_server, kDefaultProvisioningServerUrl); std::string response = GetCertRequestResponse(config_.provisioning_server()); EXPECT_NE(0, static_cast(response.size())); @@ -2295,13 +2295,13 @@ TEST_F(WvCdmRequestLicenseTest, ProvisioningInterposedRetryTest) { decryptor_->GetProvisioningRequest( cert_type, cert_authority, kDefaultCdmIdentifier, kEmptyServiceCertificate, &key_msg1, &provisioning_server)); - EXPECT_EQ(provisioning_server, config_.provisioning_server()); + EXPECT_EQ(provisioning_server, kDefaultProvisioningServerUrl); EXPECT_EQ(wvcdm::NO_ERROR, decryptor_->GetProvisioningRequest( cert_type, cert_authority, kDefaultCdmIdentifier, kEmptyServiceCertificate, &key_msg2, &provisioning_server)); - EXPECT_EQ(provisioning_server, config_.provisioning_server()); + EXPECT_EQ(provisioning_server, kDefaultProvisioningServerUrl); key_msg_ = key_msg2; std::string response = GetCertRequestResponse(config_.provisioning_server()); @@ -2368,7 +2368,7 @@ TEST_F(WvCdmRequestLicenseTest, ProvisioningInterspersedRetryTest) { decryptor_->GetProvisioningRequest( cert_type, cert_authority, kDefaultCdmIdentifier, kEmptyServiceCertificate, &key_msgs[i], &provisioning_server)); - EXPECT_EQ(provisioning_server, config_.provisioning_server()); + EXPECT_EQ(provisioning_server, kDefaultProvisioningServerUrl); } // First request that we expect to fail. @@ -2409,7 +2409,7 @@ TEST_F(WvCdmRequestLicenseTest, DISABLED_X509ProvisioningTest) { decryptor_->GetProvisioningRequest( cert_type, cert_authority, kDefaultCdmIdentifier, kEmptyServiceCertificate, &key_msg_, &provisioning_server)); - EXPECT_EQ(provisioning_server, config_.provisioning_server()); + EXPECT_EQ(provisioning_server, kDefaultProvisioningServerUrl); std::string response = GetCertRequestResponse(config_.provisioning_server()); EXPECT_NE(0, static_cast(response.size())); @@ -2502,7 +2502,7 @@ TEST_F(WvCdmRequestLicenseTest, PropertySetTest) { decryptor_->GetProvisioningRequest( cert_type, cert_authority, kDefaultCdmIdentifier, kEmptyServiceCertificate, &key_msg_, &provisioning_server)); - EXPECT_EQ(provisioning_server, config_.provisioning_server()); + EXPECT_EQ(provisioning_server, kDefaultProvisioningServerUrl); std::string response = GetCertRequestResponse(config_.provisioning_server()); EXPECT_NE(0, static_cast(response.size())); @@ -2579,7 +2579,7 @@ TEST_F(WvCdmRequestLicenseTest, ForceL3Test) { decryptor_->GetProvisioningRequest( cert_type, cert_authority, kDefaultCdmIdentifier, kEmptyServiceCertificate, &key_msg_, &provisioning_server)); - EXPECT_EQ(provisioning_server, config_.provisioning_server()); + EXPECT_EQ(provisioning_server, kDefaultProvisioningServerUrl); std::string response = GetCertRequestResponse(config_.provisioning_server()); EXPECT_NE(0, static_cast(response.size())); EXPECT_EQ(NO_ERROR, @@ -2842,7 +2842,7 @@ TEST_F(WvCdmRequestLicenseTest, ReleaseRetryL3OfflineKeyTest) { decryptor_->GetProvisioningRequest( cert_type, cert_authority, kDefaultCdmIdentifier, kEmptyServiceCertificate, &key_msg_, &provisioning_server)); - EXPECT_EQ(provisioning_server, config_.provisioning_server()); + EXPECT_EQ(provisioning_server, kDefaultProvisioningServerUrl); std::string response = GetCertRequestResponse(config_.provisioning_server()); EXPECT_NE(0, static_cast(response.size())); diff --git a/libwvdrmengine/run_all_unit_tests.sh b/libwvdrmengine/run_all_unit_tests.sh index 9d550312..84235d6d 100755 --- a/libwvdrmengine/run_all_unit_tests.sh +++ b/libwvdrmengine/run_all_unit_tests.sh @@ -91,8 +91,12 @@ adb_shell_run oemcrypto_test \ GTEST_FILTER="$GTEST_FILTER:*Level1Required" FORCE_LEVEL3_OEMCRYPTO=yes adb_shell_run oemcrypto_test +# TODO(b/149720416): Remove this once the production provisioning server +# supports core messages.. +PROVISIONING_ARG="--provisioning_server_url=https://staging-www.sandbox.googleapis.com/certificateprovisioning/v1/devicecertificates/create?key=AIzaSyB-5OLKTx2iU5mko18DfdwK5611JIjbUhE" + # Run request_license_test next to ensure device is provisioned -adb_shell_run request_license_test +adb_shell_run request_license_test $PROVISIONING_ARG # cdm_extended_duration_test takes >30 minutes to run. # adb_shell_run cdm_extended_duration_test