-<%-- If you don't want to encrypt passwords programmatically, or you don't
- care about using SSL for the login, you can change this form's action
- to "j_security_check" --%>
-"
- onsubmit="saveUsername(this);return validateForm(this)">
-
-
-
-
-
-<%@ include file="/scripts/login.js"%>
+<%@ include file="/common/taglibs.jsp"%>
+
+|
-
-
- |
- |
| - - | -- - | -
|---|---|
| - - | -- - | -
| - | - - - | -
| - | - - - " tabindex="4" /> - " tabindex="5" - onclick="document.getElementById('j_username').focus()" /> - | -
| - | - |
-
+"
+ onsubmit="saveUsername(this);return validateForm(this)">
+
+
+
+
+
+<%@ include file="/scripts/login.js"%>
Index: extras/spring/build.xml
===================================================================
RCS file: /cvs/appfuse/extras/spring/build.xml,v
retrieving revision 1.59
diff -u -r1.59 build.xml
--- extras/spring/build.xml 10 Aug 2005 15:21:44 -0000 1.59
+++ extras/spring/build.xml 29 Aug 2005 00:02:07 -0000
@@ -271,8 +271,6 @@
servletspec="2.3" sessiontimeout="10"
destdir="${webapp.target}/WEB-INF" distributable="false"
displayname="${ant.project.name}">
- |
+
+
+ |
+ |
| + + | ++ + | +
|---|---|
| + + | ++ + | +
| + | + + + | +
| + | + " tabindex="4" /> + " tabindex="5" + onclick="document.getElementById('j_username').focus()" /> + | +
| + | + |
+
+ * View Source + *
+ * + * @author Matt Raible + */ +public class SignupController extends BaseFormController { + private RoleManager roleManager; + + /** + * @param roleManager The roleManager to set. + */ + public void setRoleManager(RoleManager roleManager) { + this.roleManager = roleManager; + } + + public ModelAndView onSubmit(HttpServletRequest request, + HttpServletResponse response, Object command, + BindException errors) + throws Exception { + if (log.isDebugEnabled()) { + log.debug("entering 'onSubmit' method..."); + } + + User user = (User) command; + Locale locale = request.getLocale(); + + Boolean encrypt = (Boolean) getConfiguration().get(Constants.ENCRYPT_PASSWORD); + + if (encrypt != null && encrypt.booleanValue()) { + String algorithm = (String) getConfiguration().get(Constants.ENC_ALGORITHM); + + if (algorithm == null) { // should only happen for test case + log.debug("assuming testcase, setting algorithm to 'SHA'"); + algorithm = "SHA"; + } + + user.setPassword(StringUtil.encodePassword(user.getPassword(), algorithm)); + } + + user.setEnabled(Boolean.TRUE); + + // Set the default user role on this new user + user.addRole(roleManager.getRole(Constants.USER_ROLE)); + + try { + this.getUserManager().saveUser(user); + } catch (UserExistsException e) { + log.warn(e.getMessage()); + + errors.rejectValue("username", "errors.existing.user", + new Object[] { + user.getUsername(), user.getEmail() + }, "duplicate user"); + + // redisplay the unencrypted passwords + user.setPassword(user.getConfirmPassword()); + return showForm(request, response, errors); + } + + saveMessage(request, getText("user.registered", user.getUsername(), locale)); + request.getSession().setAttribute(Constants.REGISTERED, Boolean.TRUE); + + // Send user an e-mail + if (log.isDebugEnabled()) { + log.debug("Sending user '" + user.getUsername() + "' an account information e-mail"); + } + + // Send an account information e-mail + message.setSubject(getText("signup.email.subject", locale)); + sendUserMessage(user, getText("signup.email.message", locale), + RequestUtil.getAppURL(request)); + + return new ModelAndView(getSuccessView()); + } + + protected Object formBackingObject(HttpServletRequest request) + throws Exception { + return new User(); + } +} Index: extras/spring/src/web/org/appfuse/webapp/action/UserFormController.java =================================================================== RCS file: /cvs/appfuse/extras/spring/src/web/org/appfuse/webapp/action/UserFormController.java,v retrieving revision 1.24 diff -u -r1.24 UserFormController.java --- extras/spring/src/web/org/appfuse/webapp/action/UserFormController.java 21 Apr 2005 05:13:26 -0000 1.24 +++ extras/spring/src/web/org/appfuse/webapp/action/UserFormController.java 29 Aug 2005 02:33:44 -0000 @@ -1,231 +1,231 @@ -package org.appfuse.webapp.action; - -import java.util.Locale; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - -import org.apache.commons.lang.StringUtils; -import org.appfuse.Constants; -import org.appfuse.model.Role; -import org.appfuse.model.User; -import org.appfuse.service.RoleManager; -import org.appfuse.service.UserManager; -import org.appfuse.service.UserExistsException; -import org.appfuse.util.StringUtil; -import org.appfuse.webapp.util.RequestUtil; -import org.springframework.validation.BindException; -import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.view.RedirectView; - -/** - * Implementation of SimpleFormController that interacts with - * the {@link UserManager} to retrieve/persist values to the database. - * - * - * - * @author Matt Raible - */ -public class UserFormController extends BaseFormController { - private RoleManager roleManager; - - /** - * @param roleManager The roleManager to set. - */ - public void setRoleManager(RoleManager roleManager) { - this.roleManager = roleManager; - } - - public ModelAndView processFormSubmission(HttpServletRequest request, - HttpServletResponse response, - Object command, - BindException errors) - throws Exception { - if (request.getParameter("cancel") != null) { - if (!StringUtils.equals(request.getParameter("from"), "list")) { - return new ModelAndView(getCancelView()); - } else { - return new ModelAndView(getSuccessView()); - } - } - - return super.processFormSubmission(request, response, command, errors); - } - - public ModelAndView onSubmit(HttpServletRequest request, - HttpServletResponse response, Object command, - BindException errors) - throws Exception { - if (log.isDebugEnabled()) { - log.debug("entering 'onSubmit' method..."); - } - - User user = (User) command; - Locale locale = request.getLocale(); - - if (request.getParameter("delete") != null) { - this.getUserManager().removeUser(user.getUsername()); - saveMessage(request, getText("user.deleted", user.getFullName(), locale)); - - return new ModelAndView(getSuccessView()); - } else { - if ("true".equals(request.getParameter("encryptPass"))) { - String algorithm = - (String) getConfiguration().get(Constants.ENC_ALGORITHM); - - if (algorithm == null) { // should only happen for test case - - if (log.isDebugEnabled()) { - log.debug("assuming testcase, setting algorithm to 'SHA'"); - } - - algorithm = "SHA"; - } - - user.setPassword(StringUtil.encodePassword(user.getPassword(), - algorithm)); - } - - String[] userRoles = request.getParameterValues("userRoles"); - - if (userRoles != null) { - // for some reason, Spring seems to hang on to the roles in - // the User object, even though isSessionForm() == false - user.getRoles().clear(); - for (int i = 0; i < userRoles.length; i++) { - String roleName = userRoles[i]; - user.addRole(roleManager.getRole(roleName)); - } - } - - try { - this.getUserManager().saveUser(user); - } catch (UserExistsException e) { - log.warn(e.getMessage()); - - errors.rejectValue("username", "errors.existing.user", - new Object[] { - user.getUsername(), user.getEmail() - }, "duplicate user"); - - // redisplay the unencrypted passwords - user.setPassword(user.getConfirmPassword()); - - return showForm(request, response, errors); - } - - if (!StringUtils.equals(request.getParameter("from"), "list")) { - HttpSession session = request.getSession(); - session.setAttribute(Constants.USER_KEY, user); - - // update the user's remember me cookie if they didn't login - // with a cookie - if ((RequestUtil.getCookie(request, Constants.LOGIN_COOKIE) != null) && - (session.getAttribute("cookieLogin") == null)) { - // delete all user cookies and add a new one - this.getUserManager().removeLoginCookies(user.getUsername()); - - String autoLogin = - this.getUserManager().createLoginCookie(user.getUsername()); - RequestUtil.setCookie(response, Constants.LOGIN_COOKIE, - autoLogin, request.getContextPath()); - } - - saveMessage(request, getText("user.saved", user.getFullName(), locale)); - - // return to main Menu - return new ModelAndView(new RedirectView("mainMenu.html")); - } else { - if (StringUtils.isBlank(request.getParameter("version"))) { - saveMessage(request, - getText("user.added", user.getFullName(), locale)); - - // Send an account information e-mail - message.setSubject(getText("signup.email.subject", locale)); - sendUserMessage(user, - getText("newuser.email.message", - user.getFullName(), locale), - RequestUtil.getAppURL(request)); - - return showNewForm(request, response); - } else { - saveMessage(request, - getText("user.updated.byAdmin", - user.getFullName(), locale)); - } - } - } - - return showForm(request, response, errors); - } - - protected ModelAndView showForm(HttpServletRequest request, - HttpServletResponse response, - BindException errors) - throws Exception { - if (request.getRequestURI().indexOf("editProfile") > -1) { - // if URL is "editProfile" - make sure it's the current user - // reject if username passed in or "list" parameter passed in - // someone that is trying this probably knows the AppFuse code - // but it's a legitimate bug, so I'll fix it. ;-) - if ((request.getParameter("username") != null) || - (request.getParameter("from") != null)) { - response.sendError(HttpServletResponse.SC_FORBIDDEN); - log.warn("User '" + request.getRemoteUser() + - "' is trying to edit user '" + - request.getParameter("username") + "'"); - - return null; - } - } - - // prevent ordinary users from calling a GET on editUser.html - // unless a bind error exists. - if ((request.getRequestURI().indexOf("editUser") > -1) && - (!request.isUserInRole(Constants.ADMIN_ROLE) && - (errors.getErrorCount() == 0) && // be nice to server-side validation for editProfile - (request.getRemoteUser() != null))) { // be nice to unit tests - response.sendError(HttpServletResponse.SC_FORBIDDEN); - - return null; - } - - return super.showForm(request, response, errors); - } - - protected Object formBackingObject(HttpServletRequest request) - throws Exception { - String username = request.getParameter("username"); - - if (request.getSession().getAttribute("cookieLogin") != null) { - saveMessage(request, getText("userProfile.cookieLogin", request.getLocale())); - } - - User user = null; - - if (request.getRequestURI().indexOf("editProfile") > -1) { - user = this.getUserManager().getUser(getUser(request).getUsername()); - } else if (!StringUtils.isBlank(username) && - !"".equals(request.getParameter("version"))) { - user = this.getUserManager().getUser(username); - } else { - user = new User(); - user.addRole(new Role(Constants.USER_ROLE)); - } - - user.setConfirmPassword(user.getPassword()); - - return user; - } - - protected void onBind(HttpServletRequest request, Object command) - throws Exception { - // if the user is being deleted, turn off validation - if (request.getParameter("delete") != null) { - super.setValidateOnBinding(false); - } else { - super.setValidateOnBinding(true); - } - } -} +package org.appfuse.webapp.action; + +import java.util.Locale; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import net.sf.acegisecurity.Authentication; +import net.sf.acegisecurity.AuthenticationTrustResolver; +import net.sf.acegisecurity.AuthenticationTrustResolverImpl; +import net.sf.acegisecurity.context.ContextHolder; +import net.sf.acegisecurity.context.security.SecureContext; + +import org.apache.commons.lang.StringUtils; +import org.appfuse.Constants; +import org.appfuse.model.Role; +import org.appfuse.model.User; +import org.appfuse.service.RoleManager; +import org.appfuse.service.UserManager; +import org.appfuse.service.UserExistsException; +import org.appfuse.util.StringUtil; +import org.appfuse.webapp.util.RequestUtil; +import org.springframework.validation.BindException; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.view.RedirectView; + +/** + * Implementation of SimpleFormController that interacts with + * the {@link UserManager} to retrieve/persist values to the database. + * + * + * + * @author Matt Raible + */ +public class UserFormController extends BaseFormController { + private RoleManager roleManager; + + /** + * @param roleManager The roleManager to set. + */ + public void setRoleManager(RoleManager roleManager) { + this.roleManager = roleManager; + } + + public ModelAndView processFormSubmission(HttpServletRequest request, + HttpServletResponse response, + Object command, + BindException errors) + throws Exception { + if (request.getParameter("cancel") != null) { + if (!StringUtils.equals(request.getParameter("from"), "list")) { + return new ModelAndView(getCancelView()); + } else { + return new ModelAndView(getSuccessView()); + } + } + + return super.processFormSubmission(request, response, command, errors); + } + + public ModelAndView onSubmit(HttpServletRequest request, + HttpServletResponse response, Object command, + BindException errors) + throws Exception { + if (log.isDebugEnabled()) { + log.debug("entering 'onSubmit' method..."); + } + + User user = (User) command; + Locale locale = request.getLocale(); + + if (request.getParameter("delete") != null) { + this.getUserManager().removeUser(user.getUsername()); + saveMessage(request, getText("user.deleted", user.getFullName(), locale)); + + return new ModelAndView(getSuccessView()); + } else { + Boolean encrypt = (Boolean) getConfiguration().get(Constants.ENCRYPT_PASSWORD); + + if (StringUtils.equals(request.getParameter("encryptPass"), "true") + && (encrypt != null && encrypt.booleanValue())) { + + String algorithm = (String) getConfiguration().get(Constants.ENC_ALGORITHM); + + if (algorithm == null) { // should only happen for test case + + if (log.isDebugEnabled()) { + log.debug("assuming testcase, setting algorithm to 'SHA'"); + } + + algorithm = "SHA"; + } + + user.setPassword(StringUtil.encodePassword(user.getPassword(), algorithm)); + } + + String[] userRoles = request.getParameterValues("userRoles"); + + if (userRoles != null) { + // for some reason, Spring seems to hang on to the roles in + // the User object, even though isSessionForm() == false + user.getRoles().clear(); + for (int i = 0; i < userRoles.length; i++) { + String roleName = userRoles[i]; + user.addRole(roleManager.getRole(roleName)); + } + } + + try { + this.getUserManager().saveUser(user); + } catch (UserExistsException e) { + log.warn(e.getMessage()); + + errors.rejectValue("username", "errors.existing.user", + new Object[] { + user.getUsername(), user.getEmail() + }, "duplicate user"); + + // redisplay the unencrypted passwords + user.setPassword(user.getConfirmPassword()); + + return showForm(request, response, errors); + } + + if (!StringUtils.equals(request.getParameter("from"), "list")) { + HttpSession session = request.getSession(); + session.setAttribute(Constants.USER_KEY, user); + + saveMessage(request, getText("user.saved", user.getFullName(), locale)); + + // return to main Menu + return new ModelAndView(new RedirectView("mainMenu.html")); + } else { + if (StringUtils.isBlank(request.getParameter("version"))) { + saveMessage(request, + getText("user.added", user.getFullName(), locale)); + + // Send an account information e-mail + message.setSubject(getText("signup.email.subject", locale)); + sendUserMessage(user, getText("newuser.email.message", user.getFullName(), locale), + RequestUtil.getAppURL(request)); + + return showNewForm(request, response); + } else { + saveMessage(request, getText("user.updated.byAdmin", user.getFullName(), locale)); + } + } + } + + return showForm(request, response, errors); + } + + protected ModelAndView showForm(HttpServletRequest request, + HttpServletResponse response, + BindException errors) + throws Exception { + if (request.getRequestURI().indexOf("editProfile") > -1) { + // if URL is "editProfile" - make sure it's the current user + // reject if username passed in or "list" parameter passed in + // someone that is trying this probably knows the AppFuse code + // but it's a legitimate bug, so I'll fix it. ;-) + if ((request.getParameter("username") != null) || (request.getParameter("from") != null)) { + response.sendError(HttpServletResponse.SC_FORBIDDEN); + log.warn("User '" + request.getRemoteUser() + "' is trying to edit user '" + + request.getParameter("username") + "'"); + + return null; + } + } + + // prevent ordinary users from calling a GET on editUser.html + // unless a bind error exists. + if ((request.getRequestURI().indexOf("editUser") > -1) && (!request.isUserInRole(Constants.ADMIN_ROLE) && + (errors.getErrorCount() == 0) && // be nice to server-side validation for editProfile + (request.getRemoteUser() != null))) { // be nice to unit tests + response.sendError(HttpServletResponse.SC_FORBIDDEN); + + return null; + } + + return super.showForm(request, response, errors); + } + + protected Object formBackingObject(HttpServletRequest request) + throws Exception { + String username = request.getParameter("username"); + + // if user logged in with remember me, display a warning that they can't change passwords + log.debug("checking for remember me login..."); + + AuthenticationTrustResolver resolver = new AuthenticationTrustResolverImpl(); + SecureContext ctx = (SecureContext) ContextHolder.getContext(); + + if (ctx != null) { + Authentication auth = ctx.getAuthentication(); + + if (resolver.isRememberMe(auth)) { + request.getSession().setAttribute("cookieLogin", "true"); + + // add warning message + saveMessage(request, getText("userProfile.cookieLogin", request.getLocale())); + } + } + + User user = null; + + if (request.getRequestURI().indexOf("editProfile") > -1) { + user = this.getUserManager().getUser(getUser(request).getUsername()); + } else if (!StringUtils.isBlank(username) && !"".equals(request.getParameter("version"))) { + user = this.getUserManager().getUser(username); + } else { + user = new User(); + user.addRole(new Role(Constants.USER_ROLE)); + } + + user.setConfirmPassword(user.getPassword()); + + return user; + } + + protected void onBind(HttpServletRequest request, Object command) + throws Exception { + // if the user is being deleted, turn off validation + if (request.getParameter("delete") != null) { + super.setValidateOnBinding(false); + } else { + super.setValidateOnBinding(true); + } + } +} Index: extras/spring/test/web/web-tests.xml =================================================================== RCS file: /cvs/appfuse/extras/spring/test/web/web-tests.xml,v retrieving revision 1.15 diff -u -r1.15 web-tests.xml --- extras/spring/test/web/web-tests.xml 28 Aug 2005 21:15:53 -0000 1.15 +++ extras/spring/test/web/web-tests.xml 29 Aug 2005 02:33:16 -0000 @@ -1,236 +1,234 @@ - - - - - -]> -
-<%-- If you don't want to encrypt passwords programmatically, or you don't
- care about using SSL for the login, you can change this form's action
- to "j_security_check" --%>
-"
- onsubmit="saveUsername(this);return validateForm(this)">
-
-
-
-
-
-<%@ include file="/scripts/login.js"%>
+<%@ include file="/common/taglibs.jsp"%>
+
+|
-
-
- |
- |
| - - | -- - | -
|---|---|
| - - | -- - | -
| - | - - - | -
| - | - - - " tabindex="4" /> - " tabindex="5" - onclick="document.getElementById('j_username').focus()" /> - | -
| - | - |
-
+"
+ onsubmit="saveUsername(this);return validateForm(this)">
+
+
+
+
+
+<%@ include file="/scripts/login.js"%>
Index: extras/webwork/build.xml
===================================================================
RCS file: /cvs/appfuse/extras/webwork/build.xml,v
retrieving revision 1.35
diff -u -r1.35 build.xml
--- extras/webwork/build.xml 10 Aug 2005 15:21:45 -0000 1.35
+++ extras/webwork/build.xml 29 Aug 2005 00:02:08 -0000
@@ -306,8 +306,6 @@
servletspec="2.3" sessiontimeout="10"
destdir="${webapp.target}/WEB-INF" distributable="false"
displayname="${ant.project.name}">
- |
+
+
+ |
+ |
| + + | ++ + | +
|---|---|
| + + | ++ + | +
| + | + + + | +
| + | + " tabindex="4" /> + " tabindex="5" + onclick="document.getElementById('j_username').focus()" /> + | +
| + | + |
+
- * View Source - *
- * - * @author Matt Raible - */ -public final class Constants { - //~ Static fields/initializers ============================================= - - /** The name of the ResourceBundle used in this application */ - public static final String BUNDLE_KEY = "ApplicationResources"; - - /** The application scoped attribute for persistence engine used */ - public static final String DAO_TYPE = "daoType"; - public static final String DAO_TYPE_HIBERNATE = "hibernate"; - - /** Application scoped attribute for authentication url */ - public static final String AUTH_URL = "authURL"; - - /** Application scoped attributes for SSL Switching */ - public static final String HTTP_PORT = "httpPort"; - public static final String HTTPS_PORT = "httpsPort"; - - /** The application scoped attribute for indicating a secure login */ - public static final String SECURE_LOGIN = "secureLogin"; - - /** The encryption algorithm key to be used for passwords */ - public static final String ENC_ALGORITHM = "algorithm"; - - /** A flag to indicate if passwords should be encrypted */ - public static final String ENCRYPT_PASSWORD = "encryptPassword"; - - /** File separator from System properties */ - public static final String FILE_SEP = System.getProperty("file.separator"); - - /** User home from System properties */ - public static final String USER_HOME = - System.getProperty("user.home") + FILE_SEP; - - /** - * The session scope attribute under which the breadcrumb ArrayStack is - * stored - */ - public static final String BREADCRUMB = "breadcrumbs"; - - /** - * The session scope attribute under which the User object for the - * currently logged in user is stored. - */ - public static final String USER_KEY = "currentUserForm"; - - /** - * The request scope attribute under which an editable user form is stored - */ - public static final String USER_EDIT_KEY = "userForm"; - - /** - * The request scope attribute that holds the user list - */ - public static final String USER_LIST = "userList"; - - /** - * The request scope attribute for indicating a newly-registered user - */ - public static final String REGISTERED = "registered"; - - /** - * The name of the Administrator role, as specified in web.xml - */ - public static final String ADMIN_ROLE = "admin"; - - /** - * The name of the User role, as specified in web.xml - */ - public static final String USER_ROLE = "user"; - - /** - * The name of the user's role list, a request-scoped attribute - * when adding/editing a user. - */ - public static final String USER_ROLES = "userRoles"; - - /** - * The name of the available roles list, a request-scoped attribute - * when adding/editing a user. - */ - public static final String AVAILABLE_ROLES = "availableRoles"; - - /** - * Name of cookie for "Remember Me" functionality. - */ - public static final String LOGIN_COOKIE = "sessionId"; - - /** - * The name of the configuration hashmap stored in application scope. - */ - public static final String CONFIG = "appConfig"; -} +package org.appfuse; + + +/** + * Constant values used throughout the application. + * + *+ * View Source + *
+ * + * @author Matt Raible + */ +public class Constants { + //~ Static fields/initializers ============================================= + + /** The name of the ResourceBundle used in this application */ + public static final String BUNDLE_KEY = "ApplicationResources"; + + /** The application scoped attribute for persistence engine used */ + public static final String DAO_TYPE = "daoType"; + public static final String DAO_TYPE_HIBERNATE = "hibernate"; + + /** Application scoped attribute for authentication url */ + public static final String AUTH_URL = "authURL"; + + /** Application scoped attributes for SSL Switching */ + public static final String HTTP_PORT = "httpPort"; + public static final String HTTPS_PORT = "httpsPort"; + + /** The application scoped attribute for indicating a secure login */ + public static final String SECURE_LOGIN = "secureLogin"; + + /** The encryption algorithm key to be used for passwords */ + public static final String ENC_ALGORITHM = "algorithm"; + + /** A flag to indicate if passwords should be encrypted */ + public static final String ENCRYPT_PASSWORD = "encryptPassword"; + + /** File separator from System properties */ + public static final String FILE_SEP = System.getProperty("file.separator"); + + /** User home from System properties */ + public static final String USER_HOME = + System.getProperty("user.home") + FILE_SEP; + + /** + * The session scope attribute under which the breadcrumb ArrayStack is + * stored + */ + public static final String BREADCRUMB = "breadcrumbs"; + + /** + * The session scope attribute under which the User object for the + * currently logged in user is stored. + */ + public static final String USER_KEY = "currentUserForm"; + + /** + * The request scope attribute under which an editable user form is stored + */ + public static final String USER_EDIT_KEY = "userForm"; + + /** + * The request scope attribute that holds the user list + */ + public static final String USER_LIST = "userList"; + + /** + * The request scope attribute for indicating a newly-registered user + */ + public static final String REGISTERED = "registered"; + + /** + * The name of the Administrator role, as specified in web.xml + */ + public static final String ADMIN_ROLE = "admin"; + + /** + * The name of the User role, as specified in web.xml + */ + public static final String USER_ROLE = "user"; + + /** + * The name of the user's role list, a request-scoped attribute + * when adding/editing a user. + */ + public static final String USER_ROLES = "userRoles"; + + /** + * The name of the available roles list, a request-scoped attribute + * when adding/editing a user. + */ + public static final String AVAILABLE_ROLES = "availableRoles"; + + /** + * Name of cookie for "Remember Me" functionality. + */ + public static final String LOGIN_COOKIE = "sessionId"; + + /** + * The name of the configuration hashmap stored in application scope. + */ + public static final String CONFIG = "appConfig"; +} Index: src/dao/org/appfuse/dao/UserDAO.java =================================================================== RCS file: /cvs/appfuse/src/dao/org/appfuse/dao/UserDAO.java,v retrieving revision 1.4 diff -u -r1.4 UserDAO.java --- src/dao/org/appfuse/dao/UserDAO.java 3 Apr 2005 18:52:02 -0000 1.4 +++ src/dao/org/appfuse/dao/UserDAO.java 28 Aug 2005 21:22:41 -0000 @@ -3,7 +3,6 @@ import java.util.List; import org.appfuse.model.User; -import org.appfuse.model.UserCookie; /** * User Data Access Object (DAO) interface. @@ -40,23 +39,4 @@ * @param username the user's username */ public void removeUser(String username); - - /** - * Gets a userCookie object from the database, - * based on username and password - * @param cookie with username and password - */ - public UserCookie getUserCookie(UserCookie cookie); - - /** - * Saves a userCookie object to the database - * @param cookie - */ - public void saveUserCookie(UserCookie cookie); - - /** - * Removes all cookies for a specified username - * @param username - */ - public void removeUserCookies(String username); } Index: src/dao/org/appfuse/dao/hibernate/UserDAOHibernate.java =================================================================== RCS file: /cvs/appfuse/src/dao/org/appfuse/dao/hibernate/UserDAOHibernate.java,v retrieving revision 1.7 diff -u -r1.7 UserDAOHibernate.java --- src/dao/org/appfuse/dao/hibernate/UserDAOHibernate.java 7 Dec 2004 17:09:30 -0000 1.7 +++ src/dao/org/appfuse/dao/hibernate/UserDAOHibernate.java 28 Aug 2005 22:45:55 -0000 @@ -4,7 +4,6 @@ import org.appfuse.dao.UserDAO; import org.appfuse.model.User; -import org.appfuse.model.UserCookie; import org.springframework.orm.ObjectRetrievalFailureException; /** @@ -57,48 +56,6 @@ * @see org.appfuse.dao.UserDAO#removeUser(java.lang.String) */ public void removeUser(String username) { - removeUserCookies(username); - - User user = getUser(username); - getHibernateTemplate().delete(user); - } - - /** - * @see org.appfuse.dao.UserDAO#getUserCookie(org.appfuse.model.UserCookie) - */ - public UserCookie getUserCookie(final UserCookie cookie) { - List cookies = getHibernateTemplate().find( - "from UserCookie c where c.username=? and c.cookieId=?", - new Object[]{cookie.getUsername(), cookie.getCookieId()}); - - if (cookies.size() == 0) { - return null; - } - - return (UserCookie) cookies.get(0); - } - - /** - * @see org.appfuse.dao.UserDAO#removeUserCookies(java.lang.String) - */ - public void removeUserCookies(String username) { - // delete any cookies associated with this user - List cookies = - getHibernateTemplate().find("from UserCookie c where c.username=?", - username); - - if ((cookies.size() > 0) && log.isDebugEnabled()) { - log.debug("deleting " + cookies.size() + " cookies for user '" + - username + "'"); - } - - getHibernateTemplate().deleteAll(cookies); - } - - /** - * @see org.appfuse.dao.UserDAO#saveUserCookie(org.appfuse.model.UserCookie) - */ - public void saveUserCookie(UserCookie cookie) { - getHibernateTemplate().saveOrUpdate(cookie); + getHibernateTemplate().delete(getUser(username)); } } Index: src/dao/org/appfuse/dao/hibernate/applicationContext-hibernate.xml =================================================================== RCS file: /cvs/appfuse/src/dao/org/appfuse/dao/hibernate/applicationContext-hibernate.xml,v retrieving revision 1.9 diff -u -r1.9 applicationContext-hibernate.xml --- src/dao/org/appfuse/dao/hibernate/applicationContext-hibernate.xml 16 Aug 2005 13:32:35 -0000 1.9 +++ src/dao/org/appfuse/dao/hibernate/applicationContext-hibernate.xml 28 Aug 2005 22:56:22 -0000 @@ -10,7 +10,6 @@- * View Source - *
- * - * @author Matt Raible - * Modified by Dan Kibler - * - * @struts.action name="userForm" path="/users" scope="request" - * validate="false" parameter="method" input="mainMenu" roles="admin" - * @struts.action name="userForm" path="/editUser" scope="request" - * validate="false" parameter="method" input="list" roles="admin" - * @struts.action name="userForm" path="/editProfile" scope="request" - * validate="false" parameter="method" input="mainMenu" - * @struts.action name="userForm" path="/saveUser" scope="request" - * validate="false" parameter="method" input="edit" - * - * @struts.action-forward name="list" path="/WEB-INF/pages/userList.jsp" - * @struts.action-forward name="edit" path="/WEB-INF/pages/userProfile.jsp" - */ -public final class UserAction extends BaseAction { - - public ActionForward add(ActionMapping mapping, ActionForm form, - HttpServletRequest request, - HttpServletResponse response) - throws Exception { - if (log.isDebugEnabled()) { - log.debug("Entering 'add' method"); - } - - User user = new User(); - user.addRole(new Role(Constants.USER_ROLE)); - UserForm userForm = (UserForm) convert(user); - updateFormBean(mapping, request, userForm); - - checkForCookieLogin(request); - - return mapping.findForward("edit"); - } - - public ActionForward cancel(ActionMapping mapping, ActionForm form, - HttpServletRequest request, - HttpServletResponse response) - throws Exception { - if (log.isDebugEnabled()) { - log.debug("Entering 'cancel' method"); - } - - if (!StringUtils.equals(request.getParameter("from"), "list")) { - return mapping.findForward("mainMenu"); - } else { - return mapping.findForward("viewUsers"); - } - } - - public ActionForward delete(ActionMapping mapping, ActionForm form, - HttpServletRequest request, - HttpServletResponse response) - throws Exception { - if (log.isDebugEnabled()) { - log.debug("Entering 'delete' method"); - } - - // Extract attributes and parameters we will need - ActionMessages messages = new ActionMessages(); - UserForm userForm = (UserForm) form; - - // Exceptions are caught by ActionExceptionHandler - UserManager mgr = (UserManager) getBean("userManager"); - mgr.removeUser(userForm.getUsername()); - - messages.add(ActionMessages.GLOBAL_MESSAGE, - new ActionMessage("user.deleted", userForm.getFirstName() - + ' ' + userForm.getLastName())); - - saveMessages(request.getSession(), messages); - - // return a forward to searching users - return mapping.findForward("viewUsers"); - } - - public ActionForward edit(ActionMapping mapping, ActionForm form, - HttpServletRequest request, - HttpServletResponse response) - throws Exception { - if (log.isDebugEnabled()) { - log.debug("Entering 'edit' method"); - } - - UserForm userForm = (UserForm) form; - HttpSession session = request.getSession(); - - // if URL is "editProfile" - make sure it's the current user - if (request.getRequestURI().indexOf("editProfile") > -1) { - // reject if username passed in or "list" parameter passed in - // someone that is trying this probably knows the AppFuse code - // but it's a legitimate bug, so I'll fix it. ;-) - if ((request.getParameter("username") != null) || - (request.getParameter("from") != null)) { - response.sendError(HttpServletResponse.SC_FORBIDDEN); - log.warn("User '" + request.getRemoteUser() + - "' is trying to edit user '" + - request.getParameter("username") + "'"); - - return null; - } - } - - // Exceptions are caught by ActionExceptionHandler - UserManager mgr = (UserManager) getBean("userManager"); - User user = null; - - // if a user's username is passed in - if (request.getParameter("username") != null) { - // lookup the user using that id - user = mgr.getUser(userForm.getUsername()); - } else { - // look it up based on the current user's id - user = mgr.getUser(getUser(session).getUsername()); - } - - BeanUtils.copyProperties(userForm, convert(user)); - userForm.setConfirmPassword(userForm.getPassword()); - updateFormBean(mapping, request, userForm); - - checkForCookieLogin(request); - - // return a forward to edit forward - return mapping.findForward("edit"); - } - - public ActionForward save(ActionMapping mapping, ActionForm form, - HttpServletRequest request, - HttpServletResponse response) - throws Exception { - if (log.isDebugEnabled()) { - log.debug("Entering 'save' method"); - } - - // run validation rules on this form - // See https://appfuse.dev.java.net/issues/show_bug.cgi?id=128 - ActionMessages errors = form.validate(mapping, request); - - if (!errors.isEmpty()) { - saveErrors(request, errors); - return mapping.findForward("edit"); - } - - // Extract attributes and parameters we will need - ActionMessages messages = new ActionMessages(); - HttpSession session = request.getSession(); - UserForm userForm = (UserForm) form; - String password = userForm.getPassword(); - User user = new User(); - - // Exceptions are caught by ActionExceptionHandler - // all we need to persist is the parent object - BeanUtils.copyProperties(user, userForm); - - if (StringUtils.equals(request.getParameter("encryptPass"), "true")) { - String algorithm = - (String) getConfiguration().get(Constants.ENC_ALGORITHM); - - if (algorithm == null) { // should only happen for test case - log.debug("assuming testcase, setting algorigthm to 'SHA'"); - algorithm = "SHA"; - } - - user.setPassword(StringUtil.encodePassword(password, algorithm)); - } - - UserManager mgr = (UserManager) getBean("userManager"); - RoleManager roleMgr = (RoleManager) getBean("roleManager"); - String[] userRoles = request.getParameterValues("userRoles"); - - for (int i = 0; userRoles != null && i < userRoles.length; i++) { - String roleName = userRoles[i]; - user.addRole(roleMgr.getRole(roleName)); - } - - try { - mgr.saveUser(user); - } catch (UserExistsException e) { - log.warn(e.getMessage()); - errors.add(ActionMessages.GLOBAL_MESSAGE, - new ActionMessage("errors.existing.user", - userForm.getUsername(), - userForm.getEmail())); - saveErrors(request, errors); - - return mapping.findForward("edit"); - } - - BeanUtils.copyProperties(userForm, convert(user)); - userForm.setConfirmPassword(userForm.getPassword()); - updateFormBean(mapping, request, userForm); - - if (!StringUtils.equals(request.getParameter("from"), "list")) { - session.setAttribute(Constants.USER_KEY, user); - - // update the user's remember me cookie if they didn't login - // with a cookie - if ((RequestUtil.getCookie(request, Constants.LOGIN_COOKIE) != null) && - (session.getAttribute("cookieLogin") == null)) { - // delete all user cookies and add a new one - mgr.removeLoginCookies(userForm.getUsername()); - - String autoLogin = - mgr.createLoginCookie(userForm.getUsername()); - RequestUtil.setCookie(response, Constants.LOGIN_COOKIE, - autoLogin, request.getContextPath()); - } - - // add success messages - messages.add(ActionMessages.GLOBAL_MESSAGE, - new ActionMessage("user.saved")); - saveMessages(request.getSession(), messages); - - // return a forward to main Menu - return mapping.findForward("mainMenu"); - } else { - // add success messages - if ("".equals(request.getParameter("version"))) { - messages.add(ActionMessages.GLOBAL_MESSAGE, - new ActionMessage("user.added", user.getFullName())); - saveMessages(request.getSession(), messages); - sendNewUserEmail(request, userForm); - - return mapping.findForward("addUser"); - } else { - messages.add(ActionMessages.GLOBAL_MESSAGE, - new ActionMessage("user.updated.byAdmin", - user.getFullName())); - saveMessages(request, messages); - - return mapping.findForward("edit"); - } - } - } - - public ActionForward search(ActionMapping mapping, ActionForm form, - HttpServletRequest request, - HttpServletResponse response) - throws Exception { - if (log.isDebugEnabled()) { - log.debug("Entering 'search' method"); - } - - UserForm userForm = (UserForm) form; - - // Exceptions are caught by ActionExceptionHandler - UserManager mgr = (UserManager) getBean("userManager"); - User user = (User) convert(userForm); - List users = mgr.getUsers(user); - request.setAttribute(Constants.USER_LIST, users); - - // return a forward to the user list definition - return mapping.findForward("list"); - } - - public ActionForward unspecified(ActionMapping mapping, ActionForm form, - HttpServletRequest request, - HttpServletResponse response) - throws Exception { - - return search(mapping, form, request, response); - } - - private void sendNewUserEmail(HttpServletRequest request, UserForm userForm) - throws Exception { - MessageResources resources = getResources(request); - - // Send user an e-mail - if (log.isDebugEnabled()) { - log.debug("Sending user '" + userForm.getUsername() + - "' an account information e-mail"); - } - - SimpleMailMessage message = (SimpleMailMessage) getBean("mailMessage"); - message.setTo(userForm.getFullName() + "<" + userForm.getEmail() + ">"); - - StringBuffer msg = new StringBuffer(); - msg.append(resources.getMessage("newuser.email.message", - userForm.getFullName())); - msg.append("\n\n" + resources.getMessage("userForm.username")); - msg.append(": " + userForm.getUsername() + "\n"); - msg.append(resources.getMessage("userForm.password") + ": "); - msg.append(userForm.getPassword()); - msg.append("\n\nLogin at: " + RequestUtil.getAppURL(request)); - message.setText(msg.toString()); - - message.setSubject(resources.getMessage("signup.email.subject")); - - MailEngine engine = (MailEngine) getBean("mailEngine"); - engine.send(message); - } - - private void checkForCookieLogin(HttpServletRequest request) { - // if user logged in with a cookie, display a warning that they - // can't change passwords - if (log.isDebugEnabled()) { - log.debug("checking for cookieLogin..."); - } - - if (request.getSession().getAttribute("cookieLogin") != null) { - ActionMessages messages = new ActionMessages(); - - // add warning messages - messages.add(ActionMessages.GLOBAL_MESSAGE, - new ActionMessage("userProfile.cookieLogin")); - saveMessages(request, messages); - } - } -} +package org.appfuse.webapp.action; + +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import net.sf.acegisecurity.Authentication; +import net.sf.acegisecurity.AuthenticationTrustResolver; +import net.sf.acegisecurity.AuthenticationTrustResolverImpl; +import net.sf.acegisecurity.context.ContextHolder; +import net.sf.acegisecurity.context.security.SecureContext; + +import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.util.MessageResources; +import org.appfuse.Constants; +import org.appfuse.model.Role; +import org.appfuse.model.User; +import org.appfuse.service.MailEngine; +import org.appfuse.service.RoleManager; +import org.appfuse.service.UserExistsException; +import org.appfuse.service.UserManager; +import org.appfuse.util.StringUtil; +import org.appfuse.webapp.form.UserForm; +import org.appfuse.webapp.util.RequestUtil; +import org.springframework.mail.SimpleMailMessage; + +/** + * Implementation of Action that interacts with the {@link + * UserForm} and retrieves values. It interacts with the {@link + * UserManager} to retrieve/persist values to the database. + * + *+ * View Source + *
+ * + * @author Matt Raible + * Modified by Dan Kibler + * + * @struts.action name="userForm" path="/users" scope="request" + * validate="false" parameter="method" input="mainMenu" roles="admin" + * @struts.action name="userForm" path="/editUser" scope="request" + * validate="false" parameter="method" input="list" roles="admin" + * @struts.action name="userForm" path="/editProfile" scope="request" + * validate="false" parameter="method" input="mainMenu" + * @struts.action name="userForm" path="/saveUser" scope="request" + * validate="false" parameter="method" input="edit" + * + * @struts.action-forward name="list" path="/WEB-INF/pages/userList.jsp" + * @struts.action-forward name="edit" path="/WEB-INF/pages/userProfile.jsp" + */ +public final class UserAction extends BaseAction { + + public ActionForward add(ActionMapping mapping, ActionForm form, + HttpServletRequest request, + HttpServletResponse response) + throws Exception { + if (log.isDebugEnabled()) { + log.debug("Entering 'add' method"); + } + + User user = new User(); + user.addRole(new Role(Constants.USER_ROLE)); + UserForm userForm = (UserForm) convert(user); + updateFormBean(mapping, request, userForm); + + checkForRememberMeLogin(request); + + return mapping.findForward("edit"); + } + + public ActionForward cancel(ActionMapping mapping, ActionForm form, + HttpServletRequest request, + HttpServletResponse response) + throws Exception { + if (log.isDebugEnabled()) { + log.debug("Entering 'cancel' method"); + } + + if (!StringUtils.equals(request.getParameter("from"), "list")) { + return mapping.findForward("mainMenu"); + } else { + return mapping.findForward("viewUsers"); + } + } + + public ActionForward delete(ActionMapping mapping, ActionForm form, + HttpServletRequest request, + HttpServletResponse response) + throws Exception { + if (log.isDebugEnabled()) { + log.debug("Entering 'delete' method"); + } + + // Extract attributes and parameters we will need + ActionMessages messages = new ActionMessages(); + UserForm userForm = (UserForm) form; + + // Exceptions are caught by ActionExceptionHandler + UserManager mgr = (UserManager) getBean("userManager"); + mgr.removeUser(userForm.getUsername()); + + messages.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("user.deleted", userForm.getFirstName() + + ' ' + userForm.getLastName())); + + saveMessages(request.getSession(), messages); + + // return a forward to searching users + return mapping.findForward("viewUsers"); + } + + public ActionForward edit(ActionMapping mapping, ActionForm form, + HttpServletRequest request, + HttpServletResponse response) + throws Exception { + if (log.isDebugEnabled()) { + log.debug("Entering 'edit' method"); + } + + UserForm userForm = (UserForm) form; + HttpSession session = request.getSession(); + + // if URL is "editProfile" - make sure it's the current user + if (request.getRequestURI().indexOf("editProfile") > -1) { + // reject if username passed in or "list" parameter passed in + // someone that is trying this probably knows the AppFuse code + // but it's a legitimate bug, so I'll fix it. ;-) + if ((request.getParameter("username") != null) || + (request.getParameter("from") != null)) { + response.sendError(HttpServletResponse.SC_FORBIDDEN); + log.warn("User '" + request.getRemoteUser() + + "' is trying to edit user '" + + request.getParameter("username") + "'"); + + return null; + } + } + + // Exceptions are caught by ActionExceptionHandler + UserManager mgr = (UserManager) getBean("userManager"); + User user = null; + + // if a user's username is passed in + if (request.getParameter("username") != null) { + // lookup the user using that id + user = mgr.getUser(userForm.getUsername()); + } else { + // look it up based on the current user's id + user = mgr.getUser(getUser(session).getUsername()); + } + + BeanUtils.copyProperties(userForm, convert(user)); + userForm.setConfirmPassword(userForm.getPassword()); + updateFormBean(mapping, request, userForm); + + checkForRememberMeLogin(request); + + // return a forward to edit forward + return mapping.findForward("edit"); + } + + public ActionForward save(ActionMapping mapping, ActionForm form, + HttpServletRequest request, + HttpServletResponse response) + throws Exception { + if (log.isDebugEnabled()) { + log.debug("Entering 'save' method"); + } + + // run validation rules on this form + // See https://appfuse.dev.java.net/issues/show_bug.cgi?id=128 + ActionMessages errors = form.validate(mapping, request); + + if (!errors.isEmpty()) { + saveErrors(request, errors); + return mapping.findForward("edit"); + } + + // Extract attributes and parameters we will need + ActionMessages messages = new ActionMessages(); + HttpSession session = request.getSession(); + UserForm userForm = (UserForm) form; + String password = userForm.getPassword(); + User user = new User(); + + // Exceptions are caught by ActionExceptionHandler + // all we need to persist is the parent object + BeanUtils.copyProperties(user, userForm); + + Boolean encrypt = (Boolean) getConfiguration().get(Constants.ENCRYPT_PASSWORD); + + if (StringUtils.equals(request.getParameter("encryptPass"), "true") + && (encrypt != null && encrypt.booleanValue())) { + String algorithm = (String) getConfiguration().get(Constants.ENC_ALGORITHM); + + if (algorithm == null) { // should only happen for test case + log.debug("assuming testcase, setting algorithm to 'SHA'"); + algorithm = "SHA"; + } + + user.setPassword(StringUtil.encodePassword(user.getPassword(), algorithm)); + } + + UserManager mgr = (UserManager) getBean("userManager"); + RoleManager roleMgr = (RoleManager) getBean("roleManager"); + String[] userRoles = request.getParameterValues("userRoles"); + + for (int i = 0; userRoles != null && i < userRoles.length; i++) { + String roleName = userRoles[i]; + user.addRole(roleMgr.getRole(roleName)); + } + + try { + mgr.saveUser(user); + } catch (UserExistsException e) { + log.warn(e.getMessage()); + errors.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("errors.existing.user", + userForm.getUsername(), + userForm.getEmail())); + saveErrors(request, errors); + + return mapping.findForward("edit"); + } + + BeanUtils.copyProperties(userForm, convert(user)); + userForm.setConfirmPassword(userForm.getPassword()); + updateFormBean(mapping, request, userForm); + + if (!StringUtils.equals(request.getParameter("from"), "list")) { + session.setAttribute(Constants.USER_KEY, user); + + // add success messages + messages.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("user.saved")); + saveMessages(request.getSession(), messages); + + // return a forward to main Menu + return mapping.findForward("mainMenu"); + } else { + // add success messages + if ("".equals(request.getParameter("version"))) { + messages.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("user.added", user.getFullName())); + saveMessages(request.getSession(), messages); + sendNewUserEmail(request, userForm); + + return mapping.findForward("addUser"); + } else { + messages.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("user.updated.byAdmin", + user.getFullName())); + saveMessages(request, messages); + + return mapping.findForward("edit"); + } + } + } + + public ActionForward search(ActionMapping mapping, ActionForm form, + HttpServletRequest request, + HttpServletResponse response) + throws Exception { + if (log.isDebugEnabled()) { + log.debug("Entering 'search' method"); + } + + UserForm userForm = (UserForm) form; + + // Exceptions are caught by ActionExceptionHandler + UserManager mgr = (UserManager) getBean("userManager"); + User user = (User) convert(userForm); + List users = mgr.getUsers(user); + request.setAttribute(Constants.USER_LIST, users); + + // return a forward to the user list definition + return mapping.findForward("list"); + } + + public ActionForward unspecified(ActionMapping mapping, ActionForm form, + HttpServletRequest request, + HttpServletResponse response) + throws Exception { + + return search(mapping, form, request, response); + } + + private void sendNewUserEmail(HttpServletRequest request, UserForm userForm) + throws Exception { + MessageResources resources = getResources(request); + + // Send user an e-mail + if (log.isDebugEnabled()) { + log.debug("Sending user '" + userForm.getUsername() + + "' an account information e-mail"); + } + + SimpleMailMessage message = (SimpleMailMessage) getBean("mailMessage"); + message.setTo(userForm.getFullName() + "<" + userForm.getEmail() + ">"); + + StringBuffer msg = new StringBuffer(); + msg.append(resources.getMessage("newuser.email.message", + userForm.getFullName())); + msg.append("\n\n" + resources.getMessage("userForm.username")); + msg.append(": " + userForm.getUsername() + "\n"); + msg.append(resources.getMessage("userForm.password") + ": "); + msg.append(userForm.getPassword()); + msg.append("\n\nLogin at: " + RequestUtil.getAppURL(request)); + message.setText(msg.toString()); + + message.setSubject(resources.getMessage("signup.email.subject")); + + MailEngine engine = (MailEngine) getBean("mailEngine"); + engine.send(message); + } + + private void checkForRememberMeLogin(HttpServletRequest request) { + // if user logged in with remember me, display a warning that they can't change passwords + log.debug("checking for remember me login..."); + + AuthenticationTrustResolver resolver = new AuthenticationTrustResolverImpl(); + SecureContext ctx = (SecureContext) ContextHolder.getContext(); + + if (ctx != null) { + Authentication auth = ctx.getAuthentication(); + + if (resolver.isRememberMe(auth)) { + request.getSession().setAttribute("cookieLogin", "true"); + + // add warning message + ActionMessages messages = new ActionMessages(); + messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("userProfile.cookieLogin")); + saveMessages(request, messages); + } + } + } +} Index: src/web/org/appfuse/webapp/filter/ActionFilter.java =================================================================== RCS file: /cvs/appfuse/src/web/org/appfuse/webapp/filter/ActionFilter.java,v retrieving revision 1.13 diff -u -r1.13 ActionFilter.java --- src/web/org/appfuse/webapp/filter/ActionFilter.java 16 Apr 2005 22:17:21 -0000 1.13 +++ src/web/org/appfuse/webapp/filter/ActionFilter.java 28 Aug 2005 22:45:22 -0000 @@ -18,8 +18,6 @@ import org.appfuse.Constants; import org.appfuse.model.User; import org.appfuse.service.UserManager; -import org.appfuse.webapp.util.RequestUtil; -import org.appfuse.webapp.util.SslUtil; import org.springframework.context.ApplicationContext; import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.web.context.support.WebApplicationContextUtils; @@ -36,23 +34,13 @@ * @version $Revision: 1.13 $ $Date: 2005/04/16 22:17:21 $ * * @web.filter display-name="Action Filter" name="actionFilter" - * - *Change this value to true if you want to secure your entire application.
- * This can also be done in web-security.xml by setting
-
+
-<%-- If you don't want to encrypt passwords programmatically, or you don't
- care about using SSL for the login, you can change this form's action
- to "j_security_check" --%>
-"
- onsubmit="saveUsername(this);return validateForm(this)">
-
-
-
-
-
-<%@ include file="/scripts/login.js"%>
+<%@ include file="/common/taglibs.jsp"%>
+
+|
-
-
- |
- |
| - - | -- - | -
|---|---|
| - - | -- - | -
| - | - - - | -
| - | - - - " tabindex="4" /> - " tabindex="5" - onclick="document.getElementById('j_username').focus()" /> - | -
| - | - |
-
+"
+ onsubmit="saveUsername(this);return validateForm(this)">
+
+
+
+
+
+<%@ include file="/scripts/login.js"%>
|
+
+
+ |
+ |
| + + | ++ + | +
|---|---|
| + + | ++ + | +
| + | + + + | +
| + | + " tabindex="4" /> + " tabindex="5" + onclick="document.getElementById('j_username').focus()" /> + | +
| + | + |
+