From 616d230a685b6cf0291b1137f0203ab25cbfc0b5 Mon Sep 17 00:00:00 2001
From: Sebastian-Ion TINCU <Sebastian-Ion.TINCU@ext.ec.europa.eu>
Date: Tue, 9 Apr 2024 22:10:07 +0200
Subject: [PATCH] EDELIVERY-12998 Extract methods to a generic security library
Extract find duplicate certificates method.
---
.../smp/services/ui/UIKeystoreService.java | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIKeystoreService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIKeystoreService.java
index 7ddd7fc2d..aa517b92a 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIKeystoreService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIKeystoreService.java
@@ -285,22 +285,7 @@ public class UIKeystoreService extends BasicKeystoreService {
String keystoreSecToken = configurationService.getKeystoreCredentialToken();
KeyStore keyStore = loadKeystore(configurationService.getKeystoreFile(), keystoreSecToken);
- if (keyStore != null) {
- return list(newKeystore.aliases())
- .stream()
- .filter(alias -> containsCertificate(keyStore, newKeystore, alias))
- .peek(alias -> LOG.debug("Found entry with duplicate certificate [{}]", alias))
- .collect(Collectors.toSet());
- }
- return Collections.emptySet();
- }
-
- private boolean containsCertificate(KeyStore keyStore, KeyStore newKeystore, String alias) {
- try {
- return keyStore.getCertificateAlias(newKeystore.getCertificate(alias)) != null;
- } catch (KeyStoreException e) {
- throw new SMPRuntimeException(ErrorCode.CERTIFICATE_ERROR, "An error occurred while loading the entry " + alias, e);
- }
+ return KeystoreUtils.findDuplicateCertificates(keyStore, newKeystore);
}
/**
--
GitLab