fix: detect stream correctly in presence of whitespace

Signed-off-by: Aditya Wasan <[email protected]>
android-password-store · Oct 12, 2023 · 4f4b4ea · 4f4b4ea
1 parent e29d889
commit 4f4b4ea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/kotlin/kage/Age.kt b/src/kotlin/kage/Age.kt
@@ -66,14 +66,16 @@ public object Age {
     val markSupportedStream =
       if (srcStream.markSupported()) srcStream else BufferedInputStream(srcStream)
 
-    markSupportedStream.mark(ArmorInputStream.HEADER.length)
+    // Check if the InputStream contains whitespace + header
+    val readLimit = ArmorInputStream.MAX_WHITESPACE + ArmorInputStream.HEADER.length
+    markSupportedStream.mark(readLimit)
 
-    val headerStr = markSupportedStream.readNBytes(ArmorInputStream.HEADER.length).decodeToString()
+    val initialString = markSupportedStream.readNBytes(readLimit).decodeToString()
 
     markSupportedStream.reset()
 
     val decodedStream =
-      if (headerStr.startsWith(ArmorInputStream.HEADER_START)) {
+      if (initialString.contains(ArmorInputStream.HEADER_START)) {
         ArmorInputStream(markSupportedStream)
       } else markSupportedStream
 

diff --git a/src/kotlin/kage/crypto/stream/ArmorInputStream.kt b/src/kotlin/kage/crypto/stream/ArmorInputStream.kt
@@ -111,7 +111,6 @@ internal class ArmorInputStream(src: InputStream) : InputStream() {
 
     const val COLUMNS_PER_LINE = 64
     const val BYTES_PER_LINE = COLUMNS_PER_LINE / 4 * 3
-
-    private const val MAX_WHITESPACE = 1024
+    const val MAX_WHITESPACE = 1024
   }
 }