Merge pull request #543 from android-password-store/ai-bugs

fix: address some issues found by Copilot

Author: msfjarvis

src/kotlin/kage/crypto/stream/EncryptOutputStream.kt

@@ -61,7 +61,8 @@ internal class EncryptOutputStream(private val key: ByteArray, private val dst:
       throw StreamException("internal error: flush called with partial chunk")
     }
 
-    if (bufSize == 0 && !nonceIsZero(this.nonce)) throw StreamException("chunk cannot be empty")
+    if (bufSize == 0 && !nonceIsZero(this.nonce))
+      throw StreamException("only the first chunk can be empty")
 
     if (last) setLastChunkFlag(nonce)
 

src/kotlin/kage/errors/ParseException.kt

@@ -5,12 +5,18 @@
  */
 package kage.errors
 
-/** Wrapper type for errors triggered while parsing an [kage.format.AgeStanza] */
+/**
+ * Wrapper type for errors triggered while parsing age-formatted structures (for example,
+ * [kage.format.AgeHeader], [kage.format.AgeKeyFile], and [kage.format.AgeStanza]).
+ */
 public sealed class ParseException
 @JvmOverloads
 constructor(message: String? = null, cause: Throwable? = null) : Exception(message, cause)
 
-/** Raised when a non-ASCII string is encountered when parsing an [kage.format.AgeHeader]. */
+/**
+ * Raised when an invalid arbitrary string is encountered when parsing an [kage.format.AgeHeader],
+ * such as one containing disallowed non-ASCII characters.
+ */
 public class InvalidArbitraryStringException
 @JvmOverloads
 constructor(message: String? = null, cause: Throwable? = null) : ParseException(message, cause)

src/test/kotlin/AgeTest.kt

@@ -10,7 +10,6 @@ import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.InputStream
 import java.security.SecureRandom
-import java.util.Random
 import kage.crypto.scrypt.ScryptIdentity
 import kage.crypto.scrypt.ScryptRecipient
 import kage.crypto.stream.EncryptOutputStream.Companion.CHUNK_SIZE
@@ -104,7 +103,7 @@ class AgeTest {
 
     // Encrypt exactly 2 chunks
     val i = ByteArray(CHUNK_SIZE * 2)
-    Random().nextBytes(i)
+    SecureRandom().nextBytes(i)
 
     val bais = ByteArrayInputStream(i)
     val baos = ByteArrayOutputStream()
@@ -123,9 +122,9 @@ class AgeTest {
   fun testScryptEncryptDecryptExactBlock() {
     val (recipient, identity) = genX25519Identity()
 
-    // Encrypt exactly 1 chunks
+    // Encrypt exactly 1 chunk
     val i = ByteArray(CHUNK_SIZE)
-    Random().nextBytes(i)
+    SecureRandom().nextBytes(i)
 
     val bais = ByteArrayInputStream(i)
     val baos = ByteArrayOutputStream()
@@ -170,7 +169,7 @@ class AgeTest {
     val (otherRecipient, otherIdentity) = genX25519Identity()
 
     val payload = ByteArray(1023)
-    Random().nextBytes(payload)
+    SecureRandom().nextBytes(payload)
 
     val bais = ByteArrayInputStream(payload)
     val ageFile = Age.encrypt(listOf(otherRecipient, recipient), bais)
@@ -188,7 +187,7 @@ class AgeTest {
     val (_, otherIdentity) = genX25519Identity()
 
     val payload = ByteArray(1023)
-    Random().nextBytes(payload)
+    SecureRandom().nextBytes(payload)
 
     val bais = ByteArrayInputStream(payload)
     val ageFile = Age.encrypt(listOf(recipient), bais)
@@ -203,7 +202,7 @@ class AgeTest {
     val scryptRecipient = ScryptRecipient("mypass1".toByteArray())
 
     val payload = ByteArray(1023)
-    Random().nextBytes(payload)
+    SecureRandom().nextBytes(payload)
 
     val bais = ByteArrayInputStream(payload)
 

src/test/kotlin/kage/test/utils/TestSuite.kt

@@ -57,8 +57,8 @@ private constructor(
       } while (true)
 
       check(expect != null) { "invalid test file: no 'expect' header found" }
-      check((expect != Expect.Success || expect != Expect.PayloadFailure) || payloadHash != null) {
-        // This check verifies that the payload is present except when expectation is either
+      check((expect != Expect.Success && expect != Expect.PayloadFailure) || payloadHash != null) {
+        // This check verifies that the payload is required except when expectation is either
         // Success or PayloadFailure
         "invalid test file: no 'payload' header found"
       }

src/test/kotlin/kage/utils/Extensions.kt

@@ -24,7 +24,7 @@ import org.bouncycastle.crypto.InvalidCipherTextException
 private inline fun <reified T : Exception> hasCause(error: Throwable): Boolean {
   var cause = error.cause
   while (cause != null) {
-    if (error.cause is T) return true
+    if (cause is T) return true
     cause = cause.cause
   }
   return false