Apache/archiva
1
0
Fork 0
mirror of https://github.com/apache/archiva.git synced 2025-03-06 08:29:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

added some new permissions

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@442699 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jesse McConnell 2006-09-12 20:54:04 +00:00
parent 938c0ac92b
commit 684fe571a5
5 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,15 +88,15 @@ public void initialize()
manager.saveOperation( operation );
}
if ( !manager.operationExists( "get-reports" ) )
if ( !manager.operationExists( "access-reports" ) )
{
Operation operation = manager.createOperation( "get-reports" );
Operation operation = manager.createOperation( "access-reports" );
manager.saveOperation( operation );
}
if ( !manager.operationExists( "regenerate-reports" ) )
if ( !manager.operationExists( "generate-reports" ) )
{
Operation operation = manager.createOperation( "regenerate-reports" );
Operation operation = manager.createOperation( "generate-reports" );
manager.saveOperation( operation );
}
@ -156,6 +156,22 @@ public void initialize()
manager.savePermission( editAllUsers );
}
if ( !manager.permissionExists( "Access Reports" ) )
{
Permission editAllUsers = manager.createPermission( "Access Reports", "access-reports",
manager.getGlobalResource().getIdentifier() );
manager.savePermission( editAllUsers );
}
if ( !manager.permissionExists( "Generate All Reports" ) )
{
Permission editAllUsers = manager.createPermission( "Generate All Reports", "generate-reports",
manager.getGlobalResource().getIdentifier() );
manager.savePermission( editAllUsers );
}
if ( !manager.permissionExists( "Grant Roles" ) )
{
Permission granRoles = manager.createPermission( "Grant Roles", "grant-roles",
@ -197,6 +213,8 @@ public void initialize()
admin.addPermission( manager.getPermission( "Edit Configuration" ) );
admin.addPermission( manager.getPermission( "Run Indexer" ) );
admin.addPermission( manager.getPermission( "Add Repository" ) );
admin.addPermission( manager.getPermission( "Access Reports") );
admin.addPermission( manager.getPermission( "Generate All Reports") );
admin.addPermission( manager.getPermission( "Regenerate Index" ) );
admin.setAssignable( true );
manager.saveRole( admin );
@ -206,6 +224,7 @@ public void initialize()
}
catch ( RbacObjectNotFoundException ne )
{
ne.printStackTrace();
throw new InitializationException( "error in role initialization", ne );
}
@ -266,7 +285,7 @@ public void addRepository( String repositoryName )
// make the roles
Role repositoryObserver = manager.createRole( "Repository Observer - " + repositoryName );
repositoryObserver.addPermission( editRepo );
repositoryObserver.addPermission( getReports );
repositoryObserver.setAssignable( true );
repositoryObserver = manager.saveRole( repositoryObserver );

6
archiva-webapp/src/main/resources/xwork.xml
View File

@ -253,15 +253,15 @@
<action name="userManagement" class="userManagement" method="findUser">
<result name="input">/WEB-INF/jsp/findUser.jsp</result>
<result name="success" type="redirect-action">user</result>
<result name="success" type="chain">user</result>
</action>
<action name="assignRoleToUser" class="plexusSecurityUserAssignment" method="assignRole">
<result name="success" type="redirect-action">user</result>
<result name="success" type="chain">user</result>
</action>
<action name="removeRoleFromUser" class="plexusSecurityUserAssignment" method="removeRole">
<result name="success" type="redirect-action">user</result>
<result name="success" type="chain">user</result>
</action>
<action name="permissions" class="plexusSecuritySummary" method="permissionSummary">

2
archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
View File

@ -104,7 +104,7 @@
<ww:param name="repoId" value="%{'${repository.id}'}" />
</ww:url>
<%-- TODO replace with icons --%>
<pss:ifAuthorized permission="edit-repository" resource="${repository.id}"><ww:a href="%{editRepositoryUrl}">Edit Repository</ww:a></pss:ifAuthorized> | <pss:ifAuthorized permission="delete-repository" resource="${repository.id}"><ww:a href="%{deleteRepositoryUrl}">Delete Repository</ww:a></pss:ifAuthorized>
<pss:ifAuthorized permission="edit-repository" resource="${repository.id}"><ww:a href="%{editRepositoryUrl}">Edit Repository</ww:a></pss:ifAuthorized><pss:ifAuthorized permission="delete-repository" resource="${repository.id}"> <ww:a href="%{deleteRepositoryUrl}">Delete Repository</ww:a></pss:ifAuthorized>
</div>
<h3>${repository.name}</h3>
<table class="infoTable">

7
archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp
View File

@ -38,7 +38,7 @@
</p>
<h2>Login</h2>
<ww:form action="login">
<ww:form action="login" method="post">
<table class="bodyTable">
<tr class="a">
<th>
@ -66,6 +66,11 @@
</table>
</ww:form>
<p>
<ww:url id="registerUrl" action="register"/>
Need an Account? <ww:a href="%{registerUrl}">Register!</ww:a>
</p>
</div>
</div>

2
archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp
View File

@ -33,7 +33,7 @@
</p>
<h2>Register for an Account</h2>
<ww:form action="register">
<ww:form action="register" method="post">
<table class="bodyTable">
<tr class="b">
<th>