Return-Path: Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org Received: (qmail 7083 invoked from network); 15 Oct 2007 21:15:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Oct 2007 21:15:40 -0000 Received: (qmail 19990 invoked by uid 500); 15 Oct 2007 21:15:27 -0000 Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org Received: (qmail 19655 invoked by uid 500); 15 Oct 2007 21:15:26 -0000 Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@portals.apache.org Received: (qmail 19640 invoked by uid 99); 15 Oct 2007 21:15:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Oct 2007 14:15:26 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Oct 2007 21:15:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 49C831A9832; Mon, 15 Oct 2007 14:14:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r584923 - in /portals/jetspeed-2/branches/JETSPEED-2.1.3: components/portal/src/java/org/apache/jetspeed/login/LoginProxyServlet.java src/webapp/WEB-INF/web.xml Date: Mon, 15 Oct 2007 21:14:47 -0000 To: jetspeed-dev@portals.apache.org From: taylor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071015211448.49C831A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: taylor Date: Mon Oct 15 14:14:46 2007 New Revision: 584923 URL: http://svn.apache.org/viewvc?rev=584923&view=rev Log: https://issues.apache.org/jira/browse/JS2-789 Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/login/LoginProxyServlet.java portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/web.xml Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/login/LoginProxyServlet.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/login/LoginProxyServlet.java?rev=584923&r1=584922&r2=584923&view=diff ============================================================================== --- portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/login/LoginProxyServlet.java (original) +++ portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal/src/java/org/apache/jetspeed/login/LoginProxyServlet.java Mon Oct 15 14:14:46 2007 @@ -20,6 +20,7 @@ import java.util.Iterator; import java.util.List; +import javax.servlet.ServletConfig; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -40,12 +41,23 @@ */ public class LoginProxyServlet extends HttpServlet { + private boolean credentialsFromRequest = true; + + public void init(ServletConfig config) throws ServletException + { + super.init(config); + String s = config.getInitParameter("credentialsFromRequest"); + if (s != null) + { + credentialsFromRequest = s.equalsIgnoreCase("true"); + } + } public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { String parameter; - + String username; request.setCharacterEncoding( "UTF-8" ); HttpSession session = request.getSession(true); @@ -55,17 +67,25 @@ session.setAttribute(LoginConstants.DESTINATION, parameter); else session.removeAttribute(LoginConstants.DESTINATION); - String username = request.getParameter(LoginConstants.USERNAME); - if (username != null) - session.setAttribute(LoginConstants.USERNAME, username); + if (credentialsFromRequest) + { + username = request.getParameter(LoginConstants.USERNAME); + if (username != null) + session.setAttribute(LoginConstants.USERNAME, username); + else + session.removeAttribute(LoginConstants.USERNAME); + parameter = request.getParameter(LoginConstants.PASSWORD); + if (parameter != null) + session.setAttribute(LoginConstants.PASSWORD, parameter); + else + session.removeAttribute(LoginConstants.PASSWORD); + } else - session.removeAttribute(LoginConstants.USERNAME); - parameter = request.getParameter(LoginConstants.PASSWORD); - if (parameter != null) - session.setAttribute(LoginConstants.PASSWORD, parameter); - else - session.removeAttribute(LoginConstants.PASSWORD); - + { + username = (String)session.getAttribute(LoginConstants.USERNAME); + parameter = (String)session.getAttribute(LoginConstants.PASSWORD); + } + // Globaly override all psml themes if (request .getParameter(PortalReservedParameters.PAGE_THEME_OVERRIDE_ATTRIBUTE) != null) Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/web.xml?rev=584923&r1=584922&r2=584923&view=diff ============================================================================== --- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/web.xml (original) +++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-INF/web.xml Mon Oct 15 14:14:46 2007 @@ -118,6 +118,10 @@ LoginProxyServlet org.apache.jetspeed.login.LoginProxyServlet + + credentialsFromRequest + true + --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org For additional commands, e-mail: jetspeed-dev-help@portals.apache.org