summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--eaaf_modules/eaaf_module_pvp2_core/pom.xml14
-rw-r--r--eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/binding/PostBinding.java3
-rw-r--r--eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/binding/RedirectBinding.java3
-rw-r--r--pom.xml16
4 files changed, 26 insertions, 10 deletions
diff --git a/eaaf_modules/eaaf_module_pvp2_core/pom.xml b/eaaf_modules/eaaf_module_pvp2_core/pom.xml
index c63ff939..184c45b1 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/pom.xml
+++ b/eaaf_modules/eaaf_module_pvp2_core/pom.xml
@@ -168,4 +168,18 @@
</plugins>
</build>
+
+ <repositories>
+ <repository>
+ <id>shibboleth-release</id>
+ <url>https://build.shibboleth.net/maven/releases/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
</project>
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 829f771a..5936258d 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
@@ -54,6 +54,7 @@ import at.gv.egiz.eaaf.modules.pvp2.impl.verification.EaafSamlProtocolMessageXml
import at.gv.egiz.eaaf.modules.pvp2.impl.verification.PvpSamlMessageHandlerChain;
import lombok.extern.slf4j.Slf4j;
import net.shibboleth.utilities.java.support.net.URIComparator;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
@Slf4j
public class PostBinding extends AbstractBinding implements IDecoder, IEncoder {
@@ -203,7 +204,7 @@ public class PostBinding extends AbstractBinding implements IDecoder, IEncoder {
final PvpSamlMessageHandlerChain messageValidatorChain = new PvpSamlMessageHandlerChain();
final ReceivedEndpointSecurityHandler endpointSecurityHandler = new ReceivedEndpointSecurityHandler();
- endpointSecurityHandler.setHttpServletRequest(req);
+ endpointSecurityHandler.setHttpServletRequestSupplier(NonnullSupplier.of(req));
endpointSecurityHandler.setURIComparator(comparator);
messageValidatorChain.addHandler(new CheckMessageVersionHandler());
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 c66c773e..edb5608f 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
@@ -49,6 +49,7 @@ import at.gv.egiz.eaaf.modules.pvp2.impl.opensaml.EaafHttpRedirectDeflateDecoder
import at.gv.egiz.eaaf.modules.pvp2.impl.verification.EaafSaml2HttpRedirectDeflateSignatureSecurityHandler;
import at.gv.egiz.eaaf.modules.pvp2.impl.verification.PvpSamlMessageHandlerChain;
import net.shibboleth.utilities.java.support.net.URIComparator;
+import net.shibboleth.utilities.java.support.primitive.NonnullSupplier;
public class RedirectBinding extends AbstractBinding implements IDecoder, IEncoder {
@@ -174,7 +175,7 @@ public class RedirectBinding extends AbstractBinding implements IDecoder, IEncod
final PvpSamlMessageHandlerChain messageValidatorChain = new PvpSamlMessageHandlerChain();
final EaafSaml2HttpRedirectDeflateSignatureSecurityHandler redirectBindingSignaturHandler =
new EaafSaml2HttpRedirectDeflateSignatureSecurityHandler(metadataProvider);
- redirectBindingSignaturHandler.setHttpServletRequest(req);
+ redirectBindingSignaturHandler.setHttpServletRequestSupplier(NonnullSupplier.of(req));
messageValidatorChain.addHandler(new CheckMessageVersionHandler());
messageValidatorChain.addHandler(redirectBindingSignaturHandler);
diff --git a/pom.xml b/pom.xml
index 3bb866f3..d06c8f10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,16 +46,16 @@
<io.grpc-core.version>1.53.0</io.grpc-core.version>
<!-- Other third-party libs -->
- <spring-boot-starter-web.version>2.7.9</spring-boot-starter-web.version>
- <org.springframework.version>5.3.26</org.springframework.version>
- <org.opensaml.version>4.0.1</org.opensaml.version>
- <org.apache.santuario.xmlsec.version>2.3.2</org.apache.santuario.xmlsec.version>
+ <spring-boot-starter-web.version>2.7.11</spring-boot-starter-web.version>
+ <org.springframework.version>5.3.27</org.springframework.version>
+ <org.opensaml.version>4.3.0</org.opensaml.version>
+ <org.apache.santuario.xmlsec.version>2.3.3</org.apache.santuario.xmlsec.version>
<org.cryptacular.version>1.2.5</org.cryptacular.version>
<org.bouncycastle.bcprov-jdk18on.version>1.71.1</org.bouncycastle.bcprov-jdk18on.version>
<org.bouncycastle.bctls-jdk18on.version>1.71.1</org.bouncycastle.bctls-jdk18on.version>
<org.slf4j.version>1.7.36</org.slf4j.version>
- <log4j.version>2.19.0</log4j.version>
+ <log4j.version>2.20.0</log4j.version>
<ch.qos.logback.version>1.2.11</ch.qos.logback.version>
<commons-codec.version>1.15</commons-codec.version>
@@ -78,8 +78,8 @@
<httpclient.version>4.5.14</httpclient.version>
<httpcore.version>4.4.16</httpcore.version>
- <com.fasterxml.jackson.core.version>2.14.2</com.fasterxml.jackson.core.version>
- <com.fasterxml.jackson.databind.version>2.14.2</com.fasterxml.jackson.databind.version>
+ <com.fasterxml.jackson.core.version>2.15.0</com.fasterxml.jackson.core.version>
+ <com.fasterxml.jackson.databind.version>2.15.0</com.fasterxml.jackson.databind.version>
<gson.version>2.10.1</gson.version>
<org.bitbucket.b_c.jose4j.version>0.9.3</org.bitbucket.b_c.jose4j.version>
@@ -87,7 +87,7 @@
<xerces.version>2.12.2</xerces.version>
<xalan.version>2.7.1</xalan.version>
- <woodstox-core.version>6.5.0</woodstox-core.version>
+ <woodstox-core.version>6.5.1</woodstox-core.version>
<snakeyaml.version>1.33</snakeyaml.version>
<!-- jUnit testing -->