From 4fedfdec0293ebc807cbbba12bd5ba16eb4cc1f3 Mon Sep 17 00:00:00 2001
From: Joze RIHTARSIC <joze.rihtarsic@ext.ec.europa.eu>
Date: Thu, 10 Oct 2019 11:20:27 +0200
Subject: [PATCH] add unit tests
---
.../smp/ui/TruststoreResourceTest.java | 226 ++++++++++++++++++
.../resources/keystores/smp-truststore.jks | Bin 0 -> 32 bytes
.../webapp_integration_test_data.sql | 3 +
3 files changed, 229 insertions(+)
create mode 100644 smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/TruststoreResourceTest.java
create mode 100644 smp-webapp/src/test/resources/keystores/smp-truststore.jks
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/TruststoreResourceTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/TruststoreResourceTest.java
new file mode 100644
index 000000000..8b9ac9344
--- /dev/null
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/TruststoreResourceTest.java
@@ -0,0 +1,226 @@
+package eu.europa.ec.edelivery.smp.ui;
+
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import eu.europa.ec.edelivery.smp.config.PropertiesTestConfig;
+import eu.europa.ec.edelivery.smp.config.SmpAppConfig;
+import eu.europa.ec.edelivery.smp.config.SmpWebAppConfig;
+import eu.europa.ec.edelivery.smp.config.SpringSecurityConfig;
+import eu.europa.ec.edelivery.smp.data.ui.CertificateRO;
+import eu.europa.ec.edelivery.smp.data.ui.KeystoreImportResult;
+import eu.europa.ec.edelivery.smp.data.ui.ServiceResult;
+import eu.europa.ec.edelivery.smp.services.ui.UITruststoreService;
+import eu.europa.ec.edelivery.smp.testutils.X509CertificateTestUtils;
+import org.apache.commons.io.IOUtils;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.mock.web.MockServletContext;
+import org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.jdbc.Sql;
+import org.springframework.test.context.jdbc.SqlConfig;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.request.RequestPostProcessor;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.ContextLoaderListener;
+import org.springframework.web.context.WebApplicationContext;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.*;
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = {
+ PropertiesTestConfig.class,
+ SmpAppConfig.class,
+ SmpWebAppConfig.class,
+ SpringSecurityConfig.class})
+@WebAppConfiguration
+@SqlConfig(encoding = "UTF-8")
+@Sql(scripts = {"classpath:cleanup-database.sql",
+ "classpath:webapp_integration_test_data.sql"
+}, executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
+public class TruststoreResourceTest {
+ private static final String PATH = "/ui/rest/truststore";
+
+ Path keystore = Paths.get("src", "test", "resources", "keystores", "smp-keystore.jks");
+
+
+ @Autowired
+ private WebApplicationContext webAppContext;
+
+ @Autowired
+ private UITruststoreService uiTruststoreService;
+
+ private MockMvc mvc;
+ private static final RequestPostProcessor SYSTEM_CREDENTIALS = httpBasic("sys_admin", "test123");
+
+ @Before
+ public void setup() throws IOException {
+ X509CertificateTestUtils.reloadKeystores();
+
+ mvc = MockMvcBuilders.webAppContextSetup(webAppContext)
+ .apply(SecurityMockMvcConfigurers.springSecurity())
+ .build();
+
+
+ initServletContext();
+ uiTruststoreService.refreshData();
+ }
+
+ private void initServletContext() {
+ MockServletContext sc = new MockServletContext("");
+ ServletContextListener listener = new ContextLoaderListener(webAppContext);
+ ServletContextEvent event = new ServletContextEvent(sc);
+ }
+
+ @Test
+ public void getCertificateList() throws Exception {
+ // given when
+ int countStart = uiTruststoreService.getCertificateROEntriesList().size();
+ MvcResult result = mvc.perform(get(PATH).with(SYSTEM_CREDENTIALS)).
+ andExpect(status().isOk()).andReturn();
+
+ //them
+ ObjectMapper mapper = new ObjectMapper();
+ ServiceResult res = mapper.readValue(result.getResponse().getContentAsString(), ServiceResult.class);
+
+
+ assertNotNull(res);
+ assertEquals(countStart, res.getServiceEntities().size());
+ res.getServiceEntities().forEach(sgMap -> {
+ CertificateRO cert = mapper.convertValue(sgMap, CertificateRO.class);
+ assertNotNull(cert.getAlias());
+ assertNotNull(cert.getCertificateId());
+ assertNotNull(cert.getBlueCoatHeader());
+ assertNull(cert.getEncodedValue()); // submit only metadata
+ });
+ }
+
+
+
+ @Test
+ public void uploadCertificateSystemAdmin() throws Exception {
+ byte[] buff = IOUtils.toByteArray(UserResourceTest.class.getResourceAsStream("/SMPtest.crt"));
+
+ int countStart = uiTruststoreService.getNormalizedTrustedList().size();
+ // given when
+ MvcResult result = mvc.perform(post(PATH+"/3/certdata")
+ .with(SYSTEM_CREDENTIALS)
+ .content(buff))
+ .andExpect(status().isOk()).andReturn();
+
+ //then
+ ObjectMapper mapper = new ObjectMapper();
+ CertificateRO res = mapper.readValue(result.getResponse().getContentAsString(), CertificateRO.class);
+ assertEquals(countStart+1, uiTruststoreService.getNormalizedTrustedList().size());
+ assertNotNull(res);
+ assertEquals("CN=Intermediate CA,O=DIGIT,C=BE", res.getIssuer());
+ assertEquals("1.2.840.113549.1.9.1=#160c736d7040746573742e636f6d,CN=SMP test,O=DIGIT,C=BE", res.getSubject());
+ assertEquals("3", res.getSerialNumber());
+ assertEquals("CN=SMP test,O=DIGIT,C=BE:0000000000000003", res.getCertificateId());
+ assertEquals("sno=3&subject=1.2.840.113549.1.9.1%3D%23160c736d7040746573742e636f6d%2CCN%3DSMP+test%2CO%3DDIGIT%2CC%3DBE&validfrom=May+22+20%3A59%3A00+2018+GMT&validto=May+22+20%3A56%3A00+2019+GMT&issuer=CN%3DIntermediate+CA%2CO%3DDIGIT%2CC%3DBE", res.getBlueCoatHeader());
+ }
+
+ @Test
+ public void deleteCertificateSystemAdmin() throws Exception {
+ byte[] buff = IOUtils.toByteArray(UserResourceTest.class.getResourceAsStream("/SMPtest.crt"));
+
+ int countStart = uiTruststoreService.getNormalizedTrustedList().size();
+ MvcResult prepRes = mvc.perform(post(PATH+"/3/certdata")
+ .with(SYSTEM_CREDENTIALS)
+ .content(buff))
+ .andExpect(status().isOk()).andReturn();
+
+ // given when
+ ObjectMapper mapper = new ObjectMapper();
+ CertificateRO res = mapper.readValue(prepRes.getResponse().getContentAsString(), CertificateRO.class);
+ assertNotNull(res);
+ uiTruststoreService.refreshData();
+ assertEquals(countStart+1, uiTruststoreService.getNormalizedTrustedList().size());
+
+ // then
+ MvcResult result = mvc.perform(delete(PATH+"/3/delete/"+res.getAlias())
+ .with(SYSTEM_CREDENTIALS)
+ .content(buff))
+ .andExpect(status().isOk()).andReturn();
+ uiTruststoreService.refreshData();
+ assertEquals(countStart, uiTruststoreService.getNormalizedTrustedList().size());
+
+ }
+
+/*
+ @Test
+ public void uploadKeystoreOK() throws Exception {
+
+ int countStart = uiTruststoreService.getCertificateROEntriesList().size();
+ // given when
+ MvcResult result = mvc.perform(post(PATH+"/3/upload/JKS/test123")
+ .with(SYSTEM_CREDENTIALS)
+ .content(Files.readAllBytes(keystore)) )
+ .andExpect(status().isOk()).andReturn();
+
+ //them
+ ObjectMapper mapper = new ObjectMapper();
+ KeystoreImportResult res = mapper.readValue(result.getResponse().getContentAsString(), KeystoreImportResult.class);
+
+ assertNotNull(res);
+ assertNull(res.getErrorMessage());
+ assertEquals(countStart+1, uiTruststoreService.getCertificateROEntriesList().size());
+ }*/
+/*
+ @Test
+ public void deleteKeystoreEntryOK() throws Exception {
+
+ int countStart = uiTruststoreService.getKeystoreEntriesList().size();
+ // given when
+ MvcResult result = mvc.perform(delete(PATH+"/3/delete/second_domain_alias")
+ .with(SYSTEM_CREDENTIALS)
+ .content(Files.readAllBytes(keystore)) )
+ .andExpect(status().isOk()).andReturn();
+
+ //them
+ ObjectMapper mapper = new ObjectMapper();
+ KeystoreImportResult res = mapper.readValue(result.getResponse().getContentAsString(), KeystoreImportResult.class);
+
+ assertNotNull(res);
+ assertNull(res.getErrorMessage());
+ assertEquals(countStart-1, uiTruststoreService.getKeystoreEntriesList().size());
+ }
+*/
+
+ public List<CertificateRO> getCertificateFromEndpointList() throws Exception {
+ // given when
+ MvcResult result = mvc.perform(get(PATH).with(SYSTEM_CREDENTIALS)).
+ andExpect(status().isOk()).andReturn();
+
+ //them
+ ObjectMapper mapper = new ObjectMapper();
+ ServiceResult res = mapper.readValue(result.getResponse().getContentAsString(), ServiceResult.class);
+
+
+ List<CertificateRO> list = new ArrayList<>();
+ res.getServiceEntities().forEach(sgMap -> {
+ CertificateRO cert = mapper.convertValue(sgMap, CertificateRO.class);
+ list.add(cert);
+ assertNotNull(cert.getAlias());
+ });
+ return list;
+ }
+}
\ No newline at end of file
diff --git a/smp-webapp/src/test/resources/keystores/smp-truststore.jks b/smp-webapp/src/test/resources/keystores/smp-truststore.jks
new file mode 100644
index 0000000000000000000000000000000000000000..0382673c7bbfaa10fa00657b83014eabccc11151
GIT binary patch
literal 32
mcmezO_TO6u1_mY|X4n|JGQBS$+I5oJk;Xg|gR^O+k{$rn>I_`~
literal 0
HcmV?d00001
diff --git a/smp-webapp/src/test/resources/webapp_integration_test_data.sql b/smp-webapp/src/test/resources/webapp_integration_test_data.sql
index 104e17474..c56def449 100644
--- a/smp-webapp/src/test/resources/webapp_integration_test_data.sql
+++ b/smp-webapp/src/test/resources/webapp_integration_test_data.sql
@@ -13,6 +13,9 @@ insert into SMP_CONFIGURATION (PROPERTY, VALUE, CREATED_ON, LAST_UPDATED_ON) VAL
insert into SMP_CONFIGURATION (PROPERTY, VALUE, CREATED_ON, LAST_UPDATED_ON) VALUES ('encryption.key.filename','encryptionKey.key',CURRENT_TIMESTAMP(), CURRENT_TIMESTAMP());
insert into SMP_CONFIGURATION (PROPERTY, VALUE, CREATED_ON, LAST_UPDATED_ON) VALUES ('smp.keystore.password', 'FarFJE2WUfY39SVRTFOqSg==',CURRENT_TIMESTAMP(), CURRENT_TIMESTAMP());
insert into SMP_CONFIGURATION (PROPERTY, VALUE, CREATED_ON, LAST_UPDATED_ON) VALUES ('smp.keystore.filename', 'smp-keystore_multiple_domains.jks',CURRENT_TIMESTAMP(), CURRENT_TIMESTAMP());
+insert into SMP_CONFIGURATION (PROPERTY, VALUE, CREATED_ON, LAST_UPDATED_ON) VALUES ('smp.truststore.filename', 'smp-truststore.jks',CURRENT_TIMESTAMP(), CURRENT_TIMESTAMP());
+insert into SMP_CONFIGURATION (PROPERTY, VALUE, CREATED_ON, LAST_UPDATED_ON) VALUES ('smp.truststore.password', '{DEC}{test123}',CURRENT_TIMESTAMP(), CURRENT_TIMESTAMP());
+
insert into SMP_CONFIGURATION (PROPERTY, VALUE, CREATED_ON, LAST_UPDATED_ON) VALUES ('contextPath.output', 'true',CURRENT_TIMESTAMP(), CURRENT_TIMESTAMP());
insert into SMP_CONFIGURATION (PROPERTY, VALUE, CREATED_ON, LAST_UPDATED_ON) VALUES ('cbdmsl.integration.physical.address', '0.0.0.0',CURRENT_TIMESTAMP(), CURRENT_TIMESTAMP());
--
GitLab