From e5610b93576fad6b90e73275ff2b0a606540cc1b Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Mon, 11 Sep 2006 08:43:22 +0000 Subject: [PATCH] fix second person registering issue git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@442127 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva/web/util/DefaultRoleManager.java | 62 +++++++++---------- 1 file changed, 28 insertions(+), 34 deletions(-) diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/DefaultRoleManager.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/DefaultRoleManager.java index 19a403cc8..9fc9ac4a7 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/DefaultRoleManager.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/DefaultRoleManager.java @@ -122,42 +122,46 @@ public class DefaultRoleManager { if ( !manager.permissionExists( "Edit Configuration" ) ) { - Permission editConfiguration = - manager.createPermission( "Edit Configuration", "edit-configuration", manager.getGlobalResource().getIdentifier() ); + Permission editConfiguration = manager.createPermission( "Edit Configuration", "edit-configuration", + manager.getGlobalResource().getIdentifier() ); manager.savePermission( editConfiguration ); } if ( !manager.permissionExists( "Run Indexer" ) ) { - Permission runIndexer = manager.createPermission( "Run Indexer", "run-indexer", manager.getGlobalResource().getIdentifier() ); + Permission runIndexer = manager.createPermission( "Run Indexer", "run-indexer", + manager.getGlobalResource().getIdentifier() ); manager.savePermission( runIndexer ); } if ( !manager.permissionExists( "Add Repository" ) ) { - Permission runIndexer = manager.createPermission( "Add Repository", "add-repository", manager.getGlobalResource().getIdentifier() ); + Permission runIndexer = manager.createPermission( "Add Repository", "add-repository", + manager.getGlobalResource().getIdentifier() ); manager.savePermission( runIndexer ); } if ( !manager.permissionExists( "Edit All Users" ) ) { - Permission editAllUsers = manager.createPermission( "Edit All Users", "edit-all-users", manager.getGlobalResource().getIdentifier() ); + Permission editAllUsers = manager.createPermission( "Edit All Users", "edit-all-users", + manager.getGlobalResource().getIdentifier() ); manager.savePermission( editAllUsers ); } if ( !manager.permissionExists( "Remove Roles" ) ) { - Permission editAllUsers = manager.createPermission( "Remove Roles", "remove-roles", manager.getGlobalResource().getIdentifier() ); + Permission editAllUsers = manager.createPermission( "Remove Roles", "remove-roles", + manager.getGlobalResource().getIdentifier() ); manager.savePermission( editAllUsers ); } - if ( !manager.permissionExists( "Regenerate Index" ) ) { - Permission regenIndex = manager.createPermission( "Regenerate Index", "regenerate-index", manager.getGlobalResource().getIdentifier() ); + Permission regenIndex = manager.createPermission( "Regenerate Index", "regenerate-index", + manager.getGlobalResource().getIdentifier() ); manager.savePermission( regenIndex ); } @@ -174,17 +178,16 @@ public class DefaultRoleManager if ( !manager.roleExists( "System Administrator" ) ) { Role admin = manager.createRole( "System Administrator" ); - admin.addChildRole( manager.getRole( "User Administrator" ) ) ; + admin.addChildRole( manager.getRole( "User Administrator" ) ); admin.addPermission( manager.getPermission( "Edit Configuration" ) ); admin.addPermission( manager.getPermission( "Run Indexer" ) ); - admin.addPermission( manager.getPermission( "Add Repository") ); + admin.addPermission( manager.getPermission( "Add Repository" ) ); admin.addPermission( manager.getPermission( "Regenerate Index" ) ); admin.setAssignable( true ); manager.saveRole( admin ); } - } catch ( RbacObjectNotFoundException ne ) { @@ -197,31 +200,23 @@ public class DefaultRoleManager public void addUser( String principal ) throws RbacStoreException { - try - { - // make the resource - Resource usernameResource = manager.createResource( principal ); - manager.saveResource( usernameResource ); - Permission editUser = manager.createPermission( "Edit Myself" ); - editUser.setOperation( manager.getOperation( "edit-user" ) ); - editUser.setResource( manager.getResource( principal ) ); - editUser = manager.savePermission( editUser ); + // make the resource + Resource usernameResource = manager.createResource( principal ); + manager.saveResource( usernameResource ); - // todo this one role a user will go away when we have expressions in the resources - Role userRole = manager.createRole( "Personal Role - " + principal ); - userRole.addPermission( editUser ); - userRole = manager.saveRole( userRole ); + Permission editUser = manager.createPermission( "Edit Myself - " + principal, "edit-user", principal ); + editUser = manager.savePermission( editUser ); - UserAssignment assignment = manager.createUserAssignment( principal ); - assignment.addRole( userRole ); - manager.saveUserAssignment( assignment ); + // todo this one role a user will go away when we have expressions in the resources + Role userRole = manager.createRole( "Personal Role - " + principal ); + userRole.addPermission( editUser ); + userRole = manager.saveRole( userRole ); + + UserAssignment assignment = manager.createUserAssignment( principal ); + assignment.addRole( userRole ); + manager.saveUserAssignment( assignment ); - } - catch ( RbacObjectNotFoundException ne ) - { - throw new RbacStoreException( "rbac object not found in repo role creation", ne ); - } } public void addRepository( String repositoryName ) @@ -244,8 +239,7 @@ public class DefaultRoleManager deleteRepo.setResource( repoResource ); deleteRepo = manager.savePermission( deleteRepo ); - Permission getReports = - manager.createPermission( "Get Reports - " + repositoryName ); + Permission getReports = manager.createPermission( "Get Reports - " + repositoryName ); getReports.setOperation( manager.getOperation( "get-reports" ) ); getReports.setResource( repoResource ); getReports = manager.savePermission( getReports ); -- 2.39.5