diff options
author | Thomas <> | 2022-01-10 18:07:40 +0100 |
---|---|---|
committer | Thomas <> | 2022-01-10 18:07:40 +0100 |
commit | 6b1ea6a676c9f8fd115c0946fa4302a7a2ad5715 (patch) | |
tree | 723fb115e6f328ad1836247f7e8e276e5269f5ff /connector/src/main | |
parent | 0d9f042b4c88ba5f34da452cd19ada24146d32af (diff) | |
parent | c007dfb5d809b532c17e1dcc1373dd8b2861f993 (diff) | |
download | National_eIDAS_Gateway-6b1ea6a676c9f8fd115c0946fa4302a7a2ad5715.tar.gz National_eIDAS_Gateway-6b1ea6a676c9f8fd115c0946fa4302a7a2ad5715.tar.bz2 National_eIDAS_Gateway-6b1ea6a676c9f8fd115c0946fa4302a7a2ad5715.zip |
Merge branch 'nightlybuild' into feature/matching_base_rebase
# Conflicts:
# .gitlab-ci.yml
# connector/src/main/resources/specific_eIDAS_connector.beans.xml
# connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java
# pom.xml
Diffstat (limited to 'connector/src/main')
-rw-r--r-- | connector/src/main/java/at/asitplus/eidas/specific/connector/verification/AuthnRequestValidator.java | 7 | ||||
-rw-r--r-- | connector/src/main/resources/specific_eIDAS_connector.beans.xml | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/verification/AuthnRequestValidator.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/verification/AuthnRequestValidator.java index 881eeb8a..e4c68004 100644 --- a/connector/src/main/java/at/asitplus/eidas/specific/connector/verification/AuthnRequestValidator.java +++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/verification/AuthnRequestValidator.java @@ -53,6 +53,7 @@ import at.gv.egiz.eaaf.core.exceptions.AuthnRequestValidatorException; import at.gv.egiz.eaaf.core.exceptions.EaafException; import at.gv.egiz.eaaf.core.exceptions.EaafStorageException; import at.gv.egiz.eaaf.core.impl.idp.controller.protocols.RequestImpl; +import at.gv.egiz.eaaf.core.impl.utils.TransactionIdUtils; import at.gv.egiz.eaaf.modules.pvp2.api.reqattr.EaafRequestedAttribute; import at.gv.egiz.eaaf.modules.pvp2.api.reqattr.EaafRequestedAttributes; import at.gv.egiz.eaaf.modules.pvp2.api.validation.IAuthnRequestPostProcessor; @@ -211,7 +212,11 @@ public class AuthnRequestValidator implements IAuthnRequestPostProcessor { } else { if (el.getAttributeValues() != null && el.getAttributeValues().size() == 1) { final String transactionId = el.getAttributeValues().get(0).getDOM().getTextContent(); - ((RequestImpl) pendingReq).setUniqueTransactionIdentifier(transactionId); + ((RequestImpl) pendingReq).setUniqueTransactionIdentifier(transactionId); + log.info("Find transactionId: {} from requesting service. Replace old id: {} ", + transactionId, TransactionIdUtils.getTransactionId()); + TransactionIdUtils.setTransactionId(transactionId); + return true; } else { diff --git a/connector/src/main/resources/specific_eIDAS_connector.beans.xml b/connector/src/main/resources/specific_eIDAS_connector.beans.xml index ec16a7d2..a417a0e5 100644 --- a/connector/src/main/resources/specific_eIDAS_connector.beans.xml +++ b/connector/src/main/resources/specific_eIDAS_connector.beans.xml @@ -89,7 +89,8 @@ class="at.asitplus.eidas.specific.connector.gui.DefaultVelocityGuiBuilderImpl" /> <bean id="mvcGUIBuilderImpl" - class="at.asitplus.eidas.specific.connector.gui.SpringMvcGuiFormBuilderImpl" /> + class="at.gv.egiz.eaaf.core.impl.gui.builder.SpringMvcGuiFormBuilderImpl" /> + <bean id="StatusMessageProvider" class="at.asitplus.eidas.specific.connector.provider.StatusMessageProvider" /> |