November 2012 - Nuiton-web-commits - mailman.cloud.codelutin.com

r241 - in trunk/nuiton-security/src/main/java/org/nuiton/web/security: . actions
by echatellier＠users.nuiton.org 26 Nov '12

26 Nov '12

Author: echatellier Date: 2012-11-26 16:27:14 +0100 (Mon, 26 Nov 2012) New Revision: 241 Url: http://nuiton.org/repositories/revision/nuiton-web/241 Log: Take care of context path in uri Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2012-11-23 12:34:40 UTC (rev 240) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2012-11-26 15:27:14 UTC (rev 241) @@ -136,8 +136,13 @@ subjectUser.login(new UsernamePasswordToken(ANON_LOGIN, "")); } - // get permission - String uri = ((HttpServletRequest)servletRequest).getRequestURI(); + // get permission from requested uri without context path + HttpServletRequest httpServletRequest = ((HttpServletRequest)servletRequest); + String contextPath = httpServletRequest.getContextPath(); + String uri = httpServletRequest.getRequestURI(); + if (uri.startsWith(contextPath)) { + uri = uri.substring(contextPath.length()); + } String perm = SecurityUtil.convertToShiroPerm(uri, config.getOption("topia.security.separators")); if (subjectUser.isPermitted("url" + perm)) { @@ -156,13 +161,13 @@ } // save request and redirect to login Session session = subjectUser.getSession(); - HttpServletRequest httpServletRequest = (HttpServletRequest)servletRequest; StringBuffer requestURL = new StringBuffer(httpServletRequest.getRequestURL()); if (httpServletRequest.getQueryString() != null) { requestURL.append('?').append(httpServletRequest.getQueryString()); } session.setAttribute(SESSION_SAVED_URL, requestURL.toString()); - ((HttpServletResponse)servletResponse).sendRedirect(config.getOption("topia.security.loginurl")); + String redirect = contextPath + config.getOption("topia.security.loginurl"); + ((HttpServletResponse)servletResponse).sendRedirect(redirect); } else { ((HttpServletResponse)servletResponse).sendError(401, "Not authorized to access " + uri); } Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java 2012-11-23 12:34:40 UTC (rev 240) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java 2012-11-26 15:27:14 UTC (rev 241) @@ -36,7 +36,6 @@ import com.opensymphony.xwork2.ActionSupport; - public class AbstractAction extends ActionSupport implements ServletContextAware, ParameterAware { /** serialVersionUID. */ Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java 2012-11-23 12:34:40 UTC (rev 240) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java 2012-11-26 15:27:14 UTC (rev 241) @@ -22,7 +22,6 @@ * #L% */ - package org.nuiton.web.security.actions; import org.apache.commons.lang3.StringUtils;

1 0

r240 - trunk/nuiton-security/src/main/resources/WEB-INF/security
by echatellier＠users.nuiton.org 23 Nov '12

23 Nov '12

Author: echatellier Date: 2012-11-23 13:34:40 +0100 (Fri, 23 Nov 2012) New Revision: 240 Url: http://nuiton.org/repositories/revision/nuiton-web/240 Log: Correction des class/cssClass Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp 2012-11-16 16:13:41 UTC (rev 239) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp 2012-11-23 12:34:40 UTC (rev 240) @@ -37,7 +37,7 @@ <h2>Permissions des rôles</h2> - <form action="<s:url action="role-permissions" namespace="/security" />" method="post" class="security-form"> + <form action="<s:url action="role-permissions" namespace="/security" />" method="post" cssClass="security-form"> <s:iterator value="roles"> <input type="hidden" name="roleIds" value="<s:property value="topiaId" />" /> </s:iterator> Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2012-11-16 16:13:41 UTC (rev 239) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2012-11-23 12:34:40 UTC (rev 240) @@ -41,20 +41,19 @@ <h2>Nouveau rôle</h2> </s:else> - <s:form action="role" namespace="/security" class="security-form"> + <s:form action="role" namespace="/security" cssClass="security-form"> <s:actionerror /> <s:hidden name="roleId" value="%{role.topiaId}" /> <s:textfield label="Nom" name="role.name" value="%{role.name}"/> <s:submit label="Valider" /> </s:form> + + <s:if test='%{role.topiaId != null}'> + <s:a action="role!delete" namespace="/security" cssClass="delete"> + <s:param name="roleId"><s:property value="role.topiaId" /></s:param> + Supprimer + </s:a> + </s:if> </div> - - <s:if test='%{role.topiaId != null}'> - <s:a action="role!delete" namespace="/security" class="delete"> - <s:param name="roleId"><s:property value="role.topiaId" /></s:param> - Supprimer - </s:a> - </s:if> - </body> </html> Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2012-11-16 16:13:41 UTC (rev 239) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2012-11-23 12:34:40 UTC (rev 240) @@ -41,7 +41,7 @@ <h2>Nouveau utilisateur</h2> </s:else> - <s:form action="user" namespace="/security" class="security-form"> + <s:form action="user" namespace="/security" cssClass="security-form"> <s:actionerror /> <s:hidden name="userId" value="%{user.topiaId}" /> <s:textfield label="Identifiant" name="user.login" value="%{user.login}"/> @@ -51,7 +51,7 @@ </s:form> <s:if test='%{user.topiaId != null}'> - <s:a action="user!delete" namespace="/security" class="delete"> + <s:a action="user!delete" namespace="/security" cssClass="delete"> <s:param name="userId"><s:property value="user.topiaId" /></s:param> Supprimer </s:a>

1 0

r239 - trunk
by tchemit＠users.nuiton.org 16 Nov '12

16 Nov '12

Author: tchemit Date: 2012-11-16 17:13:41 +0100 (Fri, 16 Nov 2012) New Revision: 239 Url: http://nuiton.org/repositories/revision/nuiton-web/239 Log: fix scm url Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-16 15:34:51 UTC (rev 238) +++ trunk/pom.xml 2012-11-16 16:13:41 UTC (rev 239) @@ -341,7 +341,7 @@ <developerConnection> scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> + <url>http://www.nuiton.org/projects/nuiton-web/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r238 - trunk
by tchemit＠users.nuiton.org 16 Nov '12

16 Nov '12

Author: tchemit Date: 2012-11-16 16:34:51 +0100 (Fri, 16 Nov 2012) New Revision: 238 Url: http://nuiton.org/repositories/revision/nuiton-web/238 Log: Update mavenpom4redmineAndCentral to 3.4.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-31 08:58:23 UTC (rev 237) +++ trunk/pom.xml 2012-11-16 15:34:51 UTC (rev 238) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.3</version> + <version>3.4.4</version> </parent> <groupId>org.nuiton.web</groupId>

1 0