Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix second person registering issue 

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@442127 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jesse McConnell 2006-09-11 08:43:22 +00:00
parent d89e505d1e
commit e5610b9357
1 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/DefaultRoleManager.java
View File

@ -122,42 +122,46 @@ public class DefaultRoleManager
{ {
if ( !manager.permissionExists( "Edit Configuration" ) ) if ( !manager.permissionExists( "Edit Configuration" ) )
{ {
Permission editConfiguration = Permission editConfiguration = manager.createPermission( "Edit Configuration", "edit-configuration",
manager.createPermission( "Edit Configuration", "edit-configuration", manager.getGlobalResource().getIdentifier() ); manager.getGlobalResource().getIdentifier() );
manager.savePermission( editConfiguration ); manager.savePermission( editConfiguration );
} }
if ( !manager.permissionExists( "Run Indexer" ) ) 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 ); manager.savePermission( runIndexer );
} }
if ( !manager.permissionExists( "Add Repository" ) ) 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 ); manager.savePermission( runIndexer );
} }
if ( !manager.permissionExists( "Edit All Users" ) ) 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 ); manager.savePermission( editAllUsers );
} }
if ( !manager.permissionExists( "Remove Roles" ) ) 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 ); manager.savePermission( editAllUsers );
} }
if ( !manager.permissionExists( "Regenerate Index" ) ) 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 ); manager.savePermission( regenIndex );
} }
@ -184,7 +188,6 @@ public class DefaultRoleManager
} }
} }
catch ( RbacObjectNotFoundException ne ) catch ( RbacObjectNotFoundException ne )
{ {
@ -197,15 +200,12 @@ public class DefaultRoleManager
public void addUser( String principal ) public void addUser( String principal )
throws RbacStoreException throws RbacStoreException
{ {
try
{
// make the resource // make the resource
Resource usernameResource = manager.createResource( principal ); Resource usernameResource = manager.createResource( principal );
manager.saveResource( usernameResource ); manager.saveResource( usernameResource );
Permission editUser = manager.createPermission( "Edit Myself" ); Permission editUser = manager.createPermission( "Edit Myself - " + principal, "edit-user", principal );
editUser.setOperation( manager.getOperation( "edit-user" ) );
editUser.setResource( manager.getResource( principal ) );
editUser = manager.savePermission( editUser ); editUser = manager.savePermission( editUser );
// todo this one role a user will go away when we have expressions in the resources // todo this one role a user will go away when we have expressions in the resources
@ -218,11 +218,6 @@ public class DefaultRoleManager
manager.saveUserAssignment( assignment ); manager.saveUserAssignment( assignment );
} }
catch ( RbacObjectNotFoundException ne )
{
throw new RbacStoreException( "rbac object not found in repo role creation", ne );
}
}
public void addRepository( String repositoryName ) public void addRepository( String repositoryName )
throws RbacStoreException throws RbacStoreException
@ -244,8 +239,7 @@ public class DefaultRoleManager
deleteRepo.setResource( repoResource ); deleteRepo.setResource( repoResource );
deleteRepo = manager.savePermission( deleteRepo ); deleteRepo = manager.savePermission( deleteRepo );
Permission getReports = Permission getReports = manager.createPermission( "Get Reports - " + repositoryName );
manager.createPermission( "Get Reports - " + repositoryName );
getReports.setOperation( manager.getOperation( "get-reports" ) ); getReports.setOperation( manager.getOperation( "get-reports" ) );
getReports.setResource( repoResource ); getReports.setResource( repoResource );
getReports = manager.savePermission( getReports ); getReports = manager.savePermission( getReports );