You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by am...@apache.org on 2018/09/03 19:07:28 UTC
[struts] 02/02: Improve log messages in SecurityMemberAccess
This is an automated email from the ASF dual-hosted git repository.
amashchenko pushed a commit to branch struts-2-5-x
in repository https://gitbox.apache.org/repos/asf/struts.git
commit daac47ee62e8ca63f769e03c1936a4858ddfe7f9
Author: Aleksandr Mashchenko <am...@apache.org>
AuthorDate: Fri Aug 31 22:25:05 2018 +0300
Improve log messages in SecurityMemberAccess
(cherry picked from commit be1a93b0d5be48bf64927bf8c9e272d401686d7f)
---
.../opensymphony/xwork2/ognl/SecurityMemberAccess.java | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java b/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
index f09cf30..e9225a0 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
@@ -58,17 +58,18 @@ public class SecurityMemberAccess extends DefaultMemberAccess {
@Override
public boolean isAccessible(Map context, Object target, Member member, String propertyName) {
LOG.debug("Checking access for [target: {}, member: {}, property: {}]", target, member, propertyName);
-
+
+ Class targetClass = target.getClass();
+ Class memberClass = member.getDeclaringClass();
+
if (checkEnumAccess(target, member)) {
- LOG.trace("Allowing access to enum: {}", target);
+ LOG.trace("Allowing access to enum: target class [{}] of target [{}], member [{}]", targetClass, target, member);
return true;
}
- Class targetClass = target.getClass();
- Class memberClass = member.getDeclaringClass();
-
if (Modifier.isStatic(member.getModifiers()) && allowStaticMethodAccess) {
- LOG.debug("Support for accessing static methods [target: {}, member: {}, property: {}] is deprecated!", target, member, propertyName);
+ LOG.debug("Support for accessing static methods [target: {}, targetClass: {}, member: {}, property: {}] is deprecated!",
+ target, targetClass, member, propertyName);
if (!isClassExcluded(member.getDeclaringClass())) {
targetClass = member.getDeclaringClass();
}
@@ -81,7 +82,7 @@ public class SecurityMemberAccess extends DefaultMemberAccess {
}
if (isClassExcluded(targetClass)) {
- LOG.warn("Target class [{}] is excluded!", target);
+ LOG.warn("Target class [{}] of target [{}] is excluded!", targetClass, target);
return false;
}
@@ -91,7 +92,7 @@ public class SecurityMemberAccess extends DefaultMemberAccess {
}
if (disallowProxyMemberAccess && ProxyUtil.isProxyMember(member, target)) {
- LOG.warn("Access to proxy [{}] is blocked!", member);
+ LOG.warn("Access to proxy is blocked! Target class [{}] of target [{}], member [{}]", targetClass, target, member);
return false;
}