Apache
/
archiva-redback-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

this return a String so no need to do toString on Object 

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1428124 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-01-03 00:15:37 +00:00
parent b951dc02fd
commit 455093d86c
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
View File

@ -78,20 +78,20 @@ public class RbacAuthorizer
public AuthorizationResult isAuthorized( AuthorizationDataSource source ) public AuthorizationResult isAuthorized( AuthorizationDataSource source )
throws AuthorizationException throws AuthorizationException
{ {
Object principal = source.getPrincipal(); String principal = source.getPrincipal();
Object operation = source.getPermission(); String operation = source.getPermission();
Object resource = source.getResource(); String resource = source.getResource();
try try
{ {
if ( principal != null ) if ( principal != null )
{ {
// Set permissions = manager.getAssignedPermissions( principal.toString(), operation ); // Set permissions = manager.getAssignedPermissions( principal.toString(), operation );
Map<String, List<Permission>> permissionMap = manager.getAssignedPermissionMap( principal.toString() ); Map<String, List<Permission>> permissionMap = manager.getAssignedPermissionMap( principal );
if ( permissionMap.keySet().contains( operation.toString() ) ) if ( permissionMap.keySet().contains( operation ) )
{ {
for ( Permission permission : permissionMap.get( operation.toString() ) ) for ( Permission permission : permissionMap.get( operation ) )
{ {
log.debug( "checking permission {} for operation {} resource {}", log.debug( "checking permission {} for operation {} resource {}",
@ -103,11 +103,11 @@ public class RbacAuthorizer
} }
} }
log.debug( "no permission found for operation {} resource {}", operation.toString(), resource ); log.debug( "no permission found for operation {} resource {}", operation, resource );
} }
else else
{ {
log.debug( "permission map does not contain operation: {}", operation.toString() ); log.debug( "permission map does not contain operation: {}", operation );
} }
} }
// check if guest user is enabled, if so check the global permissions // check if guest user is enabled, if so check the global permissions
@ -118,9 +118,9 @@ public class RbacAuthorizer
// Set permissions = manager.getAssignedPermissions( principal.toString(), operation ); // Set permissions = manager.getAssignedPermissions( principal.toString(), operation );
Map<String, List<Permission>> permissionMap = manager.getAssignedPermissionMap( guest.getUsername() ); Map<String, List<Permission>> permissionMap = manager.getAssignedPermissionMap( guest.getUsername() );
if ( permissionMap.keySet().contains( operation.toString() ) ) if ( permissionMap.keySet().contains( operation ) )
{ {
for ( Permission permission : permissionMap.get( operation.toString() ) ) for ( Permission permission : permissionMap.get( operation ) )
{ {
log.debug( "checking permission {}", permission.getName() ); log.debug( "checking permission {}", permission.getName() );

4
redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryAuthorizer.java
View File

@ -40,9 +40,9 @@ public class MemoryAuthorizer
public AuthorizationResult isAuthorized( AuthorizationDataSource source ) public AuthorizationResult isAuthorized( AuthorizationDataSource source )
throws AuthorizationException throws AuthorizationException
{ {
Object principal = source.getPrincipal(); String principal = source.getPrincipal();
Object permission = source.getPermission(); String permission = source.getPermission();
// TODO: Actually use a real permission! // TODO: Actually use a real permission!
if ( "foo".equals( permission.toString() ) ) if ( "foo".equals( permission.toString() ) )