set default folder ./smp

smp-docker/images/tomcat-mysql/Dockerfile

@@ -54,6 +54,8 @@ RUN apt-get update \
     && echo "datasource.jndi=java:comp/env/jdbc/eDeliverySmpDs" >  $SMP_HOME/apache-tomcat-$TOMCAT_VERSION/smp/conf/smp.config.properties   \
     && echo "\nAdd init parameters" >>  $SMP_HOME/apache-tomcat-$TOMCAT_VERSION/smp/conf/smp.config.properties   \
     && echo "\nauthentication.blueCoat.enabled=true" >>  $SMP_HOME/apache-tomcat-$TOMCAT_VERSION/smp/conf/smp.config.properties  \
+    && echo "\nsmp.truststore.password={DEC}{test123}" >>  $SMP_HOME/apache-tomcat-$TOMCAT_VERSION/smp/conf/smp.config.properties  \
+    && echo "\nsmp.keystore.password={DEC}{test123}" >>  $SMP_HOME/apache-tomcat-$TOMCAT_VERSION/smp/conf/smp.config.properties  \
     && sed -i -e "s/127.0.0.1/0.0.0.0/g" /etc/mysql/mysql.conf.d/mysqld.cnf   \
     && mkdir /opt/jacoco  \
     && curl -o /opt/jacoco/jacoco-agent.jar http://central.maven.org/maven2/org/jacoco/org.jacoco.agent/$JACOCO_VERSION/org.jacoco.agent-$JACOCO_VERSION-runtime.jar

smp-docker/images/weblogic-12.2.1.3-smp/container-scripts/deploySMPToDomain.sh

@@ -10,9 +10,11 @@ fi
 
 # create smp property file
 echo "hibernate.dialect=org.hibernate.dialect.Oracle10gDialect" > "$DOMAIN_HOME/classes/smp.config.properties"
-echo "datasource.jndi=jdbc/cipaeDeliveryDs" >> "$DOMAIN_HOME/classes/smp.config.properties"
-echo "authentication.blueCoat.enabled=true" >> "$DOMAIN_HOME/classes/smp.config.properties"
-echo "log.folder=./logs/" >> "$DOMAIN_HOME/classes/smp.config.properties"
+echo "\ndatasource.jndi=jdbc/cipaeDeliveryDs" >> "$DOMAIN_HOME/classes/smp.config.properties"
+echo "\nauthentication.blueCoat.enabled=true" >> "$DOMAIN_HOME/classes/smp.config.properties"
+echo "\nsmp.truststore.password={DEC}{test123}" >> "$DOMAIN_HOME/classes/smp.config.properties"
+echo "\nsmp.keystore.password={DEC}{test123}" >> "$DOMAIN_HOME/classes/smp.config.properties"
+echo "\nlog.folder=./logs/" >> "$DOMAIN_HOME/classes/smp.config.properties"
 
 # create weblogic classpath to classes folder
 echo "export CLASSPATH=\${CLASSPATH}:\${DOMAIN_HOME}/classes" >> "$DOMAIN_HOME/bin/setDomainEnv.sh"

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/PropertyInitialization.java

@@ -187,7 +187,7 @@ public class PropertyInitialization {
         if (sigPath != null) {
             settingsFolder = new File(sigPath).getParentFile();
         } else {
-            settingsFolder = new File("");
+            settingsFolder = new File(CONFIGURATION_DIR.getDefValue());
         }
         return settingsFolder;
     }
@@ -360,9 +360,16 @@ public class PropertyInitialization {
         } else {
             File settingsFolder = calculateSettingsPath(fileProperties);
             // set absolute path
+
             absolutePath = settingsFolder.getAbsolutePath();
         }
 
+        File confFolder = new File(absolutePath);
+        if (!confFolder.exists()) {
+            LOG.warn("Configuration folder {} not exists. Folder will be created!", confFolder.getAbsolutePath());
+            confFolder.mkdirs();
+        }
+
         LOG.info("Generate new keystore to folder: " + absolutePath);
         // add configuration path
         storeDBEntry(em, CONFIGURATION_DIR, absolutePath);

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/SMPPropertyEnum.java

@@ -43,7 +43,7 @@ public enum SMPPropertyEnum {
     TRUSTSTORE_FILENAME("smp.truststore.filename","","Truststore filename ", false, false , SMPPropertyTypeEnum.FILENAME),
     CERTIFICATE_CRL_FORCE("smp.certificate.crl.force","false","If false then if CRL is not reachable ignore CRL validation", false, false , SMPPropertyTypeEnum.BOOLEAN),
 
-    CONFIGURATION_DIR("configuration.dir","./","Path to the folder containing all the configuration files (keystore and encryption key)", true, false , SMPPropertyTypeEnum.PATH),
+    CONFIGURATION_DIR("configuration.dir","smp","Path to the folder containing all the configuration files (keystore and encryption key)", true, false , SMPPropertyTypeEnum.PATH),
     ENCRYPTION_FILENAME("encryption.key.filename","encryptionPrivateKey.private","Key filename to encrypt passwords", false, false , SMPPropertyTypeEnum.FILENAME),
     KEYSTORE_PASSWORD_DECRYPTED("smp.keystore.password.decrypted","","Only for backup purposes when  password is automatically created. Store password somewhere save and delete this entry!", false, false , SMPPropertyTypeEnum.STRING),
     TRUSTSTORE_PASSWORD_DECRYPTED("smp.truststore.password.decrypted","","Only for backup purposes when  password is automatically created. Store password somewhere save and delete this entry!", false, false , SMPPropertyTypeEnum.STRING),

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/PropertyUtils.java

@@ -4,9 +4,12 @@ import eu.europa.ec.edelivery.smp.data.ui.enums.SMPPropertyEnum;
 import eu.europa.ec.edelivery.smp.data.ui.enums.SMPPropertyTypeEnum;
 import eu.europa.ec.edelivery.smp.exceptions.ErrorCode;
 import eu.europa.ec.edelivery.smp.exceptions.SMPRuntimeException;
+import eu.europa.ec.edelivery.smp.logging.SMPLogger;
+import eu.europa.ec.edelivery.smp.logging.SMPLoggerFactory;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.validator.routines.EmailValidator;
 import org.apache.commons.validator.routines.UrlValidator;
+import org.springframework.security.authentication.AuthenticationProvider;
 
 import java.io.File;
 import java.net.MalformedURLException;
@@ -17,6 +20,8 @@ import java.util.regex.PatternSyntaxException;
 
 public class PropertyUtils {
 
+
+    private static final SMPLogger LOG = SMPLoggerFactory.getLogger(PropertyUtils.class);
     private  static UrlValidator urlValidator =  new UrlValidator(new String[]{"http", "https"}, UrlValidator.ALLOW_LOCAL_URLS);
 
 
@@ -69,6 +74,12 @@ public class PropertyUtils {
                 }
             case PATH: {
                 File f = new File(value);
+                if (!f.exists()) {
+                    LOG.warn("Folder {} not exists. Try to create the folder.", f.getAbsolutePath());
+                    if (f.mkdirs()){
+                        LOG.info("Folder {} created.", f.getAbsolutePath());
+                    };
+                }
                 return f.exists() && f.isDirectory();
             }
             // nothing to validate

smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/PropertyInitializationTest.java

@@ -131,7 +131,7 @@ public class PropertyInitializationTest {
         // when
         File f = testInstance.calculateSettingsPath(p);
         // then
-        assertEquals((new File("")).getAbsolutePath(), f.getAbsolutePath());
+        assertEquals((new File("smp")).getAbsolutePath(), f.getAbsolutePath());
     }
 
     @Test

smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/PropertyUtilsTest.java

@@ -36,7 +36,7 @@ public class PropertyUtilsTest {
                 {EMAIL, "test@coms.fs", false, false},
                 {FILENAME, "myfilename.txt", true, true},
                 {PATH, "./", true, true},
-                {PATH, "./notexits-tst", false, true},
+                {PATH, "./notexits", true, true}, // path will be created
         };
     }
 

smp-webapp/src/main/smp-setup/smp.config.properties

@@ -134,7 +134,7 @@ log.folder=../logs/
 # smp.certificate.crl.force=false
 
 # Path to the folder containing all the configuration files (keystore and encryption key)
-# configuration.dir=./
+# configuration.dir=./smp/
 
 # Key filename to encrypt passwords
 # encryption.key.filename=encryptionPrivateKey.private