1 files changed, 36 insertions, 4 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 ef9b63606..1f526caca 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
@@ -1,3 +1,25 @@
+/*******************************************************************************
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
 package at.gv.egovernment.moa.id.entrypoints;
 
 
@@ -6,6 +28,7 @@ import iaik.security.ecc.provider.ECCProvider;
 import iaik.security.provider.IAIK;
 
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.security.Security;
 import java.util.Iterator;
 import java.util.Map;
@@ -23,6 +46,7 @@ import at.gv.egovernment.moa.id.auth.MOAIDAuthInitializer;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
 import at.gv.egovernment.moa.id.auth.exception.AuthenticationException;
 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.commons.db.ConfigurationDBUtils;
@@ -295,20 +319,28 @@ public class DispatcherServlet extends AuthServlet{
 								}
 							}
 						}
+						
+					} catch (ProtocolNotActiveException e) {
+						resp.getWriter().write(e.getMessage());
+						resp.setContentType("text/html;charset=UTF-8");
+						resp.sendError(HttpServletResponse.SC_FORBIDDEN, e.getMessage());
+						return;
+						
+						
 					} catch (MOAIDException e) {
 						Logger.error("Failed to generate a valid protocol request!");
-						resp.sendError(HttpServletResponse.SC_BAD_REQUEST);
 						resp.setContentType("text/html;charset=UTF-8");
-						resp.getWriter().write("NO valid protocol request received!");
+						resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "NO valid protocol request received!");
 						return;
+						
 					}
 						
 					if (protocolRequest == null) {
 						Logger.error("Failed to generate a valid protocol request!");
-						resp.sendError(HttpServletResponse.SC_BAD_REQUEST);
 						resp.setContentType("text/html;charset=UTF-8");
-						resp.getWriter().write("NO valid protocol request received!");
+						resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "NO valid protocol request received!");
 						return;
+						
 					}
 				}