From 101f582d457f3e0bbd42083521360d18168fbd84 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 24 Feb 2016 06:22:18 +0100
Subject: add federated IDP authentication modul

---
 .../federated.Authentication.process.xml           | 30 ++++++++++++++--------
 .../main/resources/moaid_federated_auth.beans.xml  | 15 +++++++----
 2 files changed, 29 insertions(+), 16 deletions(-)

(limited to 'id/server/modules/moa-id-modules-federated_authentication/src/main/resources')

diff --git a/id/server/modules/moa-id-modules-federated_authentication/src/main/resources/at/gv/egovernment/moa/id/auth/modules/federatedauth/federated.Authentication.process.xml b/id/server/modules/moa-id-modules-federated_authentication/src/main/resources/at/gv/egovernment/moa/id/auth/modules/federatedauth/federated.Authentication.process.xml
index 4ff64e76d..c5c491ff8 100644
--- a/id/server/modules/moa-id-modules-federated_authentication/src/main/resources/at/gv/egovernment/moa/id/auth/modules/federatedauth/federated.Authentication.process.xml
+++ b/id/server/modules/moa-id-modules-federated_authentication/src/main/resources/at/gv/egovernment/moa/id/auth/modules/federatedauth/federated.Authentication.process.xml
@@ -1,18 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<pd:ProcessDefinition id="eIDASAuthentication" xmlns:pd="http://reference.e-government.gv.at/namespace/moa/process/definition/v1">
+<pd:ProcessDefinition id="SSOfederationAuthentication" xmlns:pd="http://reference.e-government.gv.at/namespace/moa/process/definition/v1">
 
 
-	<pd:Task id="createAuthnRequest" class="GenerateAuthnRequestTask" />
-	<pd:Task id="receiveAuthnResponse" class="ReceiveAuthnResponseTask" async="true" />
-	<pd:Task id="finalizeAuthentication" class="FinalizeAuthenticationTask" />
-	<pd:Task id="generateIdentityLink" class="CreateIdentityLinkTask" />
+	<pd:Task id="createInterfederationAuthnRequest" 	class="CreateFederatedAuthnRequestTask" />
+	<pd:Task id="receiveInterfederationAuthnResponse"	class="ReceiveFederatedAuthnResponseTask" async="true" />
+	<pd:Task id="finalizeAuthentication" 							class="FinalizeAuthenticationTask" />	
+	<pd:Task id="restartAuthProzessManagement"  			class="RestartAuthProzessManagement"/>
 
 	<pd:StartEvent id="start" />	
-	<pd:Transition from="start" to="createAuthnRequest" />	
-	<pd:Transition from="createAuthnRequest" to="receiveAuthnResponse" />
-	<pd:Transition from="receiveAuthnResponse" to="generateIdentityLink" />
-	<pd:Transition from="generateIdentityLink" to="finalizeAuthentication" />		
-	<pd:Transition from="finalizeAuthentication"    to="end" />	
+	
+	<pd:Transition from="start"	to="createInterfederationAuthnRequest" />	
+	
+	<!-- Switch to local authentication -->
+	<pd:Transition from="createInterfederationAuthnRequest" 	to="restartAuthProzessManagement" conditionExpression="ctx['requireLocalAuthentication']"/>
+	<pd:Transition from="receiveInterfederationAuthnResponse" to="restartAuthProzessManagement" conditionExpression="ctx['requireLocalAuthentication']"/>
+	<pd:Transition from="restartAuthProzessManagement"    		to="end" />
+	
+	<!-- Perform federated authentication -->
+	<pd:Transition from="createInterfederationAuthnRequest" 	to="receiveInterfederationAuthnResponse"/>
+	<pd:Transition from="receiveInterfederationAuthnResponse" to="finalizeAuthentication"/>	
+	<pd:Transition from="finalizeAuthentication"    					to="end" />
+			
 	<pd:EndEvent id="end" />
 
-</pd:ProcessDefinition>
+</pd:ProcessDefinition>
\ No newline at end of file
diff --git a/id/server/modules/moa-id-modules-federated_authentication/src/main/resources/moaid_federated_auth.beans.xml b/id/server/modules/moa-id-modules-federated_authentication/src/main/resources/moaid_federated_auth.beans.xml
index 3c3dd5b23..4933504f0 100644
--- a/id/server/modules/moa-id-modules-federated_authentication/src/main/resources/moaid_federated_auth.beans.xml
+++ b/id/server/modules/moa-id-modules-federated_authentication/src/main/resources/moaid_federated_auth.beans.xml
@@ -10,9 +10,7 @@
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
  
 
-							
-<!-- Authentication Process Tasks -->
-
+<!-- Federated authentication services -->
 	<bean id="FederatedAuthCredentialProvider"
 	      class="at.gv.egovernment.moa.id.auth.modules.federatedauth.utils.FederatedAuthCredentialProvider"/>
 
@@ -24,8 +22,15 @@
 	
 	<bean	id="FederatedAuthSignalController"
 				class="at.gv.egovernment.moa.id.auth.modules.federatedauth.controller.FederatedAuthSignalController"/>
+	
+	
+<!-- Federated Authentication Process Tasks -->
+	<bean id="CreateFederatedAuthnRequestTask" 
+				class="at.gv.egovernment.moa.id.auth.modules.federatedauth.tasks.CreateAuthnRequestTask"
+				scope="prototype"/>
 				
-	<bean	id="FederatedAuthMetadataBuilder"
-				class="at.gv.egovernment.moa.id.auth.modules.federatedauth.builder.FederatedAuthMetadataBuilder"/>
+	<bean id="ReceiveFederatedAuthnResponseTask" 
+				class="at.gv.egovernment.moa.id.auth.modules.federatedauth.tasks.ReceiveAuthnResponseTask"
+				scope="prototype"/>
 																								
 </beans>
\ No newline at end of file
-- 
cgit v1.2.3