Merge pull request #231 from android-password-store/revert-incorrect-…

…skip Revert "fix: disable still-failing tests"
android-password-store · Oct 12, 2023 · 50f2f21 · 50f2f21
2 parents 8c8ae01 + 4f4b4ea
commit 50f2f21
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 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
   }
 }
diff --git a/src/test/kotlin/kage/UpstreamTestSuite.kt b/src/test/kotlin/kage/UpstreamTestSuite.kt
@@ -26,10 +26,7 @@ class UpstreamTestSuite {
 
   @TestFactory
   fun generateTests(): List<DynamicTest> {
-    return Files.newDirectoryStream(testFixtureRoot).mapNotNull { path ->
-      // TODO: Fix the following tests
-      if (path.name in arrayOf("armor_garbage_leading", "armor_whitespace_outside"))
-        return@mapNotNull null
+    return Files.newDirectoryStream(testFixtureRoot).map { path ->
       val contents = path.toFile().readBytes()
       DynamicTest.dynamicTest(path.name) {
         val suite = TestSuite.parse(contents)