diff options
| author | peter.danner <peter.danner@d688527b-c9ab-4aba-bd8d-4036d912da1d> | 2005-10-30 09:01:22 +0000 |
|---|---|---|
| committer | peter.danner <peter.danner@d688527b-c9ab-4aba-bd8d-4036d912da1d> | 2005-10-30 09:01:22 +0000 |
| commit | fd8f60064e096b3c011cfc18e86a224308d762f7 (patch) | |
| tree | 663148b5c7796512abed02e26d40e7d4356dc15f /id.server/src/at/gv/egovernment/moa/id/proxy/servlet | |
| parent | 5d0e89e2aa3b46203fe748b3d34c433afcee72cf (diff) | |
| download | moa-id-spss-fd8f60064e096b3c011cfc18e86a224308d762f7.tar.gz moa-id-spss-fd8f60064e096b3c011cfc18e86a224308d762f7.tar.bz2 moa-id-spss-fd8f60064e096b3c011cfc18e86a224308d762f7.zip | |
updated for wbPK
git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@538 d688527b-c9ab-4aba-bd8d-4036d912da1d
Diffstat (limited to 'id.server/src/at/gv/egovernment/moa/id/proxy/servlet')
| -rw-r--r-- | id.server/src/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java | 12 |
1 files changed, 7 insertions, 5 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 327c658f1..0cb3389e8 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 @@ -91,7 +91,7 @@ public class ProxyServlet extends HttpServlet { /** Name of the Attribute for user binding */ private static final String ATT_OA_USER_BINDING = "UserBinding"; /** For extended internal debug messages */ - private static final boolean INTERNAL_DEBUG = false; + private static final boolean INTERNAL_DEBUG = true; /** Message to be given if browser login failed */ private static final String RET_401_MSG = "<html><head><title>Ein Fehler ist aufgetreten</title></head><body><h1>Fehler bei der Anmeldung</h1><p>Bei der Anmeldung ist ein Fehler aufgetreten.</p><p>Fehler bei der Anmeldung. <br>Prüfen Sie bitte ihre Berechtigung.<br><b>Abbruch durch den Benutzer.</b><br></p></body></html>"; @@ -102,7 +102,7 @@ public class ProxyServlet extends HttpServlet { Logger.debug("getRequestURL:" + req.getRequestURL().toString()); try { - if (req.getParameter(PARAM_SAMLARTIFACT) != null && req.getParameter(PARAM_TARGET) != null) { + if (req.getParameter(PARAM_SAMLARTIFACT) != null) { // check if SAML Artifact was already used in this session (in case of page reload) HttpSession session = req.getSession(); if (null != session && req.getParameter(PARAM_SAMLARTIFACT).equals(session.getAttribute(ATT_SAML_ARTIFACT))) { @@ -163,7 +163,8 @@ public class ProxyServlet extends HttpServlet { samlArtifact = req.getParameter(PARAM_SAMLARTIFACT); Logger.debug("moa-id-proxy login " + PARAM_SAMLARTIFACT + ": " + samlArtifact); // String target = req.getParameter(PARAM_TARGET); parameter given but not processed - + // boolean targetprovided = req.getParameter(PARAM_TARGET) != null; + // get authentication data from the MOA-ID Auth component AuthenticationData authData; try { @@ -189,11 +190,12 @@ public class ProxyServlet extends HttpServlet { // resolve login parameters to be forwarded to online application LoginParameterResolver lpr = LoginParameterResolverFactory.getLoginParameterResolver(publicURLPrefix); String clientIPAddress = req.getRemoteAddr(); + boolean businessService = oaParam.getBusinessService(); try { if (oaConf.getAuthType().equals(OAConfiguration.PARAM_AUTH)) - loginParameters = lpr.getAuthenticationParameters(oaConf, authData, clientIPAddress); + loginParameters = lpr.getAuthenticationParameters(oaConf, authData, clientIPAddress, businessService); else - loginHeaders = lpr.getAuthenticationHeaders(oaConf, authData, clientIPAddress); + loginHeaders = lpr.getAuthenticationHeaders(oaConf, authData, clientIPAddress, businessService); } catch (LoginParameterResolverException ex) { throw new ProxyException("proxy.13", new Object[] { publicURLPrefix }); } catch (NotAllowedException e) { |