From 5bd48398c41e5e3572906f87bd98bbc005b8216f Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 29 Nov 2024 21:13:13 +0100
Subject: [PATCH] OZG-7092 adjust decrypter factory
---
.../java/de/ozgcloud/token/saml/SamlDecrypterFactory.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlDecrypterFactory.java b/token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlDecrypterFactory.java
index f3bce0d..9159a5f 100644
--- a/token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlDecrypterFactory.java
+++ b/token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlDecrypterFactory.java
@@ -41,12 +41,16 @@ import org.opensaml.xmlsec.encryption.support.SimpleRetrievalMethodEncryptedKeyR
import org.opensaml.xmlsec.keyinfo.KeyInfoCredentialResolver;
import org.opensaml.xmlsec.keyinfo.impl.CollectionKeyInfoCredentialResolver;
import org.springframework.security.converter.RsaKeyConverters;
+import org.springframework.stereotype.Component;
import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.token.TokenValidationProperties.TokenValidationProperty;
+@Component
class SamlDecrypterFactory {
+ private static final String X509_CERTIFICATE_TYPE = "X.509";
+
public Decrypter buildDecrypter(TokenValidationProperty tokenValidationProperty) {
return DecrypterBuilder.builder()
.keyEncryptionKeyResolver(buildKeyInfoCredentialResolver(tokenValidationProperty))
@@ -61,7 +65,7 @@ class SamlDecrypterFactory {
X509Certificate getCertificate(TokenValidationProperty tokenValidationProperty) {
try (var inputStream = tokenValidationProperty.getCertificate().getInputStream()) {
- return (X509Certificate) CertificateFactory.getInstance("X.509").generateCertificate(inputStream);
+ return (X509Certificate) CertificateFactory.getInstance(X509_CERTIFICATE_TYPE).generateCertificate(inputStream);
} catch (IOException | CertificateException e) {
throw new TechnicalException("Cannot read certificate", e);
}
--
GitLab