Changeset 267 for cleverbox/branches

Timestamp:

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

Author:

trivoallan

Message:

cleverbox : fixed permissions.ini handling. Fixes #21

Location:

cleverbox/branches/0.4

Files:

• assets/permissions.ini (modified) (1 diff)
• cleverbox/scripts/admin.py (modified) (3 diffs)

cleverbox/branches/0.4/assets/permissions.ini

@@ -1 +1 @@
 [trac]
+anonymous = SEARCH_VIEW TICKET_VIEW REPORT_VIEW TIMELINE_VIEW BROWSER_VIEW FILE_VIEW CHANGESET_VIEW LOG_VIEW WIKI_VIEW ROADMAP_VIEW MILESTONE_VIEW
 authenticated = 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
-privileged = TRAC_ADMIN

cleverbox/branches/0.4/cleverbox/scripts/admin.py

@@ -784 +784 @@
                 self._project_trac_initenv( collected_infos )
 
+                # -- Revoke all permissions in trac
+                self._project_trac_revoke_all_perms( collected_infos )
+        
                 # -- Trac initial permissions
                 self._project_trac_setperms( collected_infos )
@@ -883 +886 @@
                                      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
-        os.system( trac_perms_cmd % {'env_path'   : trac_env_path,
-                                     'subcommand' : 'remove',
-                                     'subject'    : 'anonymous',
-                                     'perms'      : ' '.join(default_perms)} )
 
         # Grant default permissions
@@ -932 +911 @@
         print
         print "  Trac initial permissions set (admin rights given to '%s')\n" % admin_login
+
+    def _project_trac_revoke_all_perms(self, infos):
+        import trac.env
+        
+        trac_env_path = os.path.join( self.getConfig('clients_root', 'general'),
+                                     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
+        print "  Revoked Trac default permissions\n"
 
     def _project_fix_perms(self, infos):