From f4e014993a75212023bb34497d4759b81ca39053 Mon Sep 17 00:00:00 2001 From: Thomas <> Date: Wed, 30 Aug 2023 18:33:01 +0200 Subject: chore(saml2): remove some deprecated methods and switch to new one --- .../gv/egiz/eaaf/modules/pvp2/impl/binding/AbstractBinding.java | 4 ++-- .../at/gv/egiz/eaaf/modules/pvp2/impl/binding/PostBinding.java | 4 ++-- .../gv/egiz/eaaf/modules/pvp2/impl/binding/RedirectBinding.java | 4 ++-- .../at/gv/egiz/eaaf/modules/pvp2/impl/binding/SoapBinding.java | 4 ++-- .../egiz/eaaf/modules/pvp2/impl/opensaml/EaafHttpPostDecoder.java | 2 +- .../pvp2/impl/opensaml/EaafHttpRedirectDeflateDecoder.java | 2 +- .../initialize/EaafDefaultSecurityConfigurationBootstrap.java | 8 ++++---- .../verification/EaafMessageContextInitializationHandler.java | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/binding/AbstractBinding.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/binding/AbstractBinding.java index 80697ee9..459c3fc3 100644 --- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/binding/AbstractBinding.java +++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/binding/AbstractBinding.java @@ -154,9 +154,9 @@ public abstract class AbstractBinding { securityParameterContext.setSignatureValidationParameters(sigValParameters); messageContext.addSubcontext(securityParameterContext); - sigValParameters.setBlacklistedAlgorithms( + sigValParameters.setExcludedAlgorithms( ConfigurationService.get(SignatureValidationConfiguration.class) - .getBlacklistedAlgorithms()); + .getExcludedAlgorithms()); sigValParameters.setSignatureTrustEngine( TrustEngineFactory.getSignatureKnownKeysTrustEngine(metadataProvider)); diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/binding/PostBinding.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/binding/PostBinding.java index 5936258d..1faaf441 100644 --- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/binding/PostBinding.java +++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/binding/PostBinding.java @@ -81,7 +81,7 @@ public class PostBinding extends AbstractBinding implements IDecoder, IEncoder { final HttpPostEncoderWithOwnTemplate encoder = new HttpPostEncoderWithOwnTemplate(guiConfig, guiBuilder); - encoder.setHttpServletResponse(httpResp); + encoder.setHttpServletResponseSupplier(() -> httpResp); // inject message context final MessageContext messageContext = buildBasicMessageContext(encoder, request); @@ -127,7 +127,7 @@ public class PostBinding extends AbstractBinding implements IDecoder, IEncoder { final HttpPostEncoderWithOwnTemplate encoder = new HttpPostEncoderWithOwnTemplate(guiConfig, guiBuilder); - encoder.setHttpServletResponse(httpResp); + encoder.setHttpServletResponseSupplier(() -> httpResp); // inject message context final MessageContext messageContext = buildBasicMessageContext(encoder, response); diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/binding/RedirectBinding.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/binding/RedirectBinding.java index edb5608f..d3ab3f6b 100644 --- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/binding/RedirectBinding.java +++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/binding/RedirectBinding.java @@ -64,7 +64,7 @@ public class RedirectBinding extends AbstractBinding implements IDecoder, IEncod try { log.debug("create SAML RedirectBinding response"); final HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder(); - encoder.setHttpServletResponse(resp); + encoder.setHttpServletResponseSupplier(() -> resp); final MessageContext messageContext = buildBasicMessageContext(encoder, request); @@ -101,7 +101,7 @@ public class RedirectBinding extends AbstractBinding implements IDecoder, IEncod log.debug("create SAML RedirectBinding response"); final HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder(); - encoder.setHttpServletResponse(resp); + encoder.setHttpServletResponseSupplier(() -> resp); final MessageContext messageContext = buildBasicMessageContext(encoder, response); diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/binding/SoapBinding.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/binding/SoapBinding.java index cd651a1e..6c8a1682 100644 --- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/binding/SoapBinding.java +++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/binding/SoapBinding.java @@ -66,7 +66,7 @@ public class SoapBinding extends AbstractBinding implements IDecoder, IEncoder { throws Pvp2Exception { final HTTPSOAP11Decoder soapDecoder = new HTTPSOAP11Decoder(); - soapDecoder.setHttpServletRequest(req); + soapDecoder.setHttpServletRequestSupplier(() -> req); injectMessageHandlerChain(soapDecoder, metadataProvider, peerEntityRole); @@ -136,7 +136,7 @@ public class SoapBinding extends AbstractBinding implements IDecoder, IEncoder { try { final HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder(); - encoder.setHttpServletResponse(resp); + encoder.setHttpServletResponseSupplier(() -> resp); // inject message context final MessageContext messageContext = buildBasicMessageContext(encoder, response); diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/EaafHttpPostDecoder.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/EaafHttpPostDecoder.java index f9860839..87d897d6 100644 --- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/EaafHttpPostDecoder.java +++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/EaafHttpPostDecoder.java @@ -32,7 +32,7 @@ public class EaafHttpPostDecoder extends HTTPPostDecoder { private static final String SAML_RESP_PARAM_NAME = "SAMLResponse"; public EaafHttpPostDecoder(HttpServletRequest req) { - setHttpServletRequest(req); + setHttpServletRequestSupplier(() -> req); } @Override diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/EaafHttpRedirectDeflateDecoder.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/EaafHttpRedirectDeflateDecoder.java index 28f98d30..e4b5fedd 100644 --- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/EaafHttpRedirectDeflateDecoder.java +++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/EaafHttpRedirectDeflateDecoder.java @@ -33,7 +33,7 @@ public class EaafHttpRedirectDeflateDecoder extends HTTPRedirectDeflateDecoder { private static final String SAML_RESP_PARAM_NAME = "SAMLResponse"; public EaafHttpRedirectDeflateDecoder(HttpServletRequest req) { - setHttpServletRequest(req); + setHttpServletRequestSupplier(() -> req); } diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/initialize/EaafDefaultSecurityConfigurationBootstrap.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/initialize/EaafDefaultSecurityConfigurationBootstrap.java index 97f0f225..2f18f780 100644 --- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/initialize/EaafDefaultSecurityConfigurationBootstrap.java +++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/initialize/EaafDefaultSecurityConfigurationBootstrap.java @@ -48,7 +48,7 @@ public class EaafDefaultSecurityConfigurationBootstrap public static BasicEncryptionConfiguration buildEaafEncryptionConfiguration() { final BasicEncryptionConfiguration config = new BasicEncryptionConfiguration(); - config.setBlacklistedAlgorithms(Arrays.asList( + config.setExcludedAlgorithms(Arrays.asList( EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSA15, EncryptionConstants.ALGO_ID_BLOCKCIPHER_TRIPLEDES, EncryptionConstants.ALGO_ID_KEYWRAP_TRIPLEDES)); @@ -96,7 +96,7 @@ public class EaafDefaultSecurityConfigurationBootstrap public static BasicDecryptionConfiguration buildEaaftDecryptionConfiguration() { final BasicDecryptionConfiguration config = new BasicDecryptionConfiguration(); - config.setBlacklistedAlgorithms(Collections.singletonList( + config.setExcludedAlgorithms(Collections.singletonList( EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSA15)); config.setEncryptedKeyResolver(buildBasicEncryptedKeyResolver()); @@ -112,7 +112,7 @@ public class EaafDefaultSecurityConfigurationBootstrap public static BasicSignatureSigningConfiguration buildEaafSignatureSigningConfiguration() { final BasicSignatureSigningConfiguration config = new BasicSignatureSigningConfiguration(); - config.setBlacklistedAlgorithms(Arrays.asList( + config.setExcludedAlgorithms(Arrays.asList( SignatureConstants.ALGO_ID_DIGEST_NOT_RECOMMENDED_MD5, SignatureConstants.ALGO_ID_SIGNATURE_NOT_RECOMMENDED_RSA_MD5, SignatureConstants.ALGO_ID_MAC_HMAC_NOT_RECOMMENDED_MD5, @@ -163,7 +163,7 @@ public class EaafDefaultSecurityConfigurationBootstrap public static BasicSignatureValidationConfiguration buildEaafSignatureValidationConfiguration() { final BasicSignatureValidationConfiguration config = new BasicSignatureValidationConfiguration(); - config.setBlacklistedAlgorithms(Arrays.asList( + config.setExcludedAlgorithms(Arrays.asList( SignatureConstants.ALGO_ID_DIGEST_NOT_RECOMMENDED_MD5, SignatureConstants.ALGO_ID_SIGNATURE_NOT_RECOMMENDED_RSA_MD5, SignatureConstants.ALGO_ID_MAC_HMAC_NOT_RECOMMENDED_MD5, diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/verification/EaafMessageContextInitializationHandler.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/verification/EaafMessageContextInitializationHandler.java index ff587f1b..26f3d58e 100644 --- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/verification/EaafMessageContextInitializationHandler.java +++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/verification/EaafMessageContextInitializationHandler.java @@ -53,9 +53,9 @@ public class EaafMessageContextInitializationHandler extends AbstractMessageHand securityParameterContext.setSignatureValidationParameters(sigValParameters); messageContext.addSubcontext(securityParameterContext); - sigValParameters.setBlacklistedAlgorithms( + sigValParameters.setExcludedAlgorithms( ConfigurationService.get(SignatureValidationConfiguration.class) - .getBlacklistedAlgorithms()); + .getExcludedAlgorithms()); sigValParameters.setSignatureTrustEngine(trustEngine); } -- cgit v1.2.3