[jboss-svn-commits] JBL Code SVN: r19776 - in labs/jbosslabs/trunk/portal-extensions: forge-portal-attr/src/java/org/jboss/forge/portal and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: szimano
Date: 2008-04-30 08:14:04 -0400 (Wed, 30 Apr 2008)
New Revision: 19776

Removed:
   labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WrongLoginServlet.java
Modified:
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
   labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/login/LabsFormAuthenticator.java
Log:
fixed wrong login credentials redirection problem

Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2008-04-30 12:04:17 UTC (rev 19775)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2008-04-30 12:14:04 UTC (rev 19776)
@@ -33,7 +33,7 @@
 
     <!-- LABS FILTERS -->   
 
-   <servlet>
+   <!-- servlet>
    	<servlet-name>wrongLoginServlet</servlet-name>
    	<servlet-class>org.jboss.forge.portal.WrongLoginServlet</servlet-class>
    	<init-param>
@@ -46,7 +46,7 @@
    <servlet-mapping>
    	<servlet-name>wrongLoginServlet</servlet-name>
    	<url-pattern>/loginFailed</url-pattern>
-   </servlet-mapping>
+   </servlet-mapping -->
 
 	<servlet>
 		<servlet-name>ShowLoginPage</servlet-name>
@@ -416,7 +416,8 @@
       <realm-name>JBoss Portal</realm-name>
       <form-login-config>
          <form-login-page>/showLogin</form-login-page>
-         <form-error-page>/loginFailed</form-error-page>
+         <!-- form-error-page>/loginFailed</form-error-page-->
+         <form-error-page>/loginPage/LoginWindow?action=2&amp;loginFailed=loginFailed</form-error-page>
       </form-login-config>
    </login-config>
 

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WrongLoginServlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WrongLoginServlet.java	2008-04-30 12:04:17 UTC (rev 19775)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WrongLoginServlet.java	2008-04-30 12:14:04 UTC (rev 19776)
@@ -1,48 +0,0 @@
-package org.jboss.forge.portal;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class WrongLoginServlet extends HttpServlet {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	private final static String LOGIN_FAILED = "LOGIN_FAILED";
-
-	@Override
-	public void init() throws ServletException {
-		if (getInitParameter(LOGIN_FAILED) == null) {
-			throw new ServletException("LOGIN_FAILED parameter not set for "
-					+ this.getClass().getName());
-		}
-
-		super.init();
-	}
-
-	protected void doGet(HttpServletRequest request,
-			HttpServletResponse response) throws ServletException, IOException {
-		String[] cred;
-
-		if ((cred = AutologinFilter.hasCookies(request)) != null
-				&& (cred.length == AutologinFilter.COOKIE_DESC_LEN)) {
-			AutologinFilter.clearCookies(request, response);
-
-			if (request.getSession().getAttribute(AutologinFilter.ENTER_URI) != null) {
-				response.sendRedirect(request.getSession().getAttribute(
-						AutologinFilter.ENTER_URI).toString());
-			} else {
-				response.sendRedirect("/");
-			}
-		} else {
-			response.sendRedirect(getInitParameter(LOGIN_FAILED));
-		}
-	}
-
-}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/login/LabsFormAuthenticator.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/login/LabsFormAuthenticator.java	2008-04-30 12:04:17 UTC (rev 19775)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/login/LabsFormAuthenticator.java	2008-04-30 12:14:04 UTC (rev 19776)
@@ -2,6 +2,9 @@
 
 import java.io.IOException;
 
+import javax.servlet.RequestDispatcher;
+
+import org.apache.catalina.authenticator.Constants;
 import org.apache.catalina.authenticator.FormAuthenticator;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
@@ -9,29 +12,53 @@
 import org.jboss.forge.portal.AutologinFilter;
 import org.jboss.logging.Logger;
 
-public class LabsFormAuthenticator extends FormAuthenticator{
+public class LabsFormAuthenticator extends FormAuthenticator {
 
 	private static final String AUTOLOGIN_NAME = "autologin";
 
-	private static final Logger log = Logger.getLogger(LabsFormAuthenticator.class);
-	
+	private static final Logger log = Logger
+			.getLogger(LabsFormAuthenticator.class);
+
 	@Override
-	public boolean authenticate(Request request, Response response, LoginConfig config)
-			throws IOException {
-		
+	public boolean authenticate(Request request, Response response,
+			LoginConfig config) throws IOException {
+
 		log.debug("labs auth valve eexecuted");
-		
+
 		if (request.getParameter(AUTOLOGIN_NAME) != null
 				&& request.getParameter(AUTOLOGIN_NAME).equals("Remember me")) {
 			log.debug("Autologin enabled");
 			request.getSession().setAttribute(
 					AutologinFilter.REQUEST_AUTOLOGIN, true);
-		}
-		else {
+		} else {
 			log.debug("autologin disabled");
 		}
-		
+
 		return super.authenticate(request, response, config);
 	}
 
+	protected void forwardToErrorPage(Request request, Response response,
+			LoginConfig config) {
+
+		try {
+			String[] cred;
+			if ((cred = AutologinFilter.hasCookies(request)) != null
+					&& (cred.length == AutologinFilter.COOKIE_DESC_LEN)) {
+				AutologinFilter.clearCookies(request, response);
+
+				if (request.getSession()
+						.getAttribute(AutologinFilter.ENTER_URI) != null) {
+					response.sendRedirect(request.getSession().getAttribute(
+							AutologinFilter.ENTER_URI).toString());
+				} else {
+					response.sendRedirect("/");
+				}
+			} else {
+				response.sendRedirect(config.getErrorPage());
+			}
+		} catch (IOException e) {
+			log.error("Couldn't redirect to error login page", e);
+		}
+	}
+
 }