diff options
| author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2022-02-08 07:50:36 +0000 |
|---|---|---|
| committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2022-02-08 07:50:36 +0000 |
| commit | 884f208b5f4152a13e3f77d64ce0d4adec481700 (patch) | |
| tree | 220622592c0e49e1bf8ca60d3f16b4881b9b8ce1 /connector/src/main | |
| parent | a017ebff96d2cc12943801c933e5733b4e827b3b (diff) | |
| parent | 07b71d26fb481859548b597aa43d7312608220d9 (diff) | |
| download | National_eIDAS_Gateway-884f208b5f4152a13e3f77d64ce0d4adec481700.tar.gz National_eIDAS_Gateway-884f208b5f4152a13e3f77d64ce0d4adec481700.tar.bz2 National_eIDAS_Gateway-884f208b5f4152a13e3f77d64ce0d4adec481700.zip | |
Merge branch 'feature/matching_base' into 'feature/matching_search_address'
# Conflicts:
# connector/src/test/java/at/asitplus/eidas/specific/connector/test/saml2/Pvp2SProfileEndPointTest.java
Diffstat (limited to 'connector/src/main')
3 files changed, 11 insertions, 3 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/application.properties b/connector/src/main/resources/application.properties index f66f8e3a..bec125dc 100644 --- a/connector/src/main/resources/application.properties +++ b/connector/src/main/resources/application.properties @@ -12,7 +12,9 @@ app.build.artifactId=ms_connector ## SpringBoot Admin client spring.boot.admin.client.enabled=false - +############################################################################# +## SpringBoot Actuator +management.endpoints.web.exposure.include=health,info ############################################################################# 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" /> |