Merge branch 'master' of github.com:open-eid/cdoc2-java-ref-impl

Author: OlesjaAarma

cdoc2-cli/src/main/java/ee/cyber/cdoc2/cli/commands/CDocCreateCmd.java

@@ -30,7 +30,7 @@
 
 //S106 - Standard outputs should not be used directly to log anything
 //CLI needs to interact with standard outputs
-@SuppressWarnings("java:S106")
+@SuppressWarnings({"java:S106", "java:S125"})
 @Command(name = "create", aliases = {"c", "encrypt"}, showAtFileInUsageHelp = true)
 public class CDocCreateCmd implements Callable<Void> {
 

cdoc2-cli/src/main/java/ee/cyber/cdoc2/cli/commands/CDocDecryptCmd.java

@@ -26,7 +26,7 @@
 
 //S106 Standard outputs should not be used directly to log anything
 //CLI needs to interact with standard outputs
-@SuppressWarnings("java:S106")
+@SuppressWarnings({"java:S106", "java:S125"})
 @Command(name = "decrypt", aliases = {"x", "extract"}, showAtFileInUsageHelp = true)
 public class CDocDecryptCmd implements Callable<Void> {
     // commented out until public key server is in live

cdoc2-cli/src/main/java/ee/cyber/cdoc2/cli/commands/CDocInfoCmd.java

@@ -21,7 +21,6 @@
 import static ee.cyber.cdoc2.crypto.KeyLabelTools.keyLabelParamsForDisplaying;
 
 
-
 //S106 Standard outputs should not be used directly to log anything
 //CLI needs to interact with standard outputs
 @SuppressWarnings("java:S106")
@@ -44,18 +43,15 @@ private void setProperty(Map<String, String> props) {
 
     @Override
     public Void call() throws Exception {
-
-
         List<Recipient> recipients = Envelope.parseHeader(Files.newInputStream(cdocFile.toPath()));
         for (Recipient recipient: recipients) {
-
             String type = getHumanReadableType(recipient);
 
             Map<String, String> keyLabelParams
                 = extractKeyLabelParams(recipient.getRecipientKeyLabel());
 
-            String server = (recipient instanceof ServerRecipient)
-                ? "(server: " + ((ServerRecipient) recipient).getKeyServerId() + ")"
+            String server = (recipient instanceof ServerRecipient serverRecipient)
+                ? "(server: " + serverRecipient.getKeyServerId() + ")"
                 : "";
 
             System.out.println(
@@ -69,8 +65,8 @@ public Void call() throws Exception {
     String getHumanReadableType(Recipient recipient) {
         Objects.requireNonNull(recipient); //can't have null recipient, fail with exception
 
-        if (recipient instanceof PublicKeyRecipient) {
-            return ((PublicKeyRecipient) recipient).getRecipientPubKey().getAlgorithm() + " PublicKey";
+        if (recipient instanceof PublicKeyRecipient publicKeyRecipient) {
+            return publicKeyRecipient.getRecipientPubKey().getAlgorithm() + " PublicKey";
         } else if (recipient instanceof SymmetricKeyRecipient) {
             return "SymmetricKey";
         } else if (recipient instanceof PBKDF2Recipient) {
@@ -81,4 +77,5 @@ String getHumanReadableType(Recipient recipient) {
             return recipient.getClass().toString();
         }
     }
+    
 }

cdoc2-cli/src/main/java/ee/cyber/cdoc2/cli/commands/CDocReEncryptCmd.java

@@ -30,7 +30,7 @@
 
 //S106 Standard outputs should not be used directly to log anything
 //CLI needs to interact with standard outputs
-@SuppressWarnings("java:S106")
+@SuppressWarnings({"java:S106", "java:S125"})
 @CommandLine.Command(name = "re-encrypt", aliases = {"re", "reencrypt"}, showAtFileInUsageHelp =
     true)
 public class CDocReEncryptCmd implements Callable<Void> {

cdoc2-cli/src/test/java/CDocCliTest.java …2-cli/src/test/java/cli/CDocCliTest.javacdoc2-cli/src/test/java/CDocCliTest.java renamed to cdoc2-cli/src/test/java/cli/CDocCliTest.java cdoc2-cli/src/test/java/CDocCliTest.java renamed to cdoc2-cli/src/test/java/cli/CDocCliTest.java

@@ -1,4 +1,4 @@
-import ee.cyber.cdoc2.cli.CDocCli;
+package cli;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -21,6 +21,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import picocli.CommandLine;
+
+import ee.cyber.cdoc2.cli.CDocCli;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -92,7 +95,7 @@ void testSuccessfulCreateDecryptDocWithPassword() throws IOException {
     }
 
     @Test
-    @Disabled
+    @Disabled("Requires user interaction for inserting password 'myPlainTextPassword'")
     void testSuccessfulCreateDecryptDocWithPasswordWhenItIsInsertedInteractively()
         throws IOException {
         encrypt(PASSWORD_OPTION);
@@ -200,7 +203,6 @@ void shouldFailWithTheSameOutputDirectoryWhenReEncrypt(@TempDir Path tempPath) {
         );
     }
 
-
     @Test
     void infoShouldDisplayKeyLabelInDefaultFormatForPassword() throws IOException {
         encrypt(PASSWORD_OPTION);

cdoc2-cli/src/test/java/CryptoTest.java …c2-cli/src/test/java/cli/CryptoTest.javacdoc2-cli/src/test/java/CryptoTest.java renamed to cdoc2-cli/src/test/java/cli/CryptoTest.java cdoc2-cli/src/test/java/CryptoTest.java renamed to cdoc2-cli/src/test/java/cli/CryptoTest.java

@@ -1,3 +1,5 @@
+package cli;
+
 import org.junit.jupiter.api.Test;
 
 import ee.cyber.cdoc2.crypto.Crypto;

cdoc2-client/src/main/java/ee/cyber/cdoc2/client/Cdoc2KeyCapsuleApiClient.java

@@ -190,6 +190,7 @@ protected void customizeClientBuilder(ClientBuilder clientBuilder) {
             return new Cdoc2KeyCapsuleApiClient(new Cdoc2KeyCapsulesApi(apiClient));
         }
 
+        @SuppressWarnings("java:S2139")
         private SSLContext createSslContext() throws NoSuchAlgorithmException, InvalidAlgorithmParameterException,
                 KeyStoreException, KeyManagementException {
             SSLContext sslContext;

cdoc2-example-app/src/main/java/ee/cyber/cdoc2/converter/ConverterCmd.java

@@ -17,8 +17,8 @@
 import java.util.Arrays;
 import java.util.concurrent.Callable;
 
-@Command( name = "cdoc-convert"
-)
+@Command( name = "cdoc-convert")
+@SuppressWarnings("squid:S106")
 public class ConverterCmd implements Callable<Void> {
 
     private static final Logger log = LoggerFactory.getLogger(ConverterCmd.class);
@@ -48,8 +48,6 @@ public class ConverterCmd implements Callable<Void> {
     @Option(names = { "-h", "--help" }, usageHelp = false, description = "display a help message")
     private boolean helpRequested = false;
 
-
-
     public static void main(String... args) {
 
         if (args.length == 0) {
@@ -61,7 +59,6 @@ public static void main(String... args) {
         System.exit(exitCode);
     }
 
-
     @Override
     public Void call() throws Exception {
 

cdoc2-example-app/src/main/java/ee/cyber/cdoc2/converter/util/AutoRemovableDir.java

@@ -8,6 +8,8 @@
 
 public class AutoRemovableDir implements AutoCloseable {
 
+    private static final Logger log = LoggerFactory.getLogger(AutoRemovableDir.class);
+
     Path pathToRemove;
     public AutoRemovableDir(Path pathToRemove) {
         this.pathToRemove = pathToRemove;
@@ -27,6 +29,7 @@ private static void purgeDirectory(File dir) {
             if (file.isDirectory())
                 purgeDirectory(file);
             file.delete();
+            log.info("Directory " + dir + " was deleted");
         }
     }
 }

cdoc2-example-app/src/main/java/ee/cyber/cdoc2/converter/util/PasswordCheckUtil.java

@@ -59,6 +59,7 @@ public static boolean isPwned(char[] passwd) throws NoSuchAlgorithmException, UR
 
         byte[] bytes = StandardCharsets.UTF_8.encode(CharBuffer.wrap(passwd)).array();
 
+        @SuppressWarnings("java:S4790")
         MessageDigest sha1 = MessageDigest.getInstance("SHA-1");
         sha1.update(bytes);
         String digest = HexFormat.of().formatHex(sha1.digest()).toUpperCase();