Prevent infinite recursion in format sniffing (readium#476)

marshal1919 · Feb 26, 2024 · 11a1737 · 11a1737
1 parent 82b1238
commit 11a1737
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 135 deletions.
diff --git a/readium/shared/src/main/java/org/readium/r2/shared/util/asset/AssetSniffer.kt b/readium/shared/src/main/java/org/readium/r2/shared/util/asset/AssetSniffer.kt
@@ -46,18 +46,20 @@ internal class AssetSniffer(
         source: Either<Resource, Container<Resource>>,
         hints: FormatHints
     ): Try<Asset, SniffError> {
-        val initialDescription = Format(
-            specification = FormatSpecification(emptySet()),
-            mediaType = MediaType.BINARY,
-            fileExtension = FileExtension("")
-        )
+        val initialFormat = formatSniffer
+            .sniffHints(hints)
+            ?: Format(
+                specification = FormatSpecification(emptySet()),
+                mediaType = MediaType.BINARY,
+                fileExtension = FileExtension("")
+            )
 
         val cachingSource: Either<Readable, Container<Readable>> = when (source) {
             is Either.Left -> Either.Left(CachingReadable(source.value))
             is Either.Right -> Either.Right(CachingContainer(source.value))
         }
 
-        val asset = doSniff(initialDescription, source, cachingSource, hints)
+        val asset = sniffContent(initialFormat, source, cachingSource, hints, forceRefine = false)
             .getOrElse { return Try.failure(SniffError.Reading(it)) }
 
         return asset
@@ -66,45 +68,39 @@ internal class AssetSniffer(
             ?: Try.failure(SniffError.NotRecognized)
     }
 
-    private suspend fun doSniff(
+    private suspend fun sniffContent(
         format: Format,
         source: Either<Resource, Container<Resource>>,
         cache: Either<Readable, Container<Readable>>,
-        hints: FormatHints
+        hints: FormatHints,
+        forceRefine: Boolean
     ): Try<Asset, ReadError> {
-        formatSniffer
-            .sniffHints(format, hints)
-            .takeIf { it.conformsTo(format) }
-            ?.takeIf { it != format }
-            ?.let { return doSniff(it, source, cache, hints) }
-
         when (cache) {
             is Either.Left ->
                 formatSniffer
                     .sniffBlob(format, cache.value)
                     .getOrElse { return Try.failure(it) }
-                    .takeIf { it.conformsTo(format) }
-                    ?.takeIf { it != format }
-                    ?.let { return doSniff(it, source, cache, hints) }
+                    .takeIf { !forceRefine || it.refines(format) }
+                    ?.let { return sniffContent(it, source, cache, hints, forceRefine = true) }
 
             is Either.Right ->
                 formatSniffer
                     .sniffContainer(format, cache.value)
                     .getOrElse { return Try.failure(it) }
-                    .takeIf { it.conformsTo(format) }
-                    ?.takeIf { it != format }
-                    ?.let { return doSniff(it, source, cache, hints) }
+                    .takeIf { !forceRefine || it.refines(format) }
+                    ?.let { return sniffContent(it, source, cache, hints, forceRefine = true) }
         }
 
         if (source is Either.Left) {
             tryOpenArchive(format, source.value)
                 .getOrElse { return Try.failure(it) }
                 ?.let {
-                    return doSniff(
+                    return sniffContent(
                         it.format,
                         Either.Right(it.container),
                         Either.Right(CachingContainer(it.container)),
-                        hints
+                        hints,
+                        forceRefine = true
                     )
                 }
         }

diff --git a/readium/shared/src/main/java/org/readium/r2/shared/util/format/Format.kt b/readium/shared/src/main/java/org/readium/r2/shared/util/format/Format.kt
@@ -25,6 +25,10 @@ public data class Format(
 
     internal fun conformsTo(other: Format): Boolean =
         specification.conformsTo(other.specification)
+
+    internal fun refines(other: Format) =
+        specification != other.specification &&
+            specification.conformsToAll(other.specification.specifications)
 }
 
 @JvmInline