Scarab commit: svn commit: r10852 - branches/release/0.22/src: conf/conf java/org/tigris/scarab/services/security sql sql/upgrade

Author: jhoech
Date: 2009-09-22 09:13:51-0700
New Revision: 10852

Added:
   branches/release/0.22/src/sql/upgrade/upgrade-0.22-add-new-permissions.sql
Modified:
   branches/release/0.22/src/conf/conf/PermissionMapping.properties
   branches/release/0.22/src/conf/conf/TurbineResources.properties
   branches/release/0.22/src/java/org/tigris/scarab/services/security/ScarabSecurity.java
   branches/release/0.22/src/sql/scarab-security.sql

Log:
FIX - SCB2307 Now there is an own permission constraint for requesting roles.

Modified: branches/release/0.22/src/conf/conf/PermissionMapping.properties
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/conf/conf/PermissionMapping.properties?view=diff&pathrev=10852&r1=10851&r2=10852
==============================================================================
--- branches/release/0.22/src/conf/conf/PermissionMapping.properties	(original)
+++ branches/release/0.22/src/conf/conf/PermissionMapping.properties	2009-09-22 09:13:51-0700
@@ -1,5 +1,6 @@
 # permission mappings between Scarab tasks and permissions defined
-# in the system providing authorization.   
+# in the system providing authorization.
+services.ScarabSecurity.map.Request__Role=Role | Request 
 services.ScarabSecurity.map.Issue__Edit=Issue | Edit
 services.ScarabSecurity.map.Issue__Delete=Issue | Delete
 services.ScarabSecurity.map.Issue__Enter=Issue | Enter

Modified: branches/release/0.22/src/conf/conf/TurbineResources.properties
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/conf/conf/TurbineResources.properties?view=diff&pathrev=10852&r1=10851&r2=10852
==============================================================================
--- branches/release/0.22/src/conf/conf/TurbineResources.properties	(original)
+++ branches/release/0.22/src/conf/conf/TurbineResources.properties	2009-09-22 09:13:51-0700
@@ -697,6 +697,7 @@
 services.ScarabSecurity.screen.SaveQuery.vm=User__Edit_Preferences
 services.ScarabSecurity.screen.SaveTemplate.vm=User__Edit_Preferences
 services.ScarabSecurity.screen.ConfigureIssueList.vm=User__Edit_Preferences
+services.ScarabSecurity.screen.RequestRoles.vm=Request__Role
 
 # reports
 services.ScarabSecurity.screen.reports.Report_1.vm=Issue__Search

Modified: branches/release/0.22/src/java/org/tigris/scarab/services/security/ScarabSecurity.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/java/org/tigris/scarab/services/security/ScarabSecurity.java?view=diff&pathrev=10852&r1=10851&r2=10852
==============================================================================
--- branches/release/0.22/src/java/org/tigris/scarab/services/security/ScarabSecurity.java	(original)
+++ branches/release/0.22/src/java/org/tigris/scarab/services/security/ScarabSecurity.java	2009-09-22 09:13:51-0700
@@ -203,6 +203,13 @@
      */
     public static final String USER__CHANGE_PASSWORD = 
         getService().getPermissionImpl("User__Change_Password");
+    
+	/**
+	 * Specifies that user is allowed to request a role
+	 * for any module.
+	 */
+    public static final String REQUEST__ROLE = 
+        getService().getPermissionImpl("Request__Role");
 
 
     private Configuration props;
@@ -234,6 +241,7 @@
         if (allPermissions == null) 
         {
             List tmpPerms = new ArrayList();
+            addPerm(tmpPerms, ScarabSecurity.REQUEST__ROLE);
             addPerm(tmpPerms, ScarabSecurity.ISSUE__EDIT);
             addPerm(tmpPerms, ScarabSecurity.ISSUE__ENTER);
             addPerm(tmpPerms, ScarabSecurity.ISSUE__SEARCH);

Modified: branches/release/0.22/src/sql/scarab-security.sql
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/sql/scarab-security.sql?view=diff&pathrev=10852&r1=10851&r2=10852
==============================================================================
--- branches/release/0.22/src/sql/scarab-security.sql	(original)
+++ branches/release/0.22/src/sql/scarab-security.sql	2009-09-22 09:13:51-0700
@@ -64,6 +64,8 @@
 
 INSERT INTO TURBINE_PERMISSION (PERMISSION_ID, PERMISSION_NAME) 
     VALUES (20, 'Issue | Delete');
+INSERT INTO TURBINE_PERMISSION (PERMISSION_ID, PERMISSION_NAME) 
+    VALUES (22, 'Role | Request');
 
 
 -- create a temporary table.

Added: branches/release/0.22/src/sql/upgrade/upgrade-0.22-add-new-permissions.sql
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/sql/upgrade/upgrade-0.22-add-new-permissions.sql?view=markup&pathrev=10852
==============================================================================
--- (empty file)
+++ branches/release/0.22/src/sql/upgrade/upgrade-0.22-add-new-permissions.sql	2009-09-22 09:13:51-0700
@@ -0,0 +1,2 @@
+INSERT INTO TURBINE_PERMISSION (PERMISSION_ID, PERMISSION_NAME) 
+    VALUES (22, 'Role | Request');
\ No newline at end of file

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2398550