Merge branch 'RM-3257' into 'master'

RM-3257: Fix Junit id-card tests

See merge request cdoc2/cdoc2-java-ref-impl!42

Author: OlesjaAarma

README.md

@@ -231,10 +231,16 @@ To run the tests using a physical PKCS11 device (smart card or usb token), execu
 mvn test -Dtests=pkcs11
 ```
 
-The pkcs11 device configuration (PKCS11 library, slot, pin, etc) can be specified using `cdoc2.pkcs11.conf-file` system property, for example:
+The pkcs11 device configuration (PKCS11 library, slot, pin, etc) can be specified using 
+`cdoc2.pkcs11.conf-file` system property, for example run with configuration file from filesystem 
+from the root of the project:
 
 ```
-mvn test -Dtests=pkcs11 -Dcdoc2.pkcs11.conf-file=pkcs11-test-safenet.properties
+mvn test -Dtests=pkcs11 -Dcdoc2.pkcs11.conf-file=src/test/resources/pkcs11-test-safenet.properties
+```
+or
+```
+mvn test -Dtests=pkcs11 -Dcdoc2.pkcs11.conf-file=src/test/resources/pkcs11-test-idcard.properties
 ```
 
 By default, the pkcs11 configuration is read from the file `pkcs11-test-idcard.properties`.

cdoc2-cli/keys/38001085718_cert.pem

@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEDjCCA2+gAwIBAgIQaLfRQQSV3nMFgzOBgc5eKjAKBggqhkjOPQQDBDBgMQsw
+CQYDVQQGEwJFRTEbMBkGA1UECgwSU0sgSUQgU29sdXRpb25zIEFTMRcwFQYDVQRh
+DA5OVFJFRS0xMDc0NzAxMzEbMBkGA1UEAwwSVEVTVCBvZiBFU1RFSUQyMDE4MB4X
+DTIzMTEyOTA3MTYwOVoXDTI4MTEyODIxNTk1OVowfzELMAkGA1UEBhMCRUUxKjAo
+BgNVBAMMIUrDlUVPUkcsSkFBSy1LUklTVEpBTiwzODAwMTA4NTcxODEQMA4GA1UE
+BAwHSsOVRU9SRzEWMBQGA1UEKgwNSkFBSy1LUklTVEpBTjEaMBgGA1UEBRMRUE5P
+RUUtMzgwMDEwODU3MTgwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASrgI6qFJh+LloJ
+pNRwTL+89OVYygtOHVFuKpAuf7ZcLPnsaAnynvUTn9I8AvSzLnR7pzRVPDir+tTe
+k2Hp9IzwF067hOf8NKp3WbkaGk74Gdcd9RGPLfzDi+YcTj9zniWjggHNMIIByTAJ
+BgNVHRMEAjAAMB8GA1UdIwQYMBaAFMCEmSnETp87AjT2meEKVgAIKT57MHMGCCsG
+AQUFBwEBBGcwZTA1BggrBgEFBQcwAoYpaHR0cDovL2Muc2suZWUvVGVzdF9vZl9F
+U1RFSUQyMDE4LmRlci5jcnQwLAYIKwYBBQUHMAGGIGh0dHA6Ly9haWEuZGVtby5z
+ay5lZS9lc3RlaWQyMDE4MB8GA1UdEQQYMBaBFDM4MDAxMDg1NzE4QGVlc3RpLmVl
+MEcGA1UdIARAMD4wMgYLKwYBBAGDkSEBAQEwIzAhBggrBgEFBQcCARYVaHR0cHM6
+Ly93d3cuc2suZWUvQ1BTMAgGBgQAj3oBAjAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
+AgYIKwYBBQUHAwQwawYIKwYBBQUHAQMEXzBdMAgGBgQAjkYBATBRBgYEAI5GAQUw
+RzBFFj9odHRwczovL3NrLmVlL2VuL3JlcG9zaXRvcnkvY29uZGl0aW9ucy1mb3It
+dXNlLW9mLWNlcnRpZmljYXRlcy8TAmVuMB0GA1UdDgQWBBS4o0jDfX8kNdQdsOqq
+S3Yvx0vk2jAOBgNVHQ8BAf8EBAMCA4gwCgYIKoZIzj0EAwQDgYwAMIGIAkIA52jr
+H5u3U+KQ8gWuXFi+3hqsR6O0NG5hoFQN6Qk1P3xH1U9WEYrzBrfMTRAxAGHGh6JX
+jxjGyHAwiMVBnD4UBWUCQgFU4YC4yybxs6lsWp9h8pvLb72eqibkq50Jjb19bwhk
+mPaHamWsjrX1071PHqk7W4szaKrxy49qBuoiouLtjug9hQ==
+-----END CERTIFICATE-----

cdoc2-lib/src/main/java/ee/cyber/cdoc2/util/Resources.java

@@ -9,6 +9,7 @@
 import java.nio.file.Path;
 import java.util.Objects;
 
+
 /**
  * Utility class for loading resources (ex. properties files) from classpath
  */
@@ -46,4 +47,5 @@ public static InputStream getResourceAsStream(String name, @Nullable ClassLoader
             return Files.newInputStream(Path.of(name));
         }
     }
+
 }

cdoc2-lib/src/test/java/ee/cyber/cdoc2/crypto/Pkcs11DeviceConfiguration.java

@@ -1,12 +1,16 @@
 package ee.cyber.cdoc2.crypto;
 
+import java.io.File;
 import java.io.InputStream;
 import java.util.Optional;
 import java.util.Properties;
 import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import ee.cyber.cdoc2.util.Resources;
+
+
 /**
  * Test configuration for running PKCS11 tests using a hardware device.
  */
@@ -36,14 +40,25 @@ public record Pkcs11DeviceConfiguration(
      *
      */
     public static Pkcs11DeviceConfiguration load() {
-        String filename = System.getProperty("cdoc2.pkcs11.conf-file", "pkcs11-test-idcard.properties");
-        return loadFromPropertiesFile(filename);
+        final String classpath = "classpath:";
+        String filename = System.getProperty(
+            "cdoc2.pkcs11.conf-file",
+            classpath + "pkcs11-test-idcard.properties"
+        );
+        String propertyFileName;
+        if (filename.contains(classpath)) {
+            propertyFileName = filename;
+        } else {
+            propertyFileName = new File(filename).getAbsolutePath();
+        }
+        return loadFromPropertiesFile(propertyFileName);
     }
 
     private static Pkcs11DeviceConfiguration loadFromPropertiesFile(String filename) {
         log.info("Loading PKCS11 device configuration from {}", filename);
 
-        try (InputStream is = Pkcs11Test.class.getClassLoader().getResourceAsStream(filename)) {
+        try (InputStream is
+                 = Resources.getResourceAsStream(filename, Pkcs11Test.class.getClassLoader())) {
             var properties = new Properties();
             properties.load(is);
 
@@ -64,4 +79,5 @@ private static String getRequiredProperty(Properties properties, String property
         return Optional.ofNullable(properties.getProperty(property))
             .orElseThrow(() -> new IllegalArgumentException("Required property '" + property + "' not found"));
     }
+
 }

cdoc2-lib/src/test/java/ee/cyber/cdoc2/crypto/Pkcs11Test.java

@@ -30,7 +30,7 @@
 class Pkcs11Test {
     private static final Logger log = LoggerFactory.getLogger(Pkcs11Test.class);
 
-    // load pkcs11 devive properties
+    // load pkcs11 device properties
     private static final Pkcs11DeviceConfiguration CONF = Pkcs11DeviceConfiguration.load();
 
     @Test

cdoc2-lib/src/test/resources/pkcs11-test-idcard.properties

@@ -2,9 +2,9 @@
 
 pkcs11.library=/usr/lib/x86_64-linux-gnu/opensc-pkcs11.so
 pkcs11.slot=0
-# pin
-pkcs11.pin=3471
+# ID card pin 1
+pkcs11.pin=1357
 # key alias in the key store
 pkcs11.key-alias=Isikutuvastus
 # part of the CN in the certificate to match
-pkcs11.cert.cn=37101010021
+pkcs11.cert.cn=38001085718

pom.xml

@@ -220,7 +220,6 @@
         </dependencies>
     </dependencyManagement>
 
-
     <dependencies>
         <dependency>
             <groupId>org.junit.jupiter</groupId>