Changeset 267 for cleverbox/trunk/cleverbox

Timestamp:

02/24/08 14:53:52 (4 years ago)

Author:

trivoallan

Message:

cleverbox : fixed permissions.ini handling. Fixes #21

Files:

• cleverbox/trunk/cleverbox/model/project.py (modified) (3 diffs)

cleverbox/trunk/cleverbox/model/project.py

@@ -138 +138 @@
         _trac_initenv(environment, parameters)
 
+        # -- Revoke all permissions in trac
+        _trac_revoke_all_perms(environment, parameters)
+
         # -- Trac initial permissions
         _trac_setperms(environment, parameters)
@@ -231 +234 @@
                                  infos['short_name'] )
 
-    # Perms for authenticated users
-    default_perms = ( 'BROWSER_VIEW',
-                      'CHANGESET_VIEW',
-                      'FILE_VIEW',
-                      'LOG_VIEW',
-                      'MILESTONE_VIEW',
-                      'REPORT_SQL_VIEW',
-                      'REPORT_VIEW',
-                      'ROADMAP_VIEW',
-                      'SEARCH_VIEW',
-                      'TICKET_CREATE',
-                      'TICKET_MODIFY',
-                      'TICKET_VIEW',
-                      'TIMELINE_VIEW',
-                      'WIKI_CREATE',
-                      'WIKI_MODIFY',
-                      'WIKI_VIEW' )
-
     trac_perms_cmd = 'trac-admin %(env_path)s permission %(subcommand)s %(subject)s %(perms)s'
-
-    # Remove all anonymous permissions
-    # TODO : instead of using the default_perms array, we should list all anonymous using the permissions list cmd 
-    os.system( trac_perms_cmd % {'env_path'   : trac_env_path,
-                                 'subcommand' : 'remove',
-                                 'subject'    : 'anonymous',
-                                 'perms'      : ' '.join(default_perms)} )
 
     # Grant default permissions
     perms_config = ConfigParser.SafeConfigParser()
     perms_config.read(os.path.join(environment.path, 'profiles', infos['profile'], 'permissions.ini'))
+    
+    # Grant permissions as defined in permissions.ini
     for profile in perms_config.options('trac'):
         os.system( trac_perms_cmd % {'env_path'   : trac_env_path,
@@ -273 +253 @@
                                  'subject'    : admin_login,
                                  'perms'      : 'TRAC_ADMIN'} )
-    print
+    
     print "  Trac initial permissions set (admin rights given to '%s')\n" % admin_login
+
+def _trac_revoke_all_perms(environment, infos):
+    import trac.env
+    
+    trac_env_path = os.path.join( environment.config.get('general', 'clients_root'),
+                                 infos['client'],
+                                 'var/trac',
+                                 infos['short_name'] )
+    
+    # Revoke all permissions
+    trac_env = trac.env.open_environment(trac_env_path)
+    trac_db = trac_env.get_db_cnx()
+    db_cursor = trac_db.cursor()
+    db_cursor.execute('DELETE FROM permission')
+    trac_db.commit()
+    
+    print "  Revoked Trac default permissions\n"
 
 def _fix_perms(environment, infos):