Fix CanSetServiceCertificate Test

(This is a merge of http://go/wvgerrit/14783)

When validation was added to the service certificate property, it
broke the associated test, which sends random data. It also did not
do any testing of the new validation itself.

This fix makes the validation method on WvContentDecryptionModule
non-static so that it can be mocked and handled appropriately in the
test.

Bug: 21923281
Change-Id: Id5d2315709fce35f9347b3545f594371810349f0

libwvdrmengine/cdm/include/wv_content_decryption_module.h

@@ -25,7 +25,6 @@ class WvContentDecryptionModule : public android::RefBase, public TimerHandler {
   static bool IsSupported(const std::string& init_data_type);
   static bool IsCenc(const std::string& init_data_type);
   static bool IsWebm(const std::string& init_data_type);
-  static bool IsValidServiceCertificate(const std::string& certificate);
 
   // Session related methods
   virtual CdmResponseType OpenSession(const CdmKeySystem& key_system,
@@ -116,6 +115,9 @@ class WvContentDecryptionModule : public android::RefBase, public TimerHandler {
   virtual void NotifyResolution(const CdmSessionId& session_id, uint32_t width,
                                 uint32_t height);
 
+  // Validate a passed-in service certificate
+  virtual bool IsValidServiceCertificate(const std::string& certificate);
+
  private:
   uint32_t GenerateSessionSharingId();
 

libwvdrmengine/cdm/src/wv_content_decryption_module.cpp

@@ -38,11 +38,6 @@ bool WvContentDecryptionModule::IsWebm(const std::string& init_data_type) {
   return InitializationData(init_data_type).is_webm();
 }
 
-bool WvContentDecryptionModule::IsValidServiceCertificate(
-    const std::string& certificate) {
-  return CdmLicense::VerifySignedServiceCertificate(certificate) == NO_ERROR;
-}
-
 CdmResponseType WvContentDecryptionModule::OpenSession(
     const CdmKeySystem& key_system, CdmClientPropertySet* property_set,
     const std::string& origin, WvCdmEventListener* event_listener,
@@ -214,6 +209,11 @@ void WvContentDecryptionModule::NotifyResolution(const CdmSessionId& session_id,
   cdm_engine_->NotifyResolution(session_id, width, height);
 }
 
+bool WvContentDecryptionModule::IsValidServiceCertificate(
+    const std::string& certificate) {
+  return CdmLicense::VerifySignedServiceCertificate(certificate) == NO_ERROR;
+}
+
 void WvContentDecryptionModule::EnablePolicyTimer() {
   AutoLock auto_lock(policy_timer_lock_);
   if (!policy_timer_.IsRunning())

libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp

@@ -585,8 +585,7 @@ status_t WVDrmPlugin::setPropertyByteArray(const String8& name,
                                            const Vector<uint8_t>& value) {
   if (name == "serviceCertificate") {
     std::string cert(value.begin(), value.end());
-    if (value.isEmpty() ||
+    if (value.isEmpty() || mCDM->IsValidServiceCertificate(cert)) {
-        WvContentDecryptionModule::IsValidServiceCertificate(cert)) {
       mPropertySet.set_service_certificate(cert);
     } else {
       return android::BAD_VALUE;

libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp

@@ -92,6 +92,8 @@ class MockCDM : public WvContentDecryptionModule {
 
   MOCK_METHOD1(ReleaseUsageInfo,
       CdmResponseType(const CdmUsageInfoReleaseMessage&));
+
+  MOCK_METHOD1(IsValidServiceCertificate, bool(const std::string&));
 };
 
 class MockCrypto : public WVGenericCryptoInterface {
@@ -1702,6 +1704,8 @@ TEST_F(WVDrmPluginTest, CanSetServiceCertificate) {
 
   Vector<uint8_t> privacyCert;
   privacyCert.appendArray(privacyCertRaw, kPrivacyCertSize);
+  std::string strPrivacyCert(reinterpret_cast<char*>(privacyCertRaw),
+                             kPrivacyCertSize);
   Vector<uint8_t> emptyVector;
 
   // Provide expected mock behavior
@@ -1721,6 +1725,13 @@ TEST_F(WVDrmPluginTest, CanSetServiceCertificate) {
         .Times(AtLeast(0));
   }
 
+  // Validate that the certificate is validated. Accept it once and reject it
+  // once. Note that there is no expected call for when the certificate is
+  // cleared.
+  EXPECT_CALL(*cdm, IsValidServiceCertificate(strPrivacyCert))
+      .WillOnce(Return(true))
+      .WillOnce(Return(false));
+
   plugin.openSession(sessionId);
   ASSERT_THAT(propertySet, NotNull());
 
@@ -1736,6 +1747,11 @@ TEST_F(WVDrmPluginTest, CanSetServiceCertificate) {
   res = plugin.setPropertyByteArray(String8("serviceCertificate"), emptyVector);
   ASSERT_EQ(OK, res);
   EXPECT_EQ(0u, propertySet->service_certificate().size());
+
+  // Test setting a certificate and having it fail
+  res = plugin.setPropertyByteArray(String8("serviceCertificate"), privacyCert);
+  ASSERT_NE(OK, res);
+  EXPECT_EQ(0u, propertySet->service_certificate().size());
 }
 
 TEST_F(WVDrmPluginTest, CanSetSessionSharing) {