EDELIVERY-2302 Refactored some classes

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/CommonColumnsLengths.java

@@ -21,5 +21,4 @@ public class CommonColumnsLengths {
     public static final int MAX_PARTICIPANT_IDENTIFIER_VALUE_LENGTH = 50;
     public static final int MAX_DOCUMENT_TYPE_IDENTIFIER_VALUE_LENGTH = 500;
     public static final int MAX_USERNAME_LENGTH = 256;
-    public static final String URL_SCHEME_VALUE_SEPARATOR = "::";
 }

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBServiceMetadataId.java

@@ -32,9 +32,7 @@ public class DBServiceMetadataId implements Serializable {
     private String documentIdScheme;
     private String documentIdValue;
 
-    @Deprecated
-    public DBServiceMetadataId() {
-    }
+    public DBServiceMetadataId() {}
 
     public DBServiceMetadataId(String participantIdScheme,
                                String participantIdValue,

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/DocumentSigningException.java

+/*
+ * Copyright 2018 European Commission | CEF eDelivery
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and limitations under the Licence.
+ */
+
+package eu.europa.ec.edelivery.smp.exceptions;
+
+/**
+ * Technical issue with signing the document.
+ * <p>
+ * Created by gutowpa on 11/01/2018.
+ */
+public class DocumentSigningException extends RuntimeException {
+    public DocumentSigningException(String msg, Exception e) {
+        super(msg, e);
+    }
+}

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/sml/SmlIntegrationException.java → smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/SmlIntegrationException.java

 /*
- * Copyright 2017 European Commission | CEF eDelivery
+ * Copyright 2018 European Commission | CEF eDelivery
  *
- * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
  * You may not use this work except in compliance with the Licence.
  *
  * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
@@ -11,7 +11,7 @@
  * See the Licence for the specific language governing permissions and limitations under the Licence.
  */
 
-package eu.europa.ec.edelivery.smp.sml;
+package eu.europa.ec.edelivery.smp.exceptions;
 
 /**
  * Problem occurred when integrating with SML

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceMetadataSigner.java

@@ -12,6 +12,7 @@
  */
 package eu.europa.ec.edelivery.smp.services;
 
+import eu.europa.ec.edelivery.smp.exceptions.DocumentSigningException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -95,44 +96,44 @@ public final class ServiceMetadataSigner {
     @PostConstruct
     public void init() {
         // Load the KeyStore and get the signing key and certificate.
-        try {
+        try (InputStream keystoreInputStream = new FileInputStream(keystoreFilePath)) {
+
             KeyStore keyStore = KeyStore.getInstance("JKS");
-            InputStream keystoreInputStream = new FileInputStream(keystoreFilePath);
             keyStore.load(keystoreInputStream, keystorePassword.toCharArray());
 
             signingKey = keyStore.getKey(xmldsigKeystoreKeyAlias, xmldsigKeystoreKeyPassword.toCharArray());
             signingCertificate = (X509Certificate) keyStore.getCertificate(xmldsigKeystoreKeyAlias);
 
             log.info("Successfully loaded signing key and certificate: " + signingCertificate.getSubjectDN().getName());
-        } catch (final Exception e) {
+        } catch (Exception e) {
             throw new IllegalStateException("Could not load signing certificate with private key from keystore file: " + keystoreFilePath, e);
         }
     }
 
     public void sign(Document serviceMetadataDoc) {
 
-        try {
-            XMLSignatureFactory domSigFactory = getDomSigFactory();
+        XMLSignatureFactory domSigFactory = getDomSigFactory();
 
-            // Create a Reference to the ENVELOPED document
-            // URI "" means that the whole document is signed
-            Reference reference = domSigFactory.newReference("", DIGEST_METHOD_SHA_256, TRANSFORM_ENVELOPED, null, null);
+        // Create a Reference to the ENVELOPED document
+        // URI "" means that the whole document is signed
+        Reference reference = domSigFactory.newReference("", DIGEST_METHOD_SHA_256, TRANSFORM_ENVELOPED, null, null);
 
-            SignedInfo singedInfo = domSigFactory.newSignedInfo(C14N_METHOD_INCLUSIVE,
-                    SIGNATURE_METHOD_RSA_SHA256,
-                    Collections.singletonList(reference));
+        SignedInfo singedInfo = domSigFactory.newSignedInfo(C14N_METHOD_INCLUSIVE,
+                SIGNATURE_METHOD_RSA_SHA256,
+                Collections.singletonList(reference));
 
-            KeyInfo keyInfo = createKeyInfo();
+        KeyInfo keyInfo = createKeyInfo();
 
-            DOMSignContext domSignContext = new DOMSignContext(signingKey, serviceMetadataDoc.getDocumentElement());
+        DOMSignContext domSignContext = new DOMSignContext(signingKey, serviceMetadataDoc.getDocumentElement());
 
-            // Create the XMLSignature, but don't sign it yet
-            XMLSignature signature = domSigFactory.newXMLSignature(singedInfo, keyInfo);
+        // Create the XMLSignature, but don't sign it yet
+        XMLSignature signature = domSigFactory.newXMLSignature(singedInfo, keyInfo);
 
+        try {
             // Marshal, generate, and sign the enveloped signature
             signature.sign(domSignContext);
         } catch (Exception e) {
-            throw new RuntimeException("Could not sign serviceMetadata response", e);
+            throw new DocumentSigningException("Could not sign serviceMetadata response", e);
         }
     }
 
@@ -148,12 +149,15 @@ public final class ServiceMetadataSigner {
     public void setKeystoreFilePath(String keystoreFilePath) {
         this.keystoreFilePath = keystoreFilePath;
     }
+
     public void setKeystorePassword(String keystorePassword) {
         this.keystorePassword = keystorePassword;
     }
+
     public void setXmldsigKeystoreKeyAlias(String xmldsigKeystoreKeyAlias) {
         this.xmldsigKeystoreKeyAlias = xmldsigKeystoreKeyAlias;
     }
+
     public void setXmldsigKeystoreKeyPassword(String xmldsigKeystoreKeyPassword) {
         this.xmldsigKeystoreKeyPassword = xmldsigKeystoreKeyPassword;
     }

smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/sml/SmlConnector.java

@@ -14,6 +14,7 @@
 package eu.europa.ec.edelivery.smp.sml;
 
 import eu.europa.ec.bdmsl.ws.soap.IManageParticipantIdentifierWS;
+import eu.europa.ec.edelivery.smp.exceptions.SmlIntegrationException;
 import org.busdox.servicemetadata.locator._1.ServiceMetadataPublisherServiceForParticipantType;
 import org.oasis_open.docs.bdxr.ns.smp._2016._05.ParticipantIdentifierType;
 import org.slf4j.Logger;

smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/SignatureUtil.java

@@ -30,8 +30,6 @@ import javax.xml.crypto.dsig.keyinfo.KeyInfoFactory;
 import javax.xml.crypto.dsig.keyinfo.X509Data;
 import javax.xml.crypto.dsig.spec.C14NMethodParameterSpec;
 import javax.xml.crypto.dsig.spec.TransformParameterSpec;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
@@ -235,4 +233,5 @@ public class SignatureUtil {
         InputStream inputStream = SignatureUtil.class.getResourceAsStream(docResourcePath);
         return org.apache.commons.io.IOUtils.toString(inputStream, "UTF-8");
     }
+
 }

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

@@ -27,6 +27,7 @@ import org.springframework.transaction.PlatformTransactionManager;
 
 import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
+import java.util.Properties;
 
 /**
  * Created by gutowpa on 21/09/2017.
@@ -41,6 +42,8 @@ import javax.sql.DataSource;
 @PropertySource(value = "classpath:config.properties")
 public class SmpServicesTestConfig {
 
+    private final static String SIGNING_KEYSTORE_PATH = Thread.currentThread().getContextClassLoader().getResource("signature_keys.jks").getFile();
+
     @Value("${jdbc.driver}")
     private String driver;
 
@@ -55,7 +58,14 @@ public class SmpServicesTestConfig {
 
     @Bean
     public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
-        return new PropertySourcesPlaceholderConfigurer();
+        PropertySourcesPlaceholderConfigurer propertiesConfig = new PropertySourcesPlaceholderConfigurer();
+
+        Properties localProps = new Properties();
+        localProps.setProperty("xmldsig.keystore.classpath", SIGNING_KEYSTORE_PATH);
+        propertiesConfig.setProperties(localProps);
+        propertiesConfig.setLocalOverride(true);
+
+        return propertiesConfig;
     }
 
     @Bean