34 files changed, 18 insertions, 11 deletions

diff --git a/src/main/java/at/gv/egiz/moazs/config/MoaSigConfig.java b/src/main/java/at/gv/egiz/moazs/config/MoaSigConfig.java
index e02c11d..c2f06c2 100644
--- a/src/main/java/at/gv/egiz/moazs/config/MoaSigConfig.java
+++ b/src/main/java/at/gv/egiz/moazs/config/MoaSigConfig.java
@@ -13,6 +13,7 @@ import org.springframework.context.annotation.Configuration;
 
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.util.function.Consumer;
 
 
@@ -36,7 +37,7 @@ public class MoaSigConfig {
                         @Value("${javax.net.ssl.keyStoreType}") String keyStoreType,
                         @Value("${moa.spss.server.default-trustprofile}") String defaultTrustProfile,
                         @Value("${moa.spss.server.configuration}") String spssConfigFilePath,
-                        @Autowired FileUtils fileUtils) throws FileNotFoundException {
+                        @Autowired FileUtils fileUtils) throws IOException {
         this.trustStoreType = trustStoreType;
         this.keyStoreType = keyStoreType;
         this.defaultTrustProfile = defaultTrustProfile;
@@ -46,18 +47,19 @@ public class MoaSigConfig {
         fallBackToSpringEnvForJavaxNetSSLStoreTypeProperty();
     }
 
-    private void fallBackToSpringEnvForMoaSPSSConfigProperty() throws FileNotFoundException {
+    private void fallBackToSpringEnvForMoaSPSSConfigProperty() throws IOException {
         log.info("value of spssConfigFilePath is {}", spssConfigFilePath);
 
         if(System.getProperty(MOA_SPSS_CONFIG_FILE_PROPERTY) == null) {
-            var realPath = fileUtils.determinePath(spssConfigFilePath);
-            var realFile = new File(realPath);
+
+            var realFile = new File(fileUtils.determinePath(spssConfigFilePath));
+            log.info("spssConfigFilePath.getCanonicalPath(): ", realFile.getCanonicalPath());
 
             if(realFile.exists() && realFile.canRead()) {
-                log.info(SET_PROPERTY_MSG_TEMPLATE, MOA_SPSS_CONFIG_FILE_PROPERTY, realPath);
-                System.getProperties().setProperty(MOA_SPSS_CONFIG_FILE_PROPERTY, realPath);
+                log.info(SET_PROPERTY_MSG_TEMPLATE, MOA_SPSS_CONFIG_FILE_PROPERTY, realFile.getCanonicalPath());
+                System.getProperties().setProperty(MOA_SPSS_CONFIG_FILE_PROPERTY, realFile.getCanonicalPath());
             } else {
-                throw new FileNotFoundException("File '" + realPath + "' does not exist or is not readable.");
+                throw new FileNotFoundException("File '" + realFile.getCanonicalPath() + "' does not exist or is not readable.");
             }
         }
     }
diff --git a/src/main/java/at/gv/egiz/moazs/util/FileUtils.java b/src/main/java/at/gv/egiz/moazs/util/FileUtils.java
index 7e7723d..eb1b291 100644
--- a/src/main/java/at/gv/egiz/moazs/util/FileUtils.java
+++ b/src/main/java/at/gv/egiz/moazs/util/FileUtils.java
@@ -8,7 +8,7 @@ import java.io.File;
 public class FileUtils {
 
     /**
-     * If path is relative, resolve path as classpath resource. If path is absolute,
+     * If path is relative, try to resolve path as classpath resource. If path is absolute,
      * leave as-is.
      */
     public String determinePath(String abstractPath) {
@@ -16,7 +16,8 @@ public class FileUtils {
             return abstractPath;
         } else {
             //java.lang.Class needs relative resources to start with "/"
-            return this.getClass().getResource("/" + abstractPath).getFile();
+            var resource = this.getClass().getResource("/" + abstractPath);
+            return resource == null ? abstractPath : resource.getFile();
         }
     }
 }
diff --git a/src/main/resources/application.yaml b/src/test/resources/config/application.yaml
index 0380cf5..0042cbd 100644
--- a/src/main/resources/application.yaml
+++ b/src/test/resources/config/application.yaml
@@ -1,4 +1,8 @@
 # Optional
+#server:
+  #port: 8080
+
+# Optional
 logging:
   level:
     root: WARN
@@ -136,7 +140,7 @@ delivery-request-configuration-profiles:
         ## Parameters for ssl client auth
         keystore:
           ## Path to file
-          filename: ssl/client.cert.key.p12
+          filename: config/ssl/client.cert.key.p12
           ## Password to unlock key store.
           password: 123456
           ## JKS or PKCS12
@@ -166,7 +170,7 @@ moa.spss:
     # Path that points to MoaSPSSConfiguration file; can be:
     # - absolute path (unix: starts with /), or
     # - relative path (otherwise, relative to application's class path)
-    configuration: moa-spss/MOASPSSConfiguration.xml
+    configuration: config/moa-spss/MOASPSSConfiguration.xml
 
     # Mandatory
     # Select, which trust-profile moa spss uses to verify a signature.
diff --git a/src/main/resources/logback_config.xml b/src/test/resources/config/logback_config.xml
index 03c3834..03c3834 100644
--- a/src/main/resources/logback_config.xml
+++ b/src/test/resources/config/logback_config.xml
diff --git a/src/main/resources/moa-spss/MOASPSSConfiguration.xml b/src/test/resources/config/moa-spss/MOASPSSConfiguration.xml
index d2425b4..d2425b4 100644
--- a/src/main/resources/moa-spss/MOASPSSConfiguration.xml
+++ b/src/test/resources/config/moa-spss/MOASPSSConfiguration.xml
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Qual-01-20140701-20240701.SerNo144ddd(SecureSignatureKeypair).cer b/src/test/resources/config/moa-spss/certstore/toBeAdded/A-Trust-Qual-01-20140701-20240701.SerNo144ddd(SecureSignatureKeypair).cer
index eb051dc..eb051dc 100644
--- a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Qual-01-20140701-20240701.SerNo144ddd(SecureSignatureKeypair).cer
+++ b/src/test/resources/config/moa-spss/certstore/toBeAdded/A-Trust-Qual-01-20140701-20240701.SerNo144ddd(SecureSignatureKeypair).cer
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Qual-02-20140701-20240701.SerNo144de4(SecureSignatureKeypair).cer b/src/test/resources/config/moa-spss/certstore/toBeAdded/A-Trust-Qual-02-20140701-20240701.SerNo144de4(SecureSignatureKeypair).cer
index be29fb6..be29fb6 100644
--- a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Qual-02-20140701-20240701.SerNo144de4(SecureSignatureKeypair).cer
+++ b/src/test/resources/config/moa-spss/certstore/toBeAdded/A-Trust-Qual-02-20140701-20240701.SerNo144de4(SecureSignatureKeypair).cer
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Qual-03-20140701-20240701.SerNo144df5(SecureSignatureKeypair).cer b/src/test/resources/config/moa-spss/certstore/toBeAdded/A-Trust-Qual-03-20140701-20240701.SerNo144df5(SecureSignatureKeypair).cer
index e1100c7..e1100c7 100644
--- a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Qual-03-20140701-20240701.SerNo144df5(SecureSignatureKeypair).cer
+++ b/src/test/resources/config/moa-spss/certstore/toBeAdded/A-Trust-Qual-03-20140701-20240701.SerNo144df5(SecureSignatureKeypair).cer
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Root-05.20130923-20230920.SerNoFCDB4.cer b/src/test/resources/config/moa-spss/certstore/toBeAdded/A-Trust-Root-05.20130923-20230920.SerNoFCDB4.cer
index b9a0e5a..b9a0e5a 100644
--- a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Root-05.20130923-20230920.SerNoFCDB4.cer
+++ b/src/test/resources/config/moa-spss/certstore/toBeAdded/A-Trust-Root-05.20130923-20230920.SerNoFCDB4.cer
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Test-Root-05-20141215-20241209.SerNo165fae.crt b/src/test/resources/config/moa-spss/certstore/toBeAdded/A-Trust-Test-Root-05-20141215-20241209.SerNo165fae.crt
index 9befb53..9befb53 100644
--- a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-Test-Root-05-20141215-20241209.SerNo165fae.crt
+++ b/src/test/resources/config/moa-spss/certstore/toBeAdded/A-Trust-Test-Root-05-20141215-20241209.SerNo165fae.crt
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-nQual-01-20140701-20240701.SerNo144dc3(CertifiedKeypair).cer b/src/test/resources/config/moa-spss/certstore/toBeAdded/A-Trust-nQual-01-20140701-20240701.SerNo144dc3(CertifiedKeypair).cer
index e90f5f2..e90f5f2 100644
--- a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-nQual-01-20140701-20240701.SerNo144dc3(CertifiedKeypair).cer
+++ b/src/test/resources/config/moa-spss/certstore/toBeAdded/A-Trust-nQual-01-20140701-20240701.SerNo144dc3(CertifiedKeypair).cer
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-nQual-03-20140723-20250723.SerNo14b4f9.cer b/src/test/resources/config/moa-spss/certstore/toBeAdded/A-Trust-nQual-03-20140723-20250723.SerNo14b4f9.cer
index 2284687..2284687 100644
--- a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-nQual-03-20140723-20250723.SerNo14b4f9.cer
+++ b/src/test/resources/config/moa-spss/certstore/toBeAdded/A-Trust-nQual-03-20140723-20250723.SerNo14b4f9.cer
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer b/src/test/resources/config/moa-spss/certstore/toBeAdded/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer
index 33e7763..33e7763 100644
--- a/src/main/resources/moa-spss/certstore/toBeAdded/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer
+++ b/src/test/resources/config/moa-spss/certstore/toBeAdded/A-Trust-nQual-03.20050817-20150817.SerNo016c1e.cer
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/IAIK_test_intermediate_CA.der b/src/test/resources/config/moa-spss/certstore/toBeAdded/IAIK_test_intermediate_CA.der
index 558ce15..558ce15 100644
--- a/src/main/resources/moa-spss/certstore/toBeAdded/IAIK_test_intermediate_CA.der
+++ b/src/test/resources/config/moa-spss/certstore/toBeAdded/IAIK_test_intermediate_CA.der
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-Premium-Test-Sig-02.20141124-20241118.SerNo3969edc1.cer b/src/test/resources/config/moa-spss/certstore/toBeAdded/a-sign-Premium-Test-Sig-02.20141124-20241118.SerNo3969edc1.cer
index 1bb4494..1bb4494 100644
--- a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-Premium-Test-Sig-02.20141124-20241118.SerNo3969edc1.cer
+++ b/src/test/resources/config/moa-spss/certstore/toBeAdded/a-sign-Premium-Test-Sig-02.20141124-20241118.SerNo3969edc1.cer
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-Premium-enc-02.20140701-20240701.SerNo144dfd.cer b/src/test/resources/config/moa-spss/certstore/toBeAdded/a-sign-Premium-enc-02.20140701-20240701.SerNo144dfd.cer
index 6c0c042..6c0c042 100644
--- a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-Premium-enc-02.20140701-20240701.SerNo144dfd.cer
+++ b/src/test/resources/config/moa-spss/certstore/toBeAdded/a-sign-Premium-enc-02.20140701-20240701.SerNo144dfd.cer
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-SSL-03.20140723-20240723.SerNo14b4fd.cer b/src/test/resources/config/moa-spss/certstore/toBeAdded/a-sign-SSL-03.20140723-20240723.SerNo14b4fd.cer
index 04627da..04627da 100644
--- a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-SSL-03.20140723-20240723.SerNo14b4fd.cer
+++ b/src/test/resources/config/moa-spss/certstore/toBeAdded/a-sign-SSL-03.20140723-20240723.SerNo14b4fd.cer
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-SSL-03.cer b/src/test/resources/config/moa-spss/certstore/toBeAdded/a-sign-SSL-03.cer
index a699436..a699436 100644
--- a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-SSL-03.cer
+++ b/src/test/resources/config/moa-spss/certstore/toBeAdded/a-sign-SSL-03.cer
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-Test-Premium-Sig-05.20141215-20141209.SerNo165fb8.crt b/src/test/resources/config/moa-spss/certstore/toBeAdded/a-sign-Test-Premium-Sig-05.20141215-20141209.SerNo165fb8.crt
index ee17cdb..ee17cdb 100644
--- a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-Test-Premium-Sig-05.20141215-20141209.SerNo165fb8.crt
+++ b/src/test/resources/config/moa-spss/certstore/toBeAdded/a-sign-Test-Premium-Sig-05.20141215-20141209.SerNo165fb8.crt
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer b/src/test/resources/config/moa-spss/certstore/toBeAdded/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer
index 60bc9a5..60bc9a5 100644
--- a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer
+++ b/src/test/resources/config/moa-spss/certstore/toBeAdded/a-sign-Test-Qual-01.20141117-20241111.SerNo16120f.cer
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-corporate-light-02.20140905-20240905.SerNo153B49.cer b/src/test/resources/config/moa-spss/certstore/toBeAdded/a-sign-corporate-light-02.20140905-20240905.SerNo153B49.cer
index e4bd48d..e4bd48d 100644
--- a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-corporate-light-02.20140905-20240905.SerNo153B49.cer
+++ b/src/test/resources/config/moa-spss/certstore/toBeAdded/a-sign-corporate-light-02.20140905-20240905.SerNo153B49.cer
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-premium-sig-02.20140701-20240701.SerNo144e10.cer b/src/test/resources/config/moa-spss/certstore/toBeAdded/a-sign-premium-sig-02.20140701-20240701.SerNo144e10.cer
index 74c4ce3..74c4ce3 100644
--- a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-premium-sig-02.20140701-20240701.SerNo144e10.cer
+++ b/src/test/resources/config/moa-spss/certstore/toBeAdded/a-sign-premium-sig-02.20140701-20240701.SerNo144e10.cer
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-premium-sig-03.20140701-20240701.SerNo144e13.cer b/src/test/resources/config/moa-spss/certstore/toBeAdded/a-sign-premium-sig-03.20140701-20240701.SerNo144e13.cer
index 6c50ec0..6c50ec0 100644
--- a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-premium-sig-03.20140701-20240701.SerNo144e13.cer
+++ b/src/test/resources/config/moa-spss/certstore/toBeAdded/a-sign-premium-sig-03.20140701-20240701.SerNo144e13.cer
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-test-premium-Enc-05.20141215-20141209.SerNo165fb7.crt b/src/test/resources/config/moa-spss/certstore/toBeAdded/a-sign-test-premium-Enc-05.20141215-20141209.SerNo165fb7.crt
index 9ea6d0c..9ea6d0c 100644
--- a/src/main/resources/moa-spss/certstore/toBeAdded/a-sign-test-premium-Enc-05.20141215-20141209.SerNo165fb7.crt
+++ b/src/test/resources/config/moa-spss/certstore/toBeAdded/a-sign-test-premium-Enc-05.20141215-20141209.SerNo165fb7.crt
diff --git a/src/main/resources/moa-spss/certstore/toBeAdded/atrust_OCSP_Responder_03-1.crt b/src/test/resources/config/moa-spss/certstore/toBeAdded/atrust_OCSP_Responder_03-1.crt
index ebfbce9..ebfbce9 100644
--- a/src/main/resources/moa-spss/certstore/toBeAdded/atrust_OCSP_Responder_03-1.crt
+++ b/src/test/resources/config/moa-spss/certstore/toBeAdded/atrust_OCSP_Responder_03-1.crt
diff --git a/src/main/resources/moa-spss/trustProfiles/test-trustprofile/IAIK_test_intermediate_CA.der b/src/test/resources/config/moa-spss/trustProfiles/test-trustprofile/IAIK_test_intermediate_CA.der
index 558ce15..558ce15 100644
--- a/src/main/resources/moa-spss/trustProfiles/test-trustprofile/IAIK_test_intermediate_CA.der
+++ b/src/test/resources/config/moa-spss/trustProfiles/test-trustprofile/IAIK_test_intermediate_CA.der
diff --git a/src/main/resources/ssl/client.cert.key.p12 b/src/test/resources/config/ssl/client.cert.key.p12
index f3becbf..f3becbf 100644
--- a/src/main/resources/ssl/client.cert.key.p12
+++ b/src/test/resources/config/ssl/client.cert.key.p12
diff --git a/src/main/resources/ssl/server/ca-chain.cert.pem b/src/test/resources/config/ssl/server/ca-chain.cert.pem
index 56953f0..56953f0 100644
--- a/src/main/resources/ssl/server/ca-chain.cert.pem
+++ b/src/test/resources/config/ssl/server/ca-chain.cert.pem
diff --git a/src/main/resources/ssl/server/server.localhost.cert.pem b/src/test/resources/config/ssl/server/server.localhost.cert.pem
index 2ecd8e1..2ecd8e1 100644
--- a/src/main/resources/ssl/server/server.localhost.cert.pem
+++ b/src/test/resources/config/ssl/server/server.localhost.cert.pem
diff --git a/src/main/resources/ssl/server/server.localhost.key.pem b/src/test/resources/config/ssl/server/server.localhost.key.pem
index d9f7bc2..d9f7bc2 100644
--- a/src/main/resources/ssl/server/server.localhost.key.pem
+++ b/src/test/resources/config/ssl/server/server.localhost.key.pem
diff --git a/src/main/resources/ssl/server/server.localhost.key.pem.password b/src/test/resources/config/ssl/server/server.localhost.key.pem.password
index 22166b6..22166b6 100644
--- a/src/main/resources/ssl/server/server.localhost.key.pem.password
+++ b/src/test/resources/config/ssl/server/server.localhost.key.pem.password
diff --git a/src/main/resources/ssl/trusted-cas-bundle.pem b/src/test/resources/config/ssl/trusted-cas-bundle.pem
index cb3f138..cb3f138 100644
--- a/src/main/resources/ssl/trusted-cas-bundle.pem
+++ b/src/test/resources/config/ssl/trusted-cas-bundle.pem
diff --git a/src/main/resources/ssl/truststore.jks b/src/test/resources/config/ssl/truststore.jks
index 3f90814..3f90814 100644
--- a/src/main/resources/ssl/truststore.jks
+++ b/src/test/resources/config/ssl/truststore.jks
diff --git a/src/main/resources/ssl/truststore.p12 b/src/test/resources/config/ssl/truststore.p12
index 67eb611..67eb611 100644
--- a/src/main/resources/ssl/truststore.p12
+++ b/src/test/resources/config/ssl/truststore.p12