1 files changed, 20 insertions, 6 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
index 771c9a35e..ce44db215 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
@@ -33,7 +33,6 @@ import javax.servlet.http.HttpServletResponse;
 import at.gv.egovernment.moa.id.advancedlogging.MOAIDEventConstants;
 import at.gv.egovernment.moa.id.advancedlogging.MOAReversionLogger;
 import at.gv.egovernment.moa.id.advancedlogging.StatisticLogger;
-
 import at.gv.egovernment.moa.id.advancedlogging.TransactionIDUtils;
 import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
 import at.gv.egovernment.moa.id.auth.MOAIDAuthInitializer;
@@ -45,7 +44,7 @@ import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
 import at.gv.egovernment.moa.id.auth.exception.ProtocolNotActiveException;
 import at.gv.egovernment.moa.id.auth.exception.WrongParametersException;
 import at.gv.egovernment.moa.id.auth.servlet.AuthServlet;
-
+import at.gv.egovernment.moa.id.config.ConfigurationException;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;
 import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
 import at.gv.egovernment.moa.id.data.IAuthData;
@@ -86,13 +85,18 @@ public class DispatcherServlet extends AuthServlet{
 			MOAIDAuthInitializer.initialize();
 			Logger.info(MOAIDMessageProvider.getInstance().getMessage(
 					"init.00", null));
+		
+			Logger.info("Dispatcher Servlet initialization finished.");
+			
 		} catch (Exception ex) {
 			Logger.fatal(
 					MOAIDMessageProvider.getInstance().getMessage("init.02",
 							null), ex);
-			throw new ServletException(ex);
+			
+			//throw new ServletException(ex);
+			
 		}
-		Logger.info("Dispatcher Servlet initialization finished.");
+		
 	}
 
 	protected void processRequest(HttpServletRequest req,
@@ -364,7 +368,10 @@ public class DispatcherServlet extends AuthServlet{
 					} catch (AuthnRequestValidatorException e) {
 						//log Error Message
 						StatisticLogger logger = StatisticLogger.getInstance();
-						logger.logErrorOperation(e, e.getErrorRequest());						
+						logger.logErrorOperation(e, e.getErrorRequest());
+						
+						//TODO: maybe add some error message handling???
+						
 						return;
 						
 					}catch (InvalidProtocolRequestException e) {
@@ -377,6 +384,13 @@ public class DispatcherServlet extends AuthServlet{
 								"(Errorcode=" + code +
 								" | Description=" + descr + ")");
 						return;
+					} catch (ConfigurationException e) {	
+						resp.setContentType("text/html;charset=UTF-8");
+						resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "NO valid protocol request received!" +
+								"(Errorcode=9199"
+								+" | Description="+ e.getMessage() + ")");
+						return;
+						
 					} catch (MOAIDException e) {						
 						Logger.error("Failed to generate a valid protocol request!");
 						resp.setContentType("text/html;charset=UTF-8");
@@ -544,7 +558,7 @@ public class DispatcherServlet extends AuthServlet{
 						try {
 							//Store OA specific SSO session information 
 							AuthenticationSessionStoreage.addSSOInformation(moasessionID, 
-									newSSOSessionId, assertionID, protocolRequest.getOAURL());
+									newSSOSessionId, assertionID, protocolRequest);
 														
 						} catch (AuthenticationException e) {
 							Logger.warn("SSO Session information can not be stored  -> SSO is not enabled!");