Merge branch 'RM-4814_cleanup_configuration' into 'SID'

RM-4814: clean-up configuration and properties loading

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

Author: jann0k

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

@@ -3,12 +3,14 @@
 import ee.cyber.cdoc2.cli.util.InteractiveCommunicationUtil;
 import ee.cyber.cdoc2.cli.util.LabeledPasswordParamConverter;
 import ee.cyber.cdoc2.cli.util.LabeledPasswordParam;
+import ee.cyber.cdoc2.client.KeyShareClientFactory;
 import ee.cyber.cdoc2.crypto.keymaterial.LabeledPassword;
 import ee.cyber.cdoc2.crypto.keymaterial.LabeledSecret;
 import ee.cyber.cdoc2.cli.util.LabeledSecretConverter;
 import ee.cyber.cdoc2.cli.util.CliConstants;
 import ee.cyber.cdoc2.CDocBuilder;
 import ee.cyber.cdoc2.crypto.keymaterial.EncryptionKeyMaterial;
+import ee.cyber.cdoc2.services.Cdoc2Services;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import picocli.CommandLine;
@@ -29,8 +31,6 @@
 import javax.naming.NamingException;
 
 import static ee.cyber.cdoc2.cli.util.CDocCommonHelper.getServerProperties;
-import static ee.cyber.cdoc2.cli.util.CDocCommonHelper.initKeyShareClientFactory;
-
 
 //S106 - Standard outputs should not be used directly to log anything
 //CLI needs to interact with standard outputs
@@ -194,7 +194,9 @@ private void addEtsiRecipientsIfAny(
     ) throws GeneralSecurityException, NamingException {
 
         if (isWithSid() || isWithMid()) {
-            cDocBuilder.withKeyShares(initKeyShareClientFactory());
+            KeyShareClientFactory keyShareClientFactory =
+                Cdoc2Services.initFromSystemProperties().get(KeyShareClientFactory.class);
+            cDocBuilder.withKeyShares(keyShareClientFactory);
         }
 
         List<EncryptionKeyMaterial> etsiRecipients = EncryptionKeyMaterial.etsiBuilder()

cdoc2-cli/src/main/java/ee/cyber/cdoc2/cli/util/CDocCommonHelper.java

@@ -1,21 +1,10 @@
 package ee.cyber.cdoc2.cli.util;
 
 import java.io.IOException;
-import java.security.GeneralSecurityException;
 import java.util.Properties;
 
-import ee.cyber.cdoc2.client.KeyShareClientFactory;
-import ee.cyber.cdoc2.client.KeySharesClientHelper;
-import ee.cyber.cdoc2.config.CDoc2ConfigurationProvider;
-import ee.cyber.cdoc2.config.Cdoc2Configuration;
-import ee.cyber.cdoc2.config.KeySharesConfiguration;
-import ee.cyber.cdoc2.config.KeySharesConfigurationImpl;
-import ee.cyber.cdoc2.exceptions.ConfigurationLoadingException;
 import ee.cyber.cdoc2.util.Resources;
 
-import static ee.cyber.cdoc2.config.Cdoc2ConfigurationProperties.KEY_SHARES_PROPERTIES;
-import static ee.cyber.cdoc2.config.PropertiesLoader.loadProperties;
-
 
 /**
  * Helper class for common usage.
@@ -29,24 +18,4 @@ public static Properties getServerProperties(String keyServerPropertiesFile) thr
         p.load(Resources.getResourceAsStream(keyServerPropertiesFile));
         return p;
     }
-
-    public static KeyShareClientFactory initKeyShareClientFactory() throws GeneralSecurityException {
-        return KeySharesClientHelper.createFactory(loadKeySharesConfiguration());
-    }
-
-    private static KeySharesConfiguration loadKeySharesConfiguration() {
-        String propertiesFilePath = System.getProperty(
-            KEY_SHARES_PROPERTIES,
-            "config/localhost/" + KEY_SHARES_PROPERTIES
-        );
-        if (null == propertiesFilePath) {
-            throw new ConfigurationLoadingException("Key Shares configuration property is missing");
-        }
-
-        Properties properties = loadProperties(propertiesFilePath);
-        Cdoc2Configuration configuration = new KeySharesConfigurationImpl(properties);
-        CDoc2ConfigurationProvider.initKeyShareClientConfig(configuration);
-
-        return configuration.keySharesConfiguration();
-    }
 }

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

@@ -147,6 +147,7 @@ private void validate() {
     }
 
     ee.cyber.cdoc2.client.api.ApiClient createApiClient() throws GeneralSecurityException {
+
         validate();
 
         final SSLContext finalSslContext = createSslContext();

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

@@ -10,6 +10,7 @@ public class KeySharesClientBuilder extends ApiClientBuilder {
 
     /**
      * {@link Cdoc2KeySharesApiClient} builder
+     * @throws GeneralSecurityException when establishing TLS connection fails
      */
     public Cdoc2KeySharesApiClient build() throws GeneralSecurityException {
         ee.cyber.cdoc2.client.api.ApiClient apiClient = this.createApiClient();

cdoc2-lib/src/main/java/ee/cyber/cdoc2/CDocBuilder.java

@@ -6,11 +6,8 @@
 import ee.cyber.cdoc2.client.ExtApiException;
 import ee.cyber.cdoc2.client.KeyCapsuleClient;
 import ee.cyber.cdoc2.client.KeyCapsuleClientImpl;
-import ee.cyber.cdoc2.config.CDoc2ConfigurationProvider;
-import ee.cyber.cdoc2.config.Cdoc2Configuration;
 import ee.cyber.cdoc2.config.Cdoc2ConfigurationProperties;
 import ee.cyber.cdoc2.config.KeyCapsuleClientConfiguration;
-import ee.cyber.cdoc2.config.KeyCapsuleClientConfigurationImpl;
 import ee.cyber.cdoc2.container.Envelope;
 import ee.cyber.cdoc2.crypto.Crypto;
 import ee.cyber.cdoc2.crypto.ECKeys;
@@ -144,7 +141,7 @@ private Envelope prepareEnvelope()
             return Envelope.prepare(recipients, null, keyShareClientFactory);
         } else {
             KeyCapsuleClientConfiguration capsuleClientConfig
-                = initializeCapsuleConfiguration(serverProperties);
+                = KeyCapsuleClientConfiguration.load(serverProperties);
             // for encryption, do not init mTLS client as this might require smart-card
            KeyCapsuleClient keyCapsuleClient
                = KeyCapsuleClientImpl.create(capsuleClientConfig, false);
@@ -159,12 +156,6 @@ private Envelope prepareEnvelope()
         }
     }
 
-    private static KeyCapsuleClientConfiguration initializeCapsuleConfiguration(Properties p) {
-        Cdoc2Configuration configuration = new KeyCapsuleClientConfigurationImpl(p);
-        CDoc2ConfigurationProvider.initKeyCapsuleClientConfig(configuration);
-        return configuration.keyCapsuleClientConfiguration();
-    }
-
     private void handleFileEncryptionError(Exception ex, File outputCDocFile) {
         log.info("Failed to create {}. Exception: {}", outputCDocFile, ex.getMessage());
 

cdoc2-lib/src/main/java/ee/cyber/cdoc2/client/KeySharesClientHelper.java

@@ -45,7 +45,6 @@ public static KeyShareClientFactory createFactory(KeySharesConfiguration configu
 
     @Override
     public Collection<KeySharesClient> getClients() {
-        // ToDo remove the collection of clients when multi servers are implemented
         return clients;
     }
 
@@ -74,8 +73,6 @@ private static KeySharesClientHelper initKeySharesClientByServer(
     ) throws GeneralSecurityException {
 
         Set<String> servers = configuration.getKeySharesServersUrls();
-        // ToDo create multithreading for servers here i.o. for loop. Create client instances with
-        //  own server URL
         Collection<KeySharesClient> keyShareClients = new LinkedList<>();
         for (String server : servers) {
             keyShareClients.add(KeySharesClientImpl.create(server, configuration));