Author: hfnukal Date: 2011-06-22 19:53:54 -0400 (Wed, 22 Jun 2011) New Revision: 6718 Added: epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/LogoutControl.java epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginController.java epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/TicketConfiguration.java Log: JBEPP-952 merge r5822 Added: epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/LogoutControl.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/LogoutControl.java (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/LogoutControl.java 2011-06-22 23:53:54 UTC (rev 6718) @@ -0,0 +1,50 @@ +/* +* Copyright (C) 2003-2009 eXo Platform SAS. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.exoplatform.web.login; + +/** + * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a> + * @version $Revision$ + */ +public class LogoutControl +{ + private static final ThreadLocal<Boolean> wantLogout = new ThreadLocal<Boolean>() + { + @Override + protected Boolean initialValue() { + return false; + } + }; + + public static void cancelLogout() + { + wantLogout.set(false); + } + + public static void wantLogout() + { + wantLogout.set(true); + } + + public static boolean isLogoutRequired() + { + return wantLogout.get(); + } +} \ No newline at end of file Added: epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginController.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginController.java (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginController.java 2011-06-22 23:53:54 UTC (rev 6718) @@ -0,0 +1,88 @@ +/* +* Copyright (C) 2003-2009 eXo Platform SAS. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.exoplatform.web.security; + +import org.exoplatform.web.login.InitiateLoginServlet; +import org.exoplatform.web.security.security.AbstractTokenService; +import org.exoplatform.web.security.security.CookieTokenService; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; +import org.gatein.wci.security.WCILoginController; + +import javax.servlet.ServletException; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a> + * @version $Revision$ + */ +public class PortalLoginController extends WCILoginController { + + /** . */ + private static final Logger log = LoggerFactory.getLogger(PortalLoginController.class); + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + super.doGet(req, resp); + + // Obtain initial URI + String uri = req.getParameter("initialURI"); + + // otherwise compute one + if (uri == null || uri.length() == 0) + { + //uri = req.getContextPath() + "/private/classic"; + uri = req.getContextPath(); + log.debug("No initial URI found, will use default " + uri + " instead "); + } + else + { + log.debug("Found initial URI " + uri); + //req.getSession(true).setAttribute("org.gatein.portal.login.initial_uri", uri); + } + + // if we do have a remember me + String rememberme = req.getParameter("rememberme"); + if ("true".equals(rememberme)) + { + boolean isRemember = "true".equals(req.getParameter(InitiateLoginServlet.COOKIE_NAME)); + if (isRemember) + { + //Create token + AbstractTokenService tokenService = AbstractTokenService.getInstance(CookieTokenService.class); + String cookieToken = tokenService.createToken(credentials); + + log.debug("Found a remember me request parameter, created a persistent token " + cookieToken + " for it and set it up " + + "in the next response"); + Cookie cookie = new Cookie(InitiateLoginServlet.COOKIE_NAME, cookieToken); + cookie.setPath(req.getContextPath()); + //cookie.setMaxAge((int)tokenService.getValidityTime() / 1000); + cookie.setMaxAge((int)tokenService.getValidityTime()); + resp.addCookie(cookie); + } + } + + // + resp.sendRedirect(uri); + } +} Added: epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/TicketConfiguration.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/TicketConfiguration.java (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/TicketConfiguration.java 2011-06-22 23:53:54 UTC (rev 6718) @@ -0,0 +1,76 @@ +/* +* Copyright (C) 2003-2009 eXo Platform SAS. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.exoplatform.web.security.security; + +import sun.reflect.generics.reflectiveObjects.NotImplementedException; + +import org.exoplatform.container.xml.InitParams; +import org.exoplatform.web.security.GateInToken; +import org.gatein.wci.security.Credentials; + +/** + * This class is only used to get validity form configuration. + * + * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a> + * @version $Revision$ + */ +public class TicketConfiguration extends AbstractTokenService<GateInToken, String> +{ + + public TicketConfiguration(InitParams initParams) + { + super(initParams); + } + + @Override + public GateInToken getToken(String id) + { + throw new NotImplementedException(); + } + + @Override + public GateInToken deleteToken(String id) + { + throw new NotImplementedException(); + } + + @Override + public String[] getAllTokens() + { + throw new NotImplementedException(); + } + + @Override + protected String decodeKey(String stringKey) + { + throw new NotImplementedException(); + } + + @Override + public long size() throws Exception + { + throw new NotImplementedException(); + } + + public String createToken(Credentials credentials) throws IllegalArgumentException, NullPointerException + { + throw new NotImplementedException(); + } +}