MOA-ID 1.1.1D01

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@81 d688527b-c9ab-4aba-bd8d-4036d912da1d

1 files changed, 10 insertions, 4 deletions

diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java b/id.server/src/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java
index c52de2ba8..362849fb1 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java
+++ b/id.server/src/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java
@@ -36,6 +36,7 @@ import at.gv.egovernment.moa.id.data.CookieManager;
 import at.gv.egovernment.moa.id.proxy.ConnectionBuilder;
 import at.gv.egovernment.moa.id.proxy.ConnectionBuilderFactory;
 import at.gv.egovernment.moa.id.proxy.LoginParameterResolver;
+import at.gv.egovernment.moa.id.proxy.LoginParameterResolverException;
 import at.gv.egovernment.moa.id.proxy.LoginParameterResolverFactory;
 import at.gv.egovernment.moa.id.proxy.MOAIDProxyInitializer;
 import at.gv.egovernment.moa.id.proxy.invoke.GetAuthenticationDataInvoker;
@@ -133,10 +134,15 @@ public class ProxyServlet extends HttpServlet {
     String clientIPAddress = req.getRemoteAddr();
     Map loginHeaders = null;
     Map loginParameters = null;
-    if (oaConf.getAuthType().equals(OAConfiguration.PARAM_AUTH))
-      loginParameters = lpr.getAuthenticationParameters(oaConf, authData, clientIPAddress);
-    else
-      loginHeaders = lpr.getAuthenticationHeaders(oaConf, authData, clientIPAddress);
+    try {
+	if (oaConf.getAuthType().equals(OAConfiguration.PARAM_AUTH))
+	  loginParameters = lpr.getAuthenticationParameters(oaConf, authData, clientIPAddress);	
+	else
+	  loginHeaders = lpr.getAuthenticationHeaders(oaConf, authData, clientIPAddress);
+		
+	} catch (LoginParameterResolverException ex) {
+		throw new ProxyException("proxy.13", new Object[] { publicURLPrefix });		
+	}
 
     // setup SSLSocketFactory for communication with the online application
     SSLSocketFactory ssf = null;