Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

using log with message parameters

Browse Source
This commit is contained in:
Aleksandr Mashchenko
2015-07-11 14:59:57 +03:00
parent 72e8b109b5
commit 3c9ff04bdb
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/interceptor/RolesInterceptor.java
+5 -15
View File
@@ -120,14 +120,10 @@ public class RolesInterceptor extends AbstractInterceptor {
throw new IllegalArgumentException("RolesInterceptor is misconfigured, check logs for erroneous configuration!");
}
if (!isAllowed(request, invocation.getAction())) {
if (LOG.isDebugEnabled()) {
LOG.debug("Request is NOT allowed. Rejecting.");
}
LOG.debug("Request is NOT allowed. Rejecting.");
return handleRejection(invocation, response);
} else {
if (LOG.isDebugEnabled()) {
LOG.debug("Request is allowed. Invoking.");
}
LOG.debug("Request is allowed. Invoking.");
return invocation.invoke();
}
}
@@ -154,25 +150,19 @@ public class RolesInterceptor extends AbstractInterceptor {
protected boolean isAllowed(HttpServletRequest request, Object action) {
for (String role : disallowedRoles) {
if (request.isUserInRole(role)) {
if (LOG.isDebugEnabled()) {
LOG.debug("User role '" + role + "' is in the disallowedRoles list.");
}
LOG.debug("User role '{}' is in the disallowedRoles list.", role);
return false;
}
}
if (allowedRoles.isEmpty()){
if (LOG.isDebugEnabled()) {
LOG.debug("The allowedRoles list is empty.");
}
LOG.debug("The allowedRoles list is empty.");
return true;
}
for (String role : allowedRoles) {
if (request.isUserInRole(role)) {
if (LOG.isDebugEnabled()) {
LOG.debug("User role '" + role + "' is in the allowedRoles list.");
}
LOG.debug("User role '{}' is in the allowedRoles list.", role);
return true;
}
}