Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit b6f39b38 authored by Joze RIHTARSIC's avatar Joze RIHTARSIC
Browse files

fix pull comments

parents aad1fa97 215a50d8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 23 additions and 31 deletions
smp-angular/src/app/user/user.component.ts
+ 0
− 3
View file @ b6f39b38
......@@ -76,9 +76,6 @@ export class UserComponent implements OnInit {
openEditTruststoreDialog() {
const formRef: MatDialogRef<any> = this.dialog.open(TruststoreEditDialogComponent);
formRef.afterClosed().subscribe(result => {
if (result) {
// close
}
});
}
}
smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/DatabaseProperties.java
+ 2
− 2
View file @ b6f39b38
......@@ -11,7 +11,7 @@ import java.util.List;
import java.util.Properties;
public class DatabaseProperties extends Properties {
SMPLogger LOG = SMPLoggerFactory.getLogger(PropertyInitialization.class);
SMPLogger LOG = SMPLoggerFactory.getLogger(DatabaseProperties.class);
private static final long serialVersionUID = 1L;
private LocalDateTime lastUpdate;
......@@ -26,7 +26,7 @@ public class DatabaseProperties extends Properties {
dc.getProperty().toLowerCase().contains("password")?"******": dc.getValue());
setProperty(dc.getProperty(), dc.getValue());
}
lastUpdate = lastUpdate==null || lastUpdate.isBefore(dc.getLastUpdatedOn())? dc.getLastUpdatedOn() :lastUpdate;
lastUpdate = (lastUpdate==null || lastUpdate.isBefore(dc.getLastUpdatedOn()) )? dc.getLastUpdatedOn() :lastUpdate;
}
}
......
smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CRLVerifierService.java
+ 5
− 9
View file @ b6f39b38
......@@ -74,7 +74,7 @@ public class CRLVerifierService {
List<String> crlDistPoints = X509CertificateUtils.getCrlDistributionPoints(cert);
if (crlDistPoints.isEmpty()) {
LOG.warn("The certificate: [" + cert.getSubjectX500Principal() + "] has no CRL Lists");
LOG.warn("The certificate: '{}' has no CRL Lists.", cert.getSubjectX500Principal() );
return;
}
String crlUrl = X509CertificateUtils.extractHttpCrlDistributionPoint(crlDistPoints);
......@@ -91,11 +91,8 @@ public class CRLVerifierService {
public void verifyCertificateCRLs(BigInteger serial, String crlDistributionPointURL) throws CertificateRevokedException {
LOG.info("Download CRL " + crlDistributionPointURL);
LOG.info("Download CRL {}." ,crlDistributionPointURL);
X509CRL crl = getCRLByURL(crlDistributionPointURL);
LOG.debug("GOT CRL " + crlDistributionPointURL + " CRL " + crl);
if (crl != null && crl.getRevokedCertificates() != null) {
validateCertificateCRL(crl, serial);
}
......@@ -111,7 +108,6 @@ public class CRLVerifierService {
if (crlCacheMap.containsKey(url)) {
X509CRL crlTmp = crlCacheMap.get(url);
Long nextRefresh = crlCacheNextRefreshMap.getOrDefault(url, NULL_LONG);
;
if (nextRefresh > currentDate.getTime()) {
x509CRL = crlTmp;
}
......@@ -180,7 +176,7 @@ public class CRLVerifierService {
if (useProxy() && !HttpUtils.doesTargetMatchNonProxy(targetUrl.getHost(), configurationService.getHttpNoProxyHosts())
) {
LOG.debug("Using proxy for downloading URL " + crlURL);
LOG.debug("Using proxy for downloading URL: {}.", crlURL);
String decryptedPassword = configurationService.getProxyCredentialToken();
Optional<Integer> proxyPort = configurationService.getHttpProxyPort();
inputStream = downloadURLViaProxy(crlURL, configurationService.getHttpProxyHost(),
......@@ -213,8 +209,8 @@ public class CRLVerifierService {
RequestConfig config = RequestConfig.custom().setProxy(new HttpHost(proxyHost, proxyPort)).build();
HttpGet httpget = new HttpGet(url);
httpget.setConfig(config);
LOG.debug("Executing request " + url + " via proxy " + proxyHost +
(credentialsProvider == null ? " with no authentication." : "with username: " + proxyHost + "."));
LOG.debug("Executing request '{}' via proxy '{}' {}",url, proxyHost,
(credentialsProvider == null ? " with no authentication." : "with username: " + proxyUser + "."));
return execute(httpclient, httpget);
}
......
smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/X509CertificateToCertificateROConverterTest.java
+ 4
− 4
View file @ b6f39b38
......@@ -35,10 +35,10 @@ public class X509CertificateToCertificateROConverterTest {
private static final Object[] testCases() {
return new Object[][]{
// filename, subject, issuer, serial number, blueCoatHeader, certificateId
{"cert-escaped-chars.pem", "C=BE,O=DIGIT,OU=CEF,CN=Escape characters \\,\\\\#\\+\\<\\>\\\"\\=", "C=BE,O=DIGIT,OU=CEF,CN=Escape characters \\,\\\\#\\+\\<\\>\\\"\\=","5c1bb275","sno=5c1bb275&subject=C%3DBE%2CO%3DDIGIT%2COU%3DCEF%2CCN%3DEscape+characters+%5C%2C%5C%5C%23%5C%2B%5C%3C%5C%3E%5C%22%5C%3D&validfrom=Dec+20+16%3A17%3A09+2018+GMT&validto=Dec+17+16%3A17%3A09+2028+GMT&issuer=C%3DBE%2CO%3DDIGIT%2COU%3DCEF%2CCN%3DEscape+characters+%5C%2C%5C%5C%23%5C%2B%5C%3C%5C%3E%5C%22%5C%3D","CN=Escape characters \\,\\\\\\#\\+\\<\\>\\\"\\=,O=DIGIT,C=BE:000000005c1bb275"},
{"cert-nonAscii.pem", "C=BE,O=DIGIT,OU=CEF,CN=NonAscii chars: àøýßĉæãäħ", "C=BE,O=DIGIT,OU=CEF,CN=NonAscii chars: àøýßĉæãäħ","5c1bb38d","sno=5c1bb38d&subject=C%3DBE%2CO%3DDIGIT%2COU%3DCEF%2CCN%3DNonAscii+chars%3A++%C3%A0%C3%B8%C3%BD%C3%9F%C4%89%C3%A6%C3%A3%C3%A4%C4%A7&validfrom=Dec+20+16%3A21%3A49+2018+GMT&validto=Dec+17+16%3A21%3A49+2028+GMT&issuer=C%3DBE%2CO%3DDIGIT%2COU%3DCEF%2CCN%3DNonAscii+chars%3A++%C3%A0%C3%B8%C3%BD%C3%9F%C4%89%C3%A6%C3%A3%C3%A4%C4%A7","CN=NonAscii chars: aøyßcæaaħ,O=DIGIT,C=BE:000000005c1bb38d"},
{"cert-with-email.pem", "C=BE,O=DIGIT,OU=CEF,CN=Cert with email", "C=BE,O=DIGIT,OU=CEF,CN=Cert with email","5c1bb358","sno=5c1bb358&subject=C%3DBE%2CO%3DDIGIT%2COU%3DCEF%2CCN%3DCert+with+email&validfrom=Dec+20+16%3A20%3A56+2018+GMT&validto=Dec+17+16%3A20%3A56+2028+GMT&issuer=C%3DBE%2CO%3DDIGIT%2COU%3DCEF%2CCN%3DCert+with+email","CN=Cert with email,O=DIGIT,C=BE:000000005c1bb358"},
{"cert-smime.pem", "CN=edelivery_sml,OU=PEPPOL TEST SMP,O=European Commission,C=BE", "C=BE,O=OpenPEPPOL AISBL,OU=FOR TEST ONLY,CN=PEPPOL SERVICE METADATA PUBLISHER TEST CA - G2","3cfe6b37e4702512c01e71f9b9175464","sno=3cfe6b37e4702512c01e71f9b9175464&subject=CN%3Dedelivery_sml%2COU%3DPEPPOL+TEST+SMP%2CO%3DEuropean+Commission%2CC%3DBE&validfrom=Sep+21+02%3A00%3A00+2018+GMT&validto=Sep+11+01%3A59%3A59+2020+GMT&issuer=C%3DBE%2CO%3DOpenPEPPOL+AISBL%2COU%3DFOR+TEST+ONLY%2CCN%3DPEPPOL+SERVICE+METADATA+PUBLISHER+TEST+CA+-+G2","CN=edelivery_sml,O=European Commission,C=BE:3cfe6b37e4702512c01e71f9b9175464"},
{"cert-escaped-chars.pem", "CN=Escape characters \\,\\\\\\#\\+\\<\\>\\\"\\=,OU=CEF,O=DIGIT,C=BE", "CN=Escape characters \\,\\\\\\#\\+\\<\\>\\\"\\=,OU=CEF,O=DIGIT,C=BE","5c1bb275","sno=5c1bb275&subject=CN%3DEscape+characters+%5C%2C%5C%5C%5C%23%5C%2B%5C%3C%5C%3E%5C%22%5C%3D%2COU%3DCEF%2CO%3DDIGIT%2CC%3DBE&validfrom=Dec+20+16%3A17%3A09+2018+GMT&validto=Dec+17+16%3A17%3A09+2028+GMT&issuer=CN%3DEscape+characters+%5C%2C%5C%5C%5C%23%5C%2B%5C%3C%5C%3E%5C%22%5C%3D%2COU%3DCEF%2CO%3DDIGIT%2CC%3DBE","CN=Escape characters \\,\\\\\\#\\+\\<\\>\\\"\\=,O=DIGIT,C=BE:000000005c1bb275"},
{"cert-nonAscii.pem", "CN=NonAscii chars: àøýßĉæãäħ,OU=CEF,O=DIGIT,C=BE", "CN=NonAscii chars: àøýßĉæãäħ,OU=CEF,O=DIGIT,C=BE","5c1bb38d","sno=5c1bb38d&subject=CN%3DNonAscii+chars%3A++%C3%A0%C3%B8%C3%BD%C3%9F%C4%89%C3%A6%C3%A3%C3%A4%C4%A7%2COU%3DCEF%2CO%3DDIGIT%2CC%3DBE&validfrom=Dec+20+16%3A21%3A49+2018+GMT&validto=Dec+17+16%3A21%3A49+2028+GMT&issuer=CN%3DNonAscii+chars%3A++%C3%A0%C3%B8%C3%BD%C3%9F%C4%89%C3%A6%C3%A3%C3%A4%C4%A7%2COU%3DCEF%2CO%3DDIGIT%2CC%3DBE","CN=NonAscii chars: aøyßcæaaħ,O=DIGIT,C=BE:000000005c1bb38d"},
{"cert-with-email.pem", "CN=Cert with email,OU=CEF,O=DIGIT,C=BE", "CN=Cert with email,OU=CEF,O=DIGIT,C=BE","5c1bb358","sno=5c1bb358&subject=CN%3DCert+with+email%2COU%3DCEF%2CO%3DDIGIT%2CC%3DBE&validfrom=Dec+20+16%3A20%3A56+2018+GMT&validto=Dec+17+16%3A20%3A56+2028+GMT&issuer=CN%3DCert+with+email%2COU%3DCEF%2CO%3DDIGIT%2CC%3DBE","CN=Cert with email,O=DIGIT,C=BE:000000005c1bb358"},
{"cert-smime.pem", "C=BE,O=European Commission,OU=PEPPOL TEST SMP,CN=edelivery_sml", "CN=PEPPOL SERVICE METADATA PUBLISHER TEST CA - G2,OU=FOR TEST ONLY,O=OpenPEPPOL AISBL,C=BE","3cfe6b37e4702512c01e71f9b9175464","sno=3cfe6b37e4702512c01e71f9b9175464&subject=C%3DBE%2CO%3DEuropean+Commission%2COU%3DPEPPOL+TEST+SMP%2CCN%3Dedelivery_sml&validfrom=Sep+21+02%3A00%3A00+2018+GMT&validto=Sep+11+01%3A59%3A59+2020+GMT&issuer=CN%3DPEPPOL+SERVICE+METADATA+PUBLISHER+TEST+CA+-+G2%2COU%3DFOR+TEST+ONLY%2CO%3DOpenPEPPOL+AISBL%2CC%3DBE","CN=edelivery_sml,O=European Commission,C=BE:3cfe6b37e4702512c01e71f9b9175464"},
};
}
......
smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreServiceTest.java
+ 8
− 8
View file @ b6f39b38
......@@ -166,8 +166,8 @@ public class UITruststoreServiceTest extends AbstractServiceIntegrationTest {
//then
assertEquals("CN=SMP test,O=DIGIT,C=BE:0000000000000003", cer.getCertificateId());
assertEquals("C=BE,O=DIGIT,CN=Intermediate CA", cer.getIssuer());
assertEquals("C=BE,O=DIGIT,CN=SMP test,E=smp@test.com", cer.getSubject());
assertEquals("CN=Intermediate CA,O=DIGIT,C=BE", cer.getIssuer());
assertEquals("1.2.840.113549.1.9.1=#160c736d7040746573742e636f6d,CN=SMP test,O=DIGIT,C=BE", cer.getSubject());
assertEquals("3", cer.getSerialNumber());
assertNotNull(cer.getValidFrom());
assertNotNull(cer.getValidTo());
......@@ -184,8 +184,8 @@ public class UITruststoreServiceTest extends AbstractServiceIntegrationTest {
//then
assertEquals("CN=alice,O=www.freelan.org,C=FR:0000000000000001", cer.getCertificateId());
assertEquals("C=FR,ST=Alsace,L=Strasbourg,O=www.freelan.org,OU=freelan,CN=Freelan Sample Certificate Authority,E=contact@freelan.org", cer.getIssuer());
assertEquals("C=FR,ST=Alsace,O=www.freelan.org,OU=freelan,CN=alice,E=contact@freelan.org", cer.getSubject());
assertEquals("1.2.840.113549.1.9.1=#1613636f6e7461637440667265656c616e2e6f7267,CN=Freelan Sample Certificate Authority,OU=freelan,O=www.freelan.org,L=Strasbourg,ST=Alsace,C=FR", cer.getIssuer());
assertEquals("1.2.840.113549.1.9.1=#1613636f6e7461637440667265656c616e2e6f7267,CN=alice,OU=freelan,O=www.freelan.org,ST=Alsace,C=FR", cer.getSubject());
assertEquals("1", cer.getSerialNumber());
assertNotNull(cer.getValidFrom());
assertNotNull(cer.getValidTo());
......@@ -202,8 +202,8 @@ public class UITruststoreServiceTest extends AbstractServiceIntegrationTest {
//then
assertEquals("CN=edelivery_sml,O=European Commission,C=BE:3cfe6b37e4702512c01e71f9b9175464", cer.getCertificateId());
assertEquals("C=BE,O=OpenPEPPOL AISBL,OU=FOR TEST ONLY,CN=PEPPOL SERVICE METADATA PUBLISHER TEST CA - G2", cer.getIssuer());
assertEquals("CN=edelivery_sml,OU=PEPPOL TEST SMP,O=European Commission,C=BE", cer.getSubject());
assertEquals("CN=PEPPOL SERVICE METADATA PUBLISHER TEST CA - G2,OU=FOR TEST ONLY,O=OpenPEPPOL AISBL,C=BE", cer.getIssuer());
assertEquals("C=BE,O=European Commission,OU=PEPPOL TEST SMP,CN=edelivery_sml", cer.getSubject());
assertEquals("3cfe6b37e4702512c01e71f9b9175464", cer.getSerialNumber());
assertNotNull(cer.getValidFrom());
assertNotNull(cer.getValidTo());
......@@ -220,8 +220,8 @@ public class UITruststoreServiceTest extends AbstractServiceIntegrationTest {
//then
assertEquals("CN=POP000004,O=European Commission,C=BE:474980c51478cf62761667461aef5e8e", cer.getCertificateId());
assertEquals("C=BE,O=OpenPEPPOL AISBL,OU=FOR TEST ONLY,CN=PEPPOL ACCESS POINT TEST CA - G2", cer.getIssuer());
assertEquals("CN=POP000004,OU=PEPPOL TEST AP,O=European Commission,C=BE", cer.getSubject());
assertEquals("CN=PEPPOL ACCESS POINT TEST CA - G2,OU=FOR TEST ONLY,O=OpenPEPPOL AISBL,C=BE", cer.getIssuer());
assertEquals("C=BE,O=European Commission,OU=PEPPOL TEST AP,CN=POP000004", cer.getSubject());
assertEquals("474980c51478cf62761667461aef5e8e", cer.getSerialNumber());
assertNotNull(cer.getValidFrom());
assertNotNull(cer.getValidTo());
......
smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/UserResourceTest.java
+ 4
− 5
View file @ b6f39b38
......@@ -111,17 +111,16 @@ public class UserResourceTest {
.content(buff))
.andExpect(status().isOk()).andReturn();
//them
//then
ObjectMapper mapper = new ObjectMapper();
CertificateRO res = mapper.readValue(result.getResponse().getContentAsString(), CertificateRO.class);
assertNotNull(res);
assertEquals("C=BE,O=DIGIT,CN=Intermediate CA", res.getIssuer());
assertEquals("C=BE,O=DIGIT,CN=SMP test,E=smp@test.com", res.getSubject());
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=C%3DBE%2CO%3DDIGIT%2CCN%3DSMP+test%2CE%3Dsmp%40test.com&validfrom=May+22+20%3A59%3A00+2018+GMT&validto=May+22+20%3A56%3A00+2019+GMT&issuer=C%3DBE%2CO%3DDIGIT%2CCN%3DIntermediate+CA", res.getBlueCoatHeader());
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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about