From bdb66f176ee20388f689e994befa10b32b4ddfa3 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Wed, 25 Jul 2018 13:01:52 +0200 Subject: some small modifications regarding EAAFCore 1.0.1 --- .../id/advancedlogging/MOAIDEventConstants.java | 30 +++++++++++++--------- .../pvp2x/validation/AuthnRequestValidator.java | 2 +- 2 files changed, 19 insertions(+), 13 deletions(-) (limited to 'id/server/idserverlib/src/main/java/at') diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/MOAIDEventConstants.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/MOAIDEventConstants.java index 05d344fb6..d654eb359 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/MOAIDEventConstants.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/MOAIDEventConstants.java @@ -23,6 +23,7 @@ package at.gv.egovernment.moa.id.advancedlogging; import at.gv.egiz.components.eventlog.api.EventConstants; +import at.gv.egiz.eaaf.core.api.idp.auth.IAuthenticationManager; /** * @author tlenz @@ -51,18 +52,23 @@ public interface MOAIDEventConstants extends EventConstants { public static final int AUTHPROCESS_SLO_NOT_ALL_VALID = 4403; //authentication process information - public static final int AUTHPROCESS_START = 4000; - public static final int AUTHPROCESS_FINISHED = 4001; - public static final int AUTHPROCESS_MANDATES_REQUESTED = 4002; - public static final int AUTHPROCESS_STORK_REQUESTED = 4003; - public static final int AUTHPROCESS_SSO = 4004; - public static final int AUTHPROCESS_SSO_INVALID = 4005; - public static final int AUTHPROCESS_SSO_ASK_USER_START = 4006; - public static final int AUTHPROCESS_SSO_ASK_USER_FINISHED = 4007; - public static final int AUTHPROCESS_INTERFEDERATION = 4008; - public static final int AUTHPROCESS_INTERFEDERATION_REVEIVED = 4009; - public static final int AUTHPROCESS_INTERFEDERATION_IDP = 4010; - public static final int AUTHPROCESS_SERVICEPROVIDER = 4011; + public static final int AUTHPROCESS_START = IAuthenticationManager.EVENT_AUTHENTICATION_PROCESS_STARTED; + public static final int AUTHPROCESS_FINISHED = IAuthenticationManager.EVENT_AUTHENTICATION_PROCESS_STARTED; + + //reservated + //IAuthenticationManager.EVENT_AUTHENTICATION_PROCESS_ERROR; + //IAuthenticationManager.EVENT_AUTHENTICATION_PROCESS_FOR_SP; + + public static final int AUTHPROCESS_MANDATES_REQUESTED = 4004; + public static final int AUTHPROCESS_STORK_REQUESTED = 4005; + public static final int AUTHPROCESS_SSO = 4006; + public static final int AUTHPROCESS_SSO_INVALID = 4007; + public static final int AUTHPROCESS_SSO_ASK_USER_START = 4008; + public static final int AUTHPROCESS_SSO_ASK_USER_FINISHED = 4009; + public static final int AUTHPROCESS_INTERFEDERATION = 4010; + public static final int AUTHPROCESS_INTERFEDERATION_REVEIVED = 4011; + public static final int AUTHPROCESS_INTERFEDERATION_IDP = 4012; + public static final int AUTHPROCESS_SERVICEPROVIDER = 4013; public static final int AUTHPROCESS_BKUSELECTION_INIT = 4110; public static final int AUTHPROCESS_BKUTYPE_SELECTED = 4111; diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/validation/AuthnRequestValidator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/validation/AuthnRequestValidator.java index b42a1de28..19f865325 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/validation/AuthnRequestValidator.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/validation/AuthnRequestValidator.java @@ -67,7 +67,7 @@ public class AuthnRequestValidator implements IAuthnRequestValidator { if(useMandate.equals("true") && attributeConsumer != null) { if(!CheckMandateAttributes.canHandleMandate(attributeConsumer)) { MandateAttributesNotHandleAbleException e = new MandateAttributesNotHandleAbleException(); - throw new AuthnRequestValidatorException(e.getErrorId(), e.getParams(), e.getMessage(), pendingReq, e); + throw new AuthnRequestValidatorException(e.getErrorId(), e.getParams(), pendingReq, e); } } } -- cgit v1.2.3