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

improve trace logging of AuthorizationCollector

Browse Source
This commit is contained in:
Sebastian Sdorra
2016-06-24 19:32:45 +02:00
parent f5e4f4ae71
commit 7873cd556d
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -281,11 +281,6 @@ public class AuthorizationCollector
private void collectGlobalPermissions(Builder<Permission> builder,
final User user, final GroupNames groups)
{
if (logger.isTraceEnabled())
{
logger.trace("collect global permissions for user {}", user.getName());
}
List<StoredAssignedPermission> globalPermissions =
securitySystem.getPermissions(new Predicate<AssignedPermission>()
{
@@ -293,7 +288,7 @@ public class AuthorizationCollector
@Override
public boolean apply(AssignedPermission input)
{
return isUserPermission(user, groups, input);
return isUserPermitted(user, groups, input);
}
});
@@ -329,12 +324,6 @@ public class AuthorizationCollector
{
for (Repository repository : repositoryDAO.getAll())
{
if (logger.isTraceEnabled())
{
logger.trace("collect permissions for repository {} and user {}",
repository.getName(), user.getName());
}
collectRepositoryPermissions(builder, repository, user, groups);
}
}
@@ -357,23 +346,29 @@ public class AuthorizationCollector
if (Util.isNotEmpty(repositoryPermissions))
{
boolean hasPermission = false;
for (sonia.scm.repository.Permission permission : repositoryPermissions)
{
if (isUserPermission(user, groups, permission))
if (isUserPermitted(user, groups, permission))
{
hasPermission = true;
RepositoryPermission rp = new RepositoryPermission(repository,
permission.getType());
if (logger.isTraceEnabled())
{
logger.trace("add repository permission {} for user {}", rp,
user.getName());
logger.trace("add repository permission {} for user {} at repository {}", rp,
user.getName(), repository.getName());
}
builder.add(rp);
}
}
if (!hasPermission && logger.isTraceEnabled())
{
logger.trace("no permission for user {} defined at repository {}", user.getName(), repository.getName());
}
}
else if (logger.isTraceEnabled())
{
@@ -445,7 +440,7 @@ public class AuthorizationCollector
*
* @return
*/
private boolean isUserPermission(User user, GroupNames groups,
private boolean isUserPermitted(User user, GroupNames groups,
PermissionObject perm)
{
//J-