Merge pull request #53 from scribd/kabliz/APT-10650-3-try-to-play

[APT-10650] Better DrmInfo Resilience
scribd · Oct 24, 2024 · 845c397 · 845c397
2 parents d38093f + f1d892f
commit 845c397
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 16 deletions.
diff --git a/Armadillo/src/main/java/com/scribd/armadillo/playback/ExoPlaybackExceptionExt.kt b/Armadillo/src/main/java/com/scribd/armadillo/playback/ExoPlaybackExceptionExt.kt
@@ -6,12 +6,14 @@ import com.google.android.exoplayer2.ExoPlaybackException.TYPE_RENDERER
 import com.google.android.exoplayer2.ExoPlaybackException.TYPE_SOURCE
 import com.google.android.exoplayer2.ParserException
 import com.google.android.exoplayer2.audio.AudioSink
+import com.google.android.exoplayer2.drm.DrmSession.DrmSessionException
 import com.google.android.exoplayer2.drm.MediaDrmCallbackException
 import com.google.android.exoplayer2.upstream.DataSpec
 import com.google.android.exoplayer2.upstream.HttpDataSource
 import com.scribd.armadillo.error.ArmadilloException
 import com.scribd.armadillo.error.ArmadilloIOException
 import com.scribd.armadillo.error.ConnectivityException
+import com.scribd.armadillo.error.DrmPlaybackException
 import com.scribd.armadillo.error.HttpResponseCodeException
 import com.scribd.armadillo.error.ParsingException
 import com.scribd.armadillo.error.RendererConfigurationException
@@ -39,6 +41,9 @@ internal fun ExoPlaybackException.toArmadilloException(context: Context): Armadi
                     HttpResponseCodeException(httpCause?.responseCode
                         ?: 0, httpCause?.dataSpec?.uri.toString(), source, source.dataSpec.toAnalyticsMap(context))
                 }
+                is DrmSessionException -> {
+                    DrmPlaybackException(cause = this)
+                }
 
                 is UnknownHostException,
                 is SocketTimeoutException -> ConnectivityException(source)

diff --git a/Armadillo/src/main/java/com/scribd/armadillo/playback/mediasource/DrmMediaSourceHelper.kt b/Armadillo/src/main/java/com/scribd/armadillo/playback/mediasource/DrmMediaSourceHelper.kt
@@ -31,23 +31,28 @@ internal class DrmMediaSourceHelperImpl @Inject constructor(private val secureSt
         MediaItem.Builder()
             .setUri(request.url)
             .apply {
-                // Apply DRM config if content is DRM-protected
-                request.drmInfo?.let { drmInfo ->
-                    MediaItem.DrmConfiguration.Builder(drmInfo.drmType.toExoplayerConstant())
-                        .setLicenseUri(drmInfo.licenseServer)
-                        .setLicenseRequestHeaders(drmInfo.drmHeaders)
-                        .apply {
-                            // If the content is a download content, use the saved offline DRM key id.
-                            // This ID is needed to retrieve the local DRM license for content decryption.
-                            if (isDownload) {
-                                secureStorage.getDrmDownload(context = context, id =  id, drmType = drmInfo.drmType)?.let { drmDownload ->
-                                    setKeySetId(drmDownload.drmKeyId)
-                                } ?: throw DrmPlaybackException(IllegalStateException("No DRM key id saved for download content"))
+                try {
+                    // Apply DRM config if content is DRM-protected
+                    request.drmInfo?.let { drmInfo ->
+                        MediaItem.DrmConfiguration.Builder(drmInfo.drmType.toExoplayerConstant())
+                            .setLicenseUri(drmInfo.licenseServer)
+                            .setLicenseRequestHeaders(drmInfo.drmHeaders)
+                            .apply {
+                                // If the content is a download content, use the saved offline DRM key id.
+                                // This ID is needed to retrieve the local DRM license for content decryption.
+                                if (isDownload) {
+                                    secureStorage.getDrmDownload(context = context, id = id, drmType = drmInfo.drmType)?.let { drmDownload ->
+                                        setKeySetId(drmDownload.drmKeyId)
+                                    } ?: throw DrmPlaybackException(IllegalStateException("No DRM key id saved for download content"))
+                                }
                             }
-                        }
-                        .build()
-                }?.let { drmConfig ->
-                    setDrmConfiguration(drmConfig)
+                            .build()
+                    }?.let { drmConfig ->
+                        setDrmConfiguration(drmConfig)
+                    }
+                } catch (ex: DrmPlaybackException) {
+                    //attempt to load unencrypted, there's a chance the user supplied excessive DRMInfo. An exception will
+                    // be raised elsewhere if this content can't be decrypted.
                 }
             }
             .build()

diff --git a/RELEASE.md b/RELEASE.md
@@ -2,6 +2,7 @@
 
 ## 1.6.8
 - Fixes an app startup crash to EncryptedSharedPreference faults. 
+- Adds resilience to playing unencrypted content if it is optionally drm enabled.
 
 ## 1.6.7
 - Adds additional data in audio player errors: HttpResponseCodeException, DownloadFailed