Changeset 474 for trunk/email2trac.py.in

Timestamp:

08/09/10 14:27:19 (13 years ago)

Author:

bas

Message:

fine tuning of permission model in:

• TICKET_APPEND
• TICKET_CHGPROP

So email2trac will honour the permission set by the trac permission model if set in email2trac.conf. see #214, #198

File:

• trunk/email2trac.py.in (modified) (10 diffs)

trunk/email2trac.py.in

@@ -583 +583 @@
 ########## TRAC ticket functions  ###########################################################
 
-        def check_permission_participants(self, tkt):
+        def check_permission_participants(self, tkt, action):
                 """
                 Check if the mailer is allowed to update the ticket
@@ -595 +595 @@
 
                 perm = PermissionSystem(self.env)
-                if perm.check_permission('TICKET_MODIFY', self.author):
+                if perm.check_permission(action, self.author):
                         self.logger.debug('ALLOW, %s has trac permission to update the ticket' %(self.author))
 
                         return True
-
-                else:
-                        return False
                 
-
                 # Is the updater in the CC?
                 try:
@@ -614 +610 @@
 
                 except KeyError:
-                        return False
+                        pass
+
+                return False
 
         def check_permission(self, tkt, action):
@@ -621 +619 @@
           - TICKET_CREATE
           - TICKET_MODIFY
+          - TICKET_APPEND
+          - TICKET_CHGPROP
 
                 There are three models:
@@ -638 +638 @@
 
                 elif self.parameters.ticket_permission_system in ['update_restricted_to_participants']:
-                        if action in ['TICKET_MODIFY']:
-                                return (self.check_permission_participants(tkt))        
-                        else:
-                                return True
+                        return (self.check_permission_participants(tkt, action))        
 
                 # Default is to allow everybody ticket updates and ticket creation
@@ -648 +645 @@
 
 
-        def update_ticket_fields(self, ticket, user_dict, use_default=None): 
+        def update_ticket_fields(self, ticket, user_dict, new_ticket=None): 
                 """
                 This will update the ticket fields. It will check if the 
@@ -656 +653 @@
                         - If the value supplied is valid for the ticket field.
                           If not then there are two options:
-                           1) Skip the value (use_default=None)
-                           2) Set default value for field (use_default=1)
+                           1) Skip the value (new_ticket=None)
+                           2) Set default value for field (new_ticket=1)
                 """
                 self.logger.debug("function update_ticket_fields")
+
+                ## Check only permission model on ticket updates
+                #
+                if not new_ticket:
+                        if self.parameters.ticket_permission_system:
+                                if not self.check_permission(ticket, 'TICKET_CHGPROP'):
+                                        self.logger.info('Reporter: %s has no permission to change ticket properties' %self.author)
+                                        return False
 
                 # Build a system dictionary from the ticket fields 
@@ -706 +711 @@
                                                 # Must we set a default if value is not allowed
                                                 #
-                                                if use_default:
+                                                if new_ticket:
                                                         value = self.get_config('ticket', 'default_%s' %(field) )
 
@@ -773 +778 @@
                 #
                 if self.parameters.ticket_permission_system:
-                        if not self.check_permission(tkt, 'TICKET_MODIFY'):
-                                self.logger.info('Reporter: %s has no permission to modify tickets' %self.author)
+                        if not self.check_permission(tkt, 'TICKET_APPEND'):
+                                self.logger.info('Reporter: %s has no permission to add comments or attachments to tickets' %self.author)
                                 return False
 
@@ -925 +930 @@
                                         self.print_unicode(s)
 
-                self.update_ticket_fields(ticket, user_dict, use_default=1)
+                self.update_ticket_fields(ticket, user_dict, new_ticket=1)
 
                 if 'status' not in user_dict.keys():