EME: Fail if unsupported sessionTypes are provided

media/blink/key_system_config_selector.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/blink/key_system_config_selector.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 568 matching lines @@
   //         let session types be candidate configuration's sessionTypes member.
   //       - Otherwise, let session types be [ "temporary" ].
   //         (Done in MediaKeySystemAccessInitializer.)
   blink::WebVector<blink::WebEncryptedMediaSessionType> session_types =
       candidate.sessionTypes;
 
   // 13. For each value in session types:
   for (size_t i = 0; i < session_types.size(); i++) {
     // 13.1. Let session type be the value.
     blink::WebEncryptedMediaSessionType session_type = session_types[i];
+    if (session_type == blink::WebEncryptedMediaSessionType::Unknown) {
+      DVLOG(2) << "Rejecting requested configuration because "
+               << "session type was not recognized.";
+      return CONFIGURATION_NOT_SUPPORTED;
+    }
 
     // 13.2. If accumulated configuration's persistentState value is
     //       "not-allowed" and the Is persistent session type? algorithm
     //       returns true for session type return NotSupported.
     if (accumulated_configuration->persistentState ==
             EmeFeatureRequirement::NotAllowed &&
         IsPersistentSessionType(session_type)) {
       DVLOG(2) << "Rejecting requested configuration because persistent "
                   "sessions are not allowed.";
       return CONFIGURATION_NOT_SUPPORTED;
     }
 
     // 13.3. If the implementation does not support session type in combination
     //       with accumulated configuration and restrictions for other reasons,
     //       return NotSupported.
     EmeConfigRule session_type_rule = EmeConfigRule::NOT_SUPPORTED;
     switch (session_type) {
       case blink::WebEncryptedMediaSessionType::Unknown:
-        DVLOG(2) << "Rejecting requested configuration because "
-                 << "a required session type was not recognized.";
+        NOTREACHED();
         return CONFIGURATION_NOT_SUPPORTED;
       case blink::WebEncryptedMediaSessionType::Temporary:
         session_type_rule = EmeConfigRule::SUPPORTED;
         break;
       case blink::WebEncryptedMediaSessionType::PersistentLicense:
         session_type_rule = GetSessionTypeConfigRule(
             key_systems_->GetPersistentLicenseSessionSupport(key_system));
         break;
       case blink::WebEncryptedMediaSessionType::PersistentReleaseMessage:
         session_type_rule = GetSessionTypeConfigRule(
@@ skipping 305 matching lines @@
 
 void KeySystemConfigSelector::OnPermissionResult(
     std::unique_ptr<SelectionRequest> request,
     bool is_permission_granted) {
   request->was_permission_requested = true;
   request->is_permission_granted = is_permission_granted;
   SelectConfigInternal(std::move(request));
 }
 
 }  // namespace media