widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix LicenseRenewalSpecifiedServer for SDK servers

Browse Source 
[ Merge of http://go/wvgerrit/197972 ]

The test only needs to verify that the license has a renewal
server url. It does not need to fetch a renewal from that url.

bug: 338103523
Change-Id: I1513f8692089c3f51a53ffd6ecb62348702b8fb8
This commit is contained in:
Rahul Frias
2024-05-30 10:48:53 -07:00
parent d926fb31ec
commit 0500d27ce5
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libwvdrmengine/cdm/core/test/cdm_engine_test.cpp
View File

@@ -191,7 +191,6 @@ class WvCdmEngineTest : public WvCdmEnginePreProvTest {
EXPECT_EQ(KEY_MESSAGE, result); EXPECT_EQ(KEY_MESSAGE, result);
key_msg_ = request.message; key_msg_ = request.message;
server_url_ = request.url;
} }
std::string GetKeyRequestResponse(const std::string& server_url, std::string GetKeyRequestResponse(const std::string& server_url,
@@ -295,8 +294,6 @@ class WvCdmEngineTest : public WvCdmEnginePreProvTest {
<< "Expected request type " << key_request_type << " was not found. " << "Expected request type " << key_request_type << " was not found. "
<< "metrics: " << wvutil::b2a_hex(serialized_metrics); << "metrics: " << wvutil::b2a_hex(serialized_metrics);
} }
std::string server_url_;
}; };
// Tests to validate service certificate // Tests to validate service certificate
@@ -401,22 +398,15 @@ TEST_F(WvCdmEngineTest, LoadKey) {
// command line. // command line.
TEST_F(WvCdmEngineTest, LicenseRenewalSpecifiedServer) { TEST_F(WvCdmEngineTest, LicenseRenewalSpecifiedServer) {
EnsureProvisioned(); EnsureProvisioned();
GenerateKeyRequest(binary_key_id(), kCencMimeType); LicenseHolder holder("CDM_SpecifyRenewalUrl", &cdm_engine_, config_);
VerifyNewKeyResponse(config_.license_server(), config_.client_auth()); ASSERT_NO_FATAL_FAILURE(holder.OpenSession());
ASSERT_NO_FATAL_FAILURE(holder.FetchLicense());
GenerateRenewalRequest(); ASSERT_NO_FATAL_FAILURE(holder.LoadLicense());
if (!server_url_.empty()) { CdmKeyRequest request;
// If the license server put a URL for the renewal in the license, we should const CdmResponseType result =
// be able to verify the renewal against that server. cdm_engine_.GenerateRenewalRequest(holder.session_id(), &request);
VerifyRenewalKeyResponse(server_url_, config_.client_auth()); ASSERT_EQ(KEY_MESSAGE, result);
} else { EXPECT_EQ(request.url, "url_as_specified_in_integration_console");
// If the license server did not give us a URL, we won't verify it.
LOGE("License server did not set renewal URL. license_url=%s.",
config_.license_server().c_str());
// This is OK when you are using a local, debug, license server, but it
// should NOT happen if using UAT or UAT nightly.
EXPECT_EQ(std::string::npos, config_.license_server().find("proxy.uat"));
}
} }
// This test generates a renewal and then requests it from the server specified // This test generates a renewal and then requests it from the server specified