[jboss-svn-commits] JBL Code SVN: r7418 - in labs/jbosslabs/trunk/portal-extensions: forge-login/src/java/org/jboss/labs/login forge-login-portlet/src/java/org/jbosslabs/security/portlet forge-portal-attr/src/java/org/jboss/forge/portal
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Nov 6 14:01:15 EST 2006
Author: szimano
Date: 2006-11-06 14:01:06 -0500 (Mon, 06 Nov 2006)
New Revision: 7418
Removed:
labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/PerformLoginFilter.java
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/portlet/Login.java
labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/labs/login/LabsLoginModule.java
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
labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WrongLoginServlet.java
Log:
autologin tested and debuged
JBLAB-764
Modified: labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/labs/login/LabsLoginModule.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/labs/login/LabsLoginModule.java 2006-11-06 15:18:46 UTC (rev 7417)
+++ labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/labs/login/LabsLoginModule.java 2006-11-06 19:01:06 UTC (rev 7418)
@@ -120,11 +120,11 @@
if (inputPassword.startsWith(PASS_TOKEN)) {
- log.info("Perforiming autologin");
+ log.debug("Perforiming autologin");
String password = inputPassword.substring(PASS_TOKEN.length());
- log.info("Whole: " + password);
+ log.debug("Whole: " + password);
String[] tokens = password.split(TOKENIZER);
String key = tokens[1];
@@ -134,13 +134,13 @@
pass = ForgeHelper.encodeToMD5(pass);
- log.info("Encoded pass: "+pass);
+ log.debug("Encoded pass: "+pass);
PropertyService service = LabsServices.getPropertyService();
String persistedPass = (String)service.getProperty(key, AUTLOGIN_PASSWORD);
- log.info("Ip: " + "Key: " + key + "Pass: " + pass + "PersPass: " + persistedPass);
+ log.debug("Ip: " + "Key: " + key + "Pass: " + pass + "PersPass: " + persistedPass);
return pass.equals(persistedPass);
} else {
Modified: labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/portlet/Login.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/portlet/Login.java 2006-11-06 15:18:46 UTC (rev 7417)
+++ labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/portlet/Login.java 2006-11-06 19:01:06 UTC (rev 7418)
@@ -37,7 +37,6 @@
public void processAction(JBossActionRequest req, JBossActionResponse resp) throws PortletException, IOException {
- log.info("process action executed");
try
{
@@ -67,7 +66,6 @@
throws IOException, PortletException
{
- log.info(response.createActionURL().toString());
try
{
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-11-06 15:18:46 UTC (rev 7417)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/AutologinFilter.java 2006-11-06 19:01:06 UTC (rev 7418)
@@ -56,18 +56,19 @@
HttpServletResponse httpResp = (HttpServletResponse) response;
// if loginFailed - do not try to autologin
- if (!httpReq.getRequestURI().endsWith("/loginFailed")) {
-
- log.info("Request: " + httpReq.getRequestURI() + " Query: "
+ if (!httpReq.getRequestURI().endsWith("LoginWindow")
+ && !httpReq.getRequestURI().endsWith("loginFailed")) {
+
+ log.debug("Request: " + httpReq.getRequestURI() + " Query: "
+ httpReq.getQueryString());
- log.info("doing login");
+ log.debug("doing login");
if (httpReq.getUserPrincipal() != null
&& httpReq.getSession().getAttribute(REQUEST_AUTOLOGIN) != null
&& httpReq.getSession().getAttribute(REQUEST_AUTOLOGIN)
.equals(true)) {
- log.info("sending cookies");
+ log.debug("sending cookies");
httpReq.getSession().removeAttribute(REQUEST_AUTOLOGIN);
@@ -93,7 +94,7 @@
httpResp.addCookie(idCookie);
- log.info(httpReq.getUserPrincipal().getName());
+ log.debug(httpReq.getUserPrincipal().getName());
} else if (httpReq.getUserPrincipal() != null) {
String[] cred = hasCookies(httpReq);
@@ -108,7 +109,7 @@
&& !httpReq.getRequestURI().equals("/portal/default/login")) {
// user not logged in - try autologin
- log.info("Looking for cookies: " + httpReq.getRequestURI());
+ log.debug("Looking for cookies: " + httpReq.getRequestURI());
String[] cred;
@@ -127,7 +128,7 @@
}
}
}
-
+
chain.doFilter(request, response);
}
@@ -177,7 +178,7 @@
AUTLOGIN_PASSWORD, ForgeHelper
.encodeToMD5(newPass));
- log.info("cookie refreshed: " + newPass + " "
+ log.debug("cookie refreshed: " + newPass + " "
+ ForgeHelper.encodeToMD5(newPass));
} catch (NamingException e) {
@@ -201,13 +202,13 @@
boolean hasPassCookie = false;
boolean hasIdCookie = false;
- log.info("iterating thru cookies");
+ log.debug("iterating thru cookies");
if (cookies != null)
for (int i = 0; i < cookies.length
&& !(hasUserCookie && hasPassCookie && hasIdCookie); i++) {
- log.info(i + " cookie: " + cookies[i].getName());
+ log.debug(i + " cookie: " + cookies[i].getName());
if (cookies[i].getName().equals(USER_COOKIE)) {
hasUserCookie = true;
@@ -254,7 +255,7 @@
propertyService.setProperty(id, AUTLOGIN_PASSWORD, ForgeHelper
.encodeToMD5(password));
- log.info("Saved: " + username + " " + password + " " + id);
+ log.debug("Saved: " + username + " " + password + " " + id);
return id;
} catch (NamingException e) {
@@ -279,32 +280,33 @@
Cookie[] cookies = request.getCookies();
String id = null;
-
+
if (cookies != null)
for (int i = 0; i < cookies.length; i++) {
- log.info("Cookie: " + cookies[i].getName());
+ log.debug("Cookie: " + cookies[i].getName());
if (cookies[i].getName().equals(USER_COOKIE)
|| cookies[i].getName().equals(PASS_COOKIE)
|| cookies[i].getName().equals(ID_COOKIE)) {
- log.info("deleting cookie: " + cookies[i].getName());
+ log.debug("deleting cookie: " + cookies[i].getName());
cookies[i].setMaxAge(0);
cookies[i].setPath("/");
response.addCookie(cookies[i]);
-
+
if (cookies[i].getName().equals(ID_COOKIE)) {
id = cookies[i].getValue();
}
}
}
- if (request.getUserPrincipal() != null && id != null) {
+ if (id != null) {
PropertyService propertyService;
try {
propertyService = LabsServices.getPropertyService();
-
+ log.debug("trying to delete: "+id );
if (propertyService.getProperty(id, AUTLOGIN_PASSWORD) != null) {
+ log.debug("Deleting: "+id);
propertyService.removeProperty(id, AUTLOGIN_PASSWORD);
}
} catch (NamingException e) {
Deleted: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/PerformLoginFilter.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/PerformLoginFilter.java 2006-11-06 15:18:46 UTC (rev 7417)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/PerformLoginFilter.java 2006-11-06 19:01:06 UTC (rev 7418)
@@ -1,62 +0,0 @@
-package org.jboss.forge.portal;
-
-import java.io.IOException;
-
-import javax.management.remote.JMXConnector;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.jboss.logging.Logger;
-
-public class PerformLoginFilter implements Filter {
- private static final String PASS_TOKEN = "AutoLoginToken.";
-
- private static final String TOKENIZER = "<!AutoLoginTokenizer!>";
-
- private static final Logger log = Logger
- .getLogger(PerformLoginFilter.class);
-
- public void destroy() {
- // TODO Auto-generated method stub
-
- }
-
- public void doFilter(ServletRequest request, ServletResponse response,
- FilterChain chain) throws IOException, ServletException {
-
- HttpServletRequest httpReq = (HttpServletRequest) request;
- HttpServletResponse httpResp = (HttpServletResponse) response;
-
- log.info("username: (" + httpReq.getRequestedSessionId() + ") "
- + httpReq.getSession().getAttribute("j_username"));
- log
- .info("password: "
- + httpReq.getSession().getAttribute("j_password"));
-
- String[] cred;
- if (httpReq.getRequestURI().contains("/login")
- && (cred = AutologinFilter.hasCookies(httpReq)) != null
- && cred.length == AutologinFilter.COOKIE_DESC_LEN) {
- httpResp.sendRedirect("j_security_check?j_username=" + cred[0]
- + "&j_password=" + PASS_TOKEN + TOKENIZER + cred[2]
- + TOKENIZER + cred[1]);
- return;
-
- }
-
- chain.doFilter(request, response);
-
- }
-
- public void init(FilterConfig arg0) throws ServletException {
- // TODO Auto-generated method stub
-
- }
-
-}
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-11-06 15:18:46 UTC (rev 7417)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/ShowLoginPageServlet.java 2006-11-06 19:01:06 UTC (rev 7418)
@@ -36,10 +36,10 @@
} else {
String[] cred = AutologinFilter.hasCookies(request);
- log.info(cred);
+ log.debug(cred);
if (cred != null && cred.length == AutologinFilter.COOKIE_DESC_LEN) {
- log.info("redirecting login " + cred[0] + " " + cred[1]);
+ log.debug("redirecting login " + cred[0] + " " + cred[1]);
String url = "j_security_check?j_username=" + cred[0]
+ "&j_password=" + PASS_TOKEN + TOKENIZER + cred[2]
@@ -47,7 +47,7 @@
url = response.encodeRedirectURL(url);
- log.info(url);
+ log.debug(url);
// request.getRequestDispatcher(url).forward(request, response);
response.sendRedirect(url);
@@ -55,7 +55,8 @@
return;
} else {
- request.getRequestDispatcher("login").forward(request, response);
+ request.getRequestDispatcher("login")
+ .forward(request, response);
return;
}
}
Modified: 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 2006-11-06 15:18:46 UTC (rev 7417)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WrongLoginServlet.java 2006-11-06 19:01:06 UTC (rev 7418)
@@ -30,7 +30,7 @@
}
} else {
response
- .sendRedirect("/portal/sec/portal/default/login/LoginWindow?action=1");
+ .sendRedirect("/portal/portal/default/login/LoginWindow?action=2&loginFailed=loginFailed");
}
}
More information about the jboss-svn-commits
mailing list