From 7326d3cf85867f8599f9b241bf658ff2ffcff581 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Mon, 7 Nov 2022 16:21:50 +0100
Subject: [PATCH] Add tests for writing out of session key and verifications

---
 .../cli/picocli/commands/DecryptCmdTest.java  | 85 +++++++++++--------
 1 file changed, 51 insertions(+), 34 deletions(-)

diff --git a/sop-java-picocli/src/test/java/sop/cli/picocli/commands/DecryptCmdTest.java b/sop-java-picocli/src/test/java/sop/cli/picocli/commands/DecryptCmdTest.java
index 3da2d09..411f0db 100644
--- a/sop-java-picocli/src/test/java/sop/cli/picocli/commands/DecryptCmdTest.java
+++ b/sop-java-picocli/src/test/java/sop/cli/picocli/commands/DecryptCmdTest.java
@@ -4,28 +4,6 @@
 
 package sop.cli.picocli.commands;
 
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.Date;
-
 import com.ginsberg.junit.exit.ExpectSystemExitWithStatus;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -43,6 +21,26 @@
 import sop.util.HexUtil;
 import sop.util.UTCUtil;
 
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.Date;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 public class DecryptCmdTest {
 
     private Decrypt decrypt;
@@ -189,24 +187,45 @@ public void assertWhenSessionKeyCannotBeExtractedExit37() throws IOException {
     }
 
     @Test
-    public void assertSessionKeyIsProperlyWrittenToSessionKeyFile() throws SOPGPException.CannotDecrypt, SOPGPException.MissingArg, SOPGPException.BadData, IOException {
-        byte[] key = "C7CBDAF42537776F12509B5168793C26B93294E5ABDFA73224FB0177123E9137".getBytes(StandardCharsets.UTF_8);
+    public void assertSessionKeyAndVerificationsIsProperlyWrittenToSessionKeyFile() throws SOPGPException.CannotDecrypt, SOPGPException.MissingArg, SOPGPException.BadData, IOException {
+        Date signDate = UTCUtil.parseUTCDate("2022-11-07T15:01:24Z");
+        String keyFP = "F9E6F53F7201C60A87064EAB0B27F2B0760A1209";
+        String certFP = "4E2C78519512C2AE9A8BFE7EB3298EB2FBE5F51B";
+        Verification verification = new Verification(signDate, keyFP, certFP);
+        SessionKey sessionKey = SessionKey.fromString("9:C7CBDAF42537776F12509B5168793C26B93294E5ABDFA73224FB0177123E9137");
         when(decrypt.ciphertext((InputStream) any())).thenReturn(new ReadyWithResult<DecryptionResult>() {
             @Override
             public DecryptionResult writeTo(OutputStream outputStream) {
                 return new DecryptionResult(
-                        new SessionKey((byte) 9, key),
-                        Collections.emptyList()
+                        sessionKey,
+                        Collections.singletonList(verification)
                 );
             }
         });
         Path tempDir = Files.createTempDirectory("session-key-out-dir");
-        File tempFile = new File(tempDir.toFile(), "session-key");
-        tempFile.deleteOnExit();
-        SopCLI.main(new String[] {"decrypt", "--session-key-out", tempFile.getAbsolutePath()});
+        File sessionKeyFile = new File(tempDir.toFile(), "session-key");
+        sessionKeyFile.deleteOnExit();
+        File verificationsFile = new File(tempDir.toFile(), "verifications");
+        File keyFile = new File(tempDir.toFile(), "key.asc");
+        keyFile.createNewFile();
+        SopCLI.main(new String[] {"decrypt", "--session-key-out", sessionKeyFile.getAbsolutePath(),
+        "--verifications-out", verificationsFile.getAbsolutePath(), "--verify-with", keyFile.getAbsolutePath()});
 
         ByteArrayOutputStream bytesInFile = new ByteArrayOutputStream();
-        try (FileInputStream fileIn = new FileInputStream(tempFile)) {
+        try (FileInputStream fileIn = new FileInputStream(sessionKeyFile)) {
+            byte[] buf = new byte[32];
+            int read = fileIn.read(buf);
+            while (read != -1) {
+                bytesInFile.write(buf, 0, read);
+                read = fileIn.read(buf);
+            }
+        }
+
+        SessionKey parsedSessionKey = SessionKey.fromString(bytesInFile.toString());
+        assertEquals(sessionKey, parsedSessionKey);
+
+        bytesInFile = new ByteArrayOutputStream();
+        try (FileInputStream fileIn = new FileInputStream(verificationsFile)) {
             byte[] buf = new byte[32];
             int read = fileIn.read(buf);
             while (read != -1) {
@@ -215,10 +234,8 @@ public DecryptionResult writeTo(OutputStream outputStream) {
             }
         }
 
-        byte[] algAndKey = new byte[key.length + 1];
-        algAndKey[0] = (byte) 9;
-        System.arraycopy(key, 0, algAndKey, 1, key.length);
-        assertArrayEquals(algAndKey, bytesInFile.toByteArray());
+        Verification parsedVerification = Verification.fromString(bytesInFile.toString());
+        assertEquals(verification, parsedVerification);
     }
 
     @Test