Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 16:35:45 +01:00
Code Issues Packages Projects Releases Activity

improve logging of AuthorizationCollector

Browse Source
This commit is contained in:
Sebastian Sdorra
2016-06-28 10:26:01 +02:00
parent 353e4c4f7b
commit 5433317692
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scm-webapp/src/main/java/sonia/scm/security/AuthorizationCollector.java
View File

@@ -166,15 +166,17 @@ public class AuthorizationCollector
User beforeModification = ((UserModificationEvent) event).getItemBeforeModification(); User beforeModification = ((UserModificationEvent) event).getItemBeforeModification();
if (shouldCacheBeCleared(user, beforeModification)) if (shouldCacheBeCleared(user, beforeModification))
{ {
logger.debug("invalidate cache of user {}, because of a permission relevant field has changed", username);
invalidateUserCache(username); invalidateUserCache(username);
} }
else else
{ {
logger.debug("cache of user {} is not invalidated, because admin and active flag has not changed", username); logger.debug("cache of user {} is not invalidated, because no permission relevant field has changed", username);
} }
} }
else else
{ {
logger.debug("invalidate cache of user {}, because of a user event", username);
invalidateUserCache(username); invalidateUserCache(username);
} }
} }
@@ -187,7 +189,6 @@ public class AuthorizationCollector
private void invalidateUserCache(final String username) private void invalidateUserCache(final String username)
{ {
logger.debug("invalidate cache of user {}, because of a event which could change the permissions", username);
cache.removeAll(new Filter<CacheKey>() cache.removeAll(new Filter<CacheKey>()
{ {
@Override @Override
@@ -260,8 +261,7 @@ public class AuthorizationCollector
{ {
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {
logger.debug("clear cache, because permission {} has changed",
event.getPermission().getId());
} }
StoredAssignedPermission permission = event.getPermission(); StoredAssignedPermission permission = event.getPermission();
@@ -272,6 +272,10 @@ public class AuthorizationCollector
} }
else else
{ {
logger.debug(
"clear cache of user {}, because permission {} has changed",
permission.getName(), event.getPermission().getId()
);
invalidateUserCache(permission.getName()); invalidateUserCache(permission.getName());
} }
} }
@@ -346,19 +350,14 @@ public class AuthorizationCollector
AuthorizationInfo info = cache.get(cacheKey); AuthorizationInfo info = cache.get(cacheKey);
if (info == null) if (info == null)
{
if (logger.isTraceEnabled())
{ {
logger.trace("collect AuthorizationInfo for user {}", user.getName()); logger.trace("collect AuthorizationInfo for user {}", user.getName());
}
info = createAuthorizationInfo(user, groupNames); info = createAuthorizationInfo(user, groupNames);
cache.put(cacheKey, info); cache.put(cacheKey, info);
} }
else if (logger.isTraceEnabled()) else if (logger.isTraceEnabled())
{ {
logger.trace("retrieve AuthorizationInfo for user {} from cache", logger.trace("retrieve AuthorizationInfo for user {} from cache", user.getName());
user.getName());
} }
return info; return info;
@@ -518,7 +517,6 @@ public class AuthorizationCollector
} }
SimpleAuthorizationInfo info = new SimpleAuthorizationInfo(roles); SimpleAuthorizationInfo info = new SimpleAuthorizationInfo(roles);
info.addObjectPermissions(permissions); info.addObjectPermissions(permissions);
return info; return info;