[jboss-svn-commits] JBL Code SVN: r7040 - labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal

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

Author: szimano
Date: 2006-10-23 17:25:20 -0400 (Mon, 23 Oct 2006)
New Revision: 7040

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/AutologinFilter.java
   labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/ShowLoginPageServlet.java
Log:
login JBLAB-764


Modified: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/AutologinFilter.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/AutologinFilter.java	2006-10-23 21:03:44 UTC (rev 7039)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/AutologinFilter.java	2006-10-23 21:25:20 UTC (rev 7040)
@@ -101,9 +101,14 @@
 		boolean hasUserCookie = false;
 		boolean hasPassCookie = false;
 
+		log.info("iterating thru cookies");
+		
 		if (cookies != null)
 			for (int i = 0; i < cookies.length
 					&& !(hasUserCookie && hasPassCookie); i++) {
+				
+					log.info(i+" cookie: "+cookies[i].getName());
+					
 				if (cookies[i].getName().equals(USER_COOKIE)) {
 					hasUserCookie = true;
 					cred[0] = cookies[i].getValue();
@@ -165,8 +170,9 @@
 				
 				if (cookies[i].getName().equals(USER_COOKIE)
 						|| cookies[i].getName().equals(PASS_COOKIE)) {
-					log.info("deleting cookie: " + cookies[i]);
+					log.info("deleting cookie: " + cookies[i].getName());
 					cookies[i].setMaxAge(0);
+					cookies[i].setPath("/");
 					response.addCookie(cookies[i]);
 				}
 			}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/ShowLoginPageServlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/ShowLoginPageServlet.java	2006-10-23 21:03:44 UTC (rev 7039)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/ShowLoginPageServlet.java	2006-10-23 21:25:20 UTC (rev 7040)
@@ -7,6 +7,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.jboss.logging.Logger;
+
 public class ShowLoginPageServlet extends HttpServlet {
 
 	/**
@@ -18,26 +20,39 @@
 
 	private static final String TOKENIZER = "<!AutoLoginTokenizer!>";
 
+	private static final Logger log = Logger
+			.getLogger(ShowLoginPageServlet.class);
+
 	protected void doGet(HttpServletRequest request,
 			HttpServletResponse response) throws ServletException, IOException {
 
 		if (request.getRequestURI().endsWith("/logout")) {
 			AutologinFilter.clearCookies(request, response);
-			
-			response.sendRedirect("/portal/auth/portal/default/login/LoginWindow?action=1&logout=true");
-			
+
+			response
+					.sendRedirect("/portal/auth/portal/default/login/LoginWindow?action=1&logout=true");
+
 			return;
 		} else {
-			String[] cred;
+			String[] cred = AutologinFilter.hasCookies(request);
 
-			if ((cred = AutologinFilter.hasCookies(request)) != null
-					&& cred.length == 2) {
-				response
-						.sendRedirect("j_security_check?j_username=" + cred[0]
-								+ "&j_password=" + PASS_TOKEN + TOKENIZER
-								+ request.getRemoteAddr() + TOKENIZER
-								+ request.getHeader("User-Agent") + TOKENIZER
-								+ cred[1]);
+			log.info(cred);
+
+			if (cred != null && cred.length == 2) {
+				log.info("redirecting login " + cred[0] + " " + cred[1]);
+
+				String url = "j_security_check?j_username=" + cred[0]
+						+ "&j_password=" + PASS_TOKEN + TOKENIZER
+						+ request.getRemoteAddr() + TOKENIZER
+						+ request.getHeader("User-Agent") + TOKENIZER + cred[1];
+				
+				url = response.encodeRedirectURL(url);
+				
+				log.info(url);
+
+				//request.getRequestDispatcher(url).forward(request, response);
+				response.sendRedirect(url);
+				
 				return;
 
 			} else {
@@ -47,5 +62,4 @@
 		}
 
 	}
-
 }