From 684fe571a5de04002d1ae4b33f145017ec0683f5 Mon Sep 17 00:00:00 2001
From: Jesse McConnell <jmcconnell@apache.org>
Date: Tue, 12 Sep 2006 20:54:04 +0000
Subject: [PATCH] added some new permissions

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@442699 13f79535-47bb-0310-9956-ffa450edef68
---
 .../archiva/web/util/DefaultRoleManager.java  | 29 +++++++++++++++----
 archiva-webapp/src/main/resources/xwork.xml   |  6 ++--
 .../main/webapp/WEB-INF/jsp/admin/index.jsp   |  2 +-
 .../src/main/webapp/WEB-INF/jsp/login.jsp     |  7 ++++-
 .../src/main/webapp/WEB-INF/jsp/register.jsp  |  2 +-
 5 files changed, 35 insertions(+), 11 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 c5a3a065e..edfd90f38 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
@@ -88,15 +88,15 @@ public class DefaultRoleManager
             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 class DefaultRoleManager
                 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 class DefaultRoleManager
                 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 class DefaultRoleManager
         }
         catch ( RbacObjectNotFoundException ne )
         {
+            ne.printStackTrace();
             throw new InitializationException( "error in role initialization", ne );
         }
 
@@ -266,7 +285,7 @@ public class DefaultRoleManager
 
             // make the roles
             Role repositoryObserver = manager.createRole( "Repository Observer - " + repositoryName );
-            repositoryObserver.addPermission( editRepo );
+            repositoryObserver.addPermission( getReports );
             repositoryObserver.setAssignable( true );
             repositoryObserver = manager.saveRole( repositoryObserver );
 
diff --git a/archiva-webapp/src/main/resources/xwork.xml b/archiva-webapp/src/main/resources/xwork.xml
index e40206cba..35c969161 100644
--- a/archiva-webapp/src/main/resources/xwork.xml
+++ b/archiva-webapp/src/main/resources/xwork.xml
@@ -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">
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
index f2a220174..0ab091973 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
@@ -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">
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp
index 8a215cdce..fa7a1f484 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp
@@ -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>
 
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp
index d48277cb5..b934041ff 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp
@@ -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>
-- 
2.39.5