From 8f3e8cb7c0e3bd34d64e1d7310c2eecb9cfefa9a Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 24 Feb 2016 16:30:58 +0100
Subject: fix bugs in SSO session-transfer modul

---
 .../modules/ssotransfer/task/RestoreSSOSessionTask.java  | 16 ++++++++++++----
 .../modules/ssotransfer/SSOTransfer.authmodule.beans.xml |  9 +++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

(limited to 'id/server/modules')

diff --git a/id/server/modules/moa-id-module-ssoTransfer/src/main/java/at/gv/egovernment/moa/id/auth/modules/ssotransfer/task/RestoreSSOSessionTask.java b/id/server/modules/moa-id-module-ssoTransfer/src/main/java/at/gv/egovernment/moa/id/auth/modules/ssotransfer/task/RestoreSSOSessionTask.java
index 9521f264e..6ba29fe3a 100644
--- a/id/server/modules/moa-id-module-ssoTransfer/src/main/java/at/gv/egovernment/moa/id/auth/modules/ssotransfer/task/RestoreSSOSessionTask.java
+++ b/id/server/modules/moa-id-module-ssoTransfer/src/main/java/at/gv/egovernment/moa/id/auth/modules/ssotransfer/task/RestoreSSOSessionTask.java
@@ -88,6 +88,17 @@ public class RestoreSSOSessionTask extends AbstractAuthServletTask {
 			
 		}
 		 
+    	//session is valid --> load MOASession object
+    	try {
+			defaultTaskInitialization(request, executionContext);
+						
+		} catch (MOAIDException | MOADatabaseException e1) {
+			Logger.error("Database Error! MOASession is not stored!");
+			throw new TaskExecutionException(pendingReq, "Load MOASession FAILED.", e1);
+			
+		}
+
+		
 		if (MiscUtil.isNotEmpty(receivedPostMessage)) {
 			Logger.debug("Receive POST-Message data. Start data-validation process ... ");
 			try {
@@ -105,10 +116,7 @@ public class RestoreSSOSessionTask extends AbstractAuthServletTask {
 			    if (PVPConfiguration.getInstance().getIDPPublicPath().contains(entityID)) {
 			    	// stored SSO session data is from this IDP - start local session reconstruction
 			    	Response ssoInformation = ssoTransferUtils.validateReceivedSSOContainer(sessionBlob);
-			    	
-			    	//session is valid --> load MOASession object
-			    	defaultTaskInitialization(request, executionContext);
-			    	
+			    				    	
 			    	//transfer SSO Assertion into MOA-Session
 			    	ssoTransferUtils.parseSSOContainerToMOASessionDataObject(pendingReq, moasession, ssoInformation);
 			    		
diff --git a/id/server/modules/moa-id-module-ssoTransfer/src/main/resources/at/gv/egovernment/moa/id/auth/modules/ssotransfer/SSOTransfer.authmodule.beans.xml b/id/server/modules/moa-id-module-ssoTransfer/src/main/resources/at/gv/egovernment/moa/id/auth/modules/ssotransfer/SSOTransfer.authmodule.beans.xml
index 62e9ac8fd..349b3afb0 100644
--- a/id/server/modules/moa-id-module-ssoTransfer/src/main/resources/at/gv/egovernment/moa/id/auth/modules/ssotransfer/SSOTransfer.authmodule.beans.xml
+++ b/id/server/modules/moa-id-module-ssoTransfer/src/main/resources/at/gv/egovernment/moa/id/auth/modules/ssotransfer/SSOTransfer.authmodule.beans.xml
@@ -14,6 +14,15 @@
 	<bean	id="SSOContainerUtils"
 				class="at.gv.egovernment.moa.id.auth.modules.ssotransfer.utils.SSOContainerUtils"/>
 
+
+	<bean	id="SSOTransferSignalServlet"
+				class="at.gv.egovernment.moa.id.auth.modules.ssotransfer.servlet.SSOTransferSignalServlet"/>
+
+
+	<bean	id="SSOTransferServlet"
+				class="at.gv.egovernment.moa.id.auth.modules.ssotransfer.servlet.SSOTransferServlet"/>
+
+
 <!-- Federated Authentication Process Tasks -->
 	<bean id="RestoreSSOSessionTask" 
 				class="at.gv.egovernment.moa.id.auth.modules.ssotransfer.task.RestoreSSOSessionTask"
-- 
cgit v1.2.3