summaryrefslogtreecommitdiff
path: root/eaaf_core/src/main
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2019-11-12 09:47:08 +0100
committerThomas Lenz <thomas.lenz@egiz.gv.at>2019-11-12 09:47:08 +0100
commit465c25d4d338b4058366456d3fd7a41cd372481b (patch)
tree26eadc10f9a856d17299d4007d1073e11c57111e /eaaf_core/src/main
parent25c26922b092072330d04ca36a441df2770b7807 (diff)
downloadEAAF-Components-465c25d4d338b4058366456d3fd7a41cd372481b.tar.gz
EAAF-Components-465c25d4d338b4058366456d3fd7a41cd372481b.tar.bz2
EAAF-Components-465c25d4d338b4058366456d3fd7a41cd372481b.zip
refactor AuthModule interface to inject current IRequest into selectProcess method
Diffstat (limited to 'eaaf_core/src/main')
-rw-r--r--eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/AbstractAuthenticationManager.java32
-rw-r--r--eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/modules/ModuleRegistration.java6
-rw-r--r--eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/RestartAuthProzessManagement.java2
3 files changed, 21 insertions, 19 deletions
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/AbstractAuthenticationManager.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/AbstractAuthenticationManager.java
index 0d3eaf18..4cefcd8d 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/AbstractAuthenticationManager.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/AbstractAuthenticationManager.java
@@ -113,7 +113,7 @@ public abstract class AbstractAuthenticationManager implements IAuthenticationMa
}
//load OA configuration from pending request
- ISPConfiguration oaParam = pendingReq.getServiceProviderConfiguration();
+ final ISPConfiguration oaParam = pendingReq.getServiceProviderConfiguration();
//set logging context and log unique OA identifier to revision log
TransactionIDUtils.setServiceProviderId(oaParam.getUniqueIdentifier());
@@ -186,6 +186,7 @@ public abstract class AbstractAuthenticationManager implements IAuthenticationMa
}
}
+ @Override
public final void performOnlyIDPLogOut(HttpServletRequest request, HttpServletResponse response, IRequest pendingReq) {
log.debug("Close session. Remove pending request ... ");
@@ -200,7 +201,7 @@ public abstract class AbstractAuthenticationManager implements IAuthenticationMa
else
log.info("Closing SSO session NOT successfully");
- } catch (EAAFSSOException e) {
+ } catch (final EAAFSSOException e) {
log.warn("Destroying of SSO session FAILED. Reason: " + e.getMessage(), e);
}
@@ -227,7 +228,7 @@ public abstract class AbstractAuthenticationManager implements IAuthenticationMa
revisionsLogger.logEvent(pendingReq, EVENT_AUTHENTICATION_PROCESS_STARTED);
//create authentication process execution context
- ExecutionContext executionContext = new ExecutionContextImpl();
+ final ExecutionContext executionContext = new ExecutionContextImpl();
//set oaIdentifeir
executionContext.put(EAAFConstants.PROCESS_ENGINE_SERVICE_PROVIDER_ENTITYID,
@@ -239,15 +240,15 @@ public abstract class AbstractAuthenticationManager implements IAuthenticationMa
executionContext.put(EAAFConstants.PROCESS_ENGINE_SSL_CLIENT_CERTIFICATE,
((X509Certificate[])httpReq.getAttribute("javax.servlet.request.X509Certificate")));
pendingReq.setRawDataToTransaction(EAAFConstants.PROCESS_ENGINE_SSL_CLIENT_CERTIFICATE,
- ((X509Certificate[])httpReq.getAttribute("javax.servlet.request.X509Certificate")));
+ (httpReq.getAttribute("javax.servlet.request.X509Certificate")));
}
//add additional http request parameter to context
if (!reqParameterWhiteListeForModules.isEmpty()) {
- Enumeration<String> reqParamNames = httpReq.getParameterNames();
+ final Enumeration<String> reqParamNames = httpReq.getParameterNames();
while(reqParamNames.hasMoreElements()) {
- String paramName = reqParamNames.nextElement();
+ final String paramName = reqParamNames.nextElement();
if (StringUtils.isNotEmpty(paramName) && reqParameterWhiteListeForModules.contains(paramName) )
executionContext.put(paramName, StringEscapeUtils.escapeHtml4(httpReq.getParameter(paramName)));
}
@@ -255,9 +256,9 @@ public abstract class AbstractAuthenticationManager implements IAuthenticationMa
//add additional http request parameter to context
if (!reqHeaderWhiteListeForModules.isEmpty()) {
- Enumeration<String> reqHeaderNames = httpReq.getHeaderNames();
+ final Enumeration<String> reqHeaderNames = httpReq.getHeaderNames();
while(reqHeaderNames.hasMoreElements()) {
- String paramName = reqHeaderNames.nextElement();
+ final String paramName = reqHeaderNames.nextElement();
if (StringUtils.isNotEmpty(paramName)
&& at.gv.egiz.eaaf.core.impl.utils.ArrayUtils.containsCaseInsensitive(paramName, reqHeaderWhiteListeForModules)
//reqHeaderWhiteListeForModules.contains(paramName.toLowerCase())
@@ -305,7 +306,7 @@ public abstract class AbstractAuthenticationManager implements IAuthenticationMa
pendingReq.setAuthenticated(false);
//create execution context
- ExecutionContext executionContext = new ExecutionContextImpl();
+ final ExecutionContext executionContext = new ExecutionContextImpl();
executionContext.put(ISSOManager.PROCESS_ENGINE_SSO_CONSENTS_EVALUATION, true);
//start process engine
@@ -325,10 +326,9 @@ public abstract class AbstractAuthenticationManager implements IAuthenticationMa
try {
//put pending-request ID on execurtionContext
executionContext.put(EAAFConstants.PROCESS_ENGINE_PENDINGREQUESTID, pendingReq.getPendingRequestId());
- executionContext.put(EAAFConstants.PROCESSCONTEXT_SP_CONFIG, pendingReq.getServiceProviderConfiguration());
// create process instance
- String processDefinitionId = ModuleRegistration.getInstance().selectProcess(executionContext);
+ final String processDefinitionId = ModuleRegistration.getInstance().selectProcess(executionContext, pendingReq);
if (processDefinitionId == null) {
log.warn("No suitable process found for PendingReqId " + pendingReq.getPendingRequestId() );
@@ -338,7 +338,7 @@ public abstract class AbstractAuthenticationManager implements IAuthenticationMa
}
- String processInstanceId = processEngine.createProcessInstance(processDefinitionId, executionContext);
+ final String processInstanceId = processEngine.createProcessInstance(processDefinitionId, executionContext);
// keep process instance id in protocol pending-request
pendingReq.setProcessInstanceId(processInstanceId);
@@ -349,12 +349,12 @@ public abstract class AbstractAuthenticationManager implements IAuthenticationMa
// start process
processEngine.start(pendingReq);
- } catch (ProcessExecutionException e) {
- Throwable cause = e.getCause();
+ } catch (final ProcessExecutionException e) {
+ final Throwable cause = e.getCause();
if (cause != null && cause instanceof TaskExecutionException) {
- Throwable taskCause = cause.getCause();
+ final Throwable taskCause = cause.getCause();
if (taskCause != null && taskCause instanceof EAAFException) {
- EAAFException moaTaskCause = (EAAFException) taskCause;
+ final EAAFException moaTaskCause = (EAAFException) taskCause;
log.warn(taskCause.getMessage(), taskCause);
throw moaTaskCause;
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/modules/ModuleRegistration.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/modules/ModuleRegistration.java
index f35b6032..6789c802 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/modules/ModuleRegistration.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/modules/ModuleRegistration.java
@@ -45,6 +45,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.core.io.Resource;
+import at.gv.egiz.eaaf.core.api.IRequest;
import at.gv.egiz.eaaf.core.api.idp.auth.modules.AuthModule;
import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
import at.gv.egiz.eaaf.core.api.idp.process.ProcessEngine;
@@ -161,11 +162,12 @@ public class ModuleRegistration {
*
* @param context
* the {@link ExecutionContext}.
+ * @param pendingReq the current processed {@link IRequest}
* @return the process id or {@code null}
*/
- public String selectProcess(ExecutionContext context) {
+ public String selectProcess(ExecutionContext context, IRequest pendingReq) {
for (final AuthModule module : priorizedModules) {
- final String id = module.selectProcess(context);
+ final String id = module.selectProcess(context, pendingReq);
if (StringUtils.isNotEmpty(id)) {
log.debug("Process with id '{}' selected, for context '{}'.", id, context);
return id;
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/RestartAuthProzessManagement.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/RestartAuthProzessManagement.java
index 1e5b63a2..5ea5baa1 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/RestartAuthProzessManagement.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/RestartAuthProzessManagement.java
@@ -79,7 +79,7 @@ public class RestartAuthProzessManagement extends AbstractAuthServletTask {
log.debug("Select new auth.-process and restart restart process-engine ... ");
// select and create new process instance
- final String processDefinitionId = ModuleRegistration.getInstance().selectProcess(newec);
+ final String processDefinitionId = ModuleRegistration.getInstance().selectProcess(newec, pendingReq);
if (processDefinitionId == null) {
log.warn("No suitable authentication process found for SessionID " + pendingReq.getPendingRequestId());
throw new EAAFException("process.02", new Object[] { pendingReq.getPendingRequestId()});