diff options
| author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2018-07-20 14:54:41 +0200 |
|---|---|---|
| committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2018-07-20 14:54:41 +0200 |
| commit | a6162a8bef1ba3be301897120cbce84b1db18482 (patch) | |
| tree | 45f83049aa3a6cc482a5b7d91a838b74ed2e2351 | |
| parent | 84a86ceddf89f4a1a04396a37742a892f09ffafb (diff) | |
| download | EAAF-Components-a6162a8bef1ba3be301897120cbce84b1db18482.tar.gz EAAF-Components-a6162a8bef1ba3be301897120cbce84b1db18482.tar.bz2 EAAF-Components-a6162a8bef1ba3be301897120cbce84b1db18482.zip | |
some eventcode updates
3 files changed, 11 insertions, 8 deletions
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/idp/auth/IAuthenticationManager.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/idp/auth/IAuthenticationManager.java index 10cdad8f..27045604 100644 --- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/idp/auth/IAuthenticationManager.java +++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/idp/auth/IAuthenticationManager.java @@ -36,11 +36,10 @@ import at.gv.egiz.eaaf.core.exceptions.EAAFException; public interface IAuthenticationManager { - //TODO - public static int EVENT_AUTHENTICATION_PROCESS_FOR_SP = -1; - public static int EVENT_AUTHENTICATION_PROCESS_STARTED = -1; - public static int EVENT_AUTHENTICATION_PROCESS_FINISHED = -1; - public static int EVENT_AUTHENTICATION_PROCESS_ERROR = -1; + public static int EVENT_AUTHENTICATION_PROCESS_FOR_SP = 4003; + public static int EVENT_AUTHENTICATION_PROCESS_STARTED = 4000; + public static int EVENT_AUTHENTICATION_PROCESS_FINISHED = 4001; + public static int EVENT_AUTHENTICATION_PROCESS_ERROR = 4002; /** diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/FinalizeAuthenticationTask.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/FinalizeAuthenticationTask.java index ad187a91..6934f121 100644 --- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/FinalizeAuthenticationTask.java +++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/FinalizeAuthenticationTask.java @@ -34,6 +34,7 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import at.gv.egiz.eaaf.core.api.data.EAAFConstants; +import at.gv.egiz.eaaf.core.api.idp.auth.IAuthenticationManager; import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext; import at.gv.egiz.eaaf.core.exceptions.EAAFException; import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException; @@ -63,7 +64,9 @@ public class FinalizeAuthenticationTask extends AbstractAuthServletTask { log.info("AuthProcess finished. Redirect to Protocol Dispatcher."); performRedirectToProtocolFinialization(pendingReq, response); - + + revisionsLogger.logEvent(pendingReq, IAuthenticationManager.EVENT_AUTHENTICATION_PROCESS_FINISHED); + } catch (EAAFException e) { throw new TaskExecutionException(pendingReq, e.getMessage(), e); diff --git a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPVP2XProtocol.java b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPVP2XProtocol.java index 93264804..6ee9bc91 100644 --- a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPVP2XProtocol.java +++ b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPVP2XProtocol.java @@ -390,7 +390,8 @@ public abstract class AbstractPVP2XProtocol extends AbstractAuthProtocolModulCon msg.setVerified(true); } - + + revisionsLogger.logEvent(pendingReq, IRevisionLogger.AUTHPROTOCOL_TYPE, getAuthProtocolIdentifier()); if (msg instanceof PVPSProfileRequest && ((PVPSProfileRequest)msg).getSamlRequest() instanceof AuthnRequest) @@ -405,7 +406,7 @@ public abstract class AbstractPVP2XProtocol extends AbstractAuthProtocolModulCon new Object[] {((PVPSProfileRequest)msg).getSamlRequest().getClass().getName()}); } - revisionsLogger.logEvent(pendingReq, IRevisionLogger.AUTHPROTOCOL_TYPE, getAuthProtocolIdentifier()); + //switch to session authentication performAuthentication(request, response, pendingReq); |