Changeset 588

Timestamp:

02/16/12 13:23:52 (12 years ago)

Author:

bas

Message:

added a new parameter 'white_list_file', closes #288

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• email2trac.py.in (modified) (2 diffs)

trunk/ChangeLog

@@ -16 +16 @@
     Author: Thomas Moschny
     Applied by: Bas van der Vlies
+
+  * Added new parameters:
+     - white_list_registered_users
+     - white_list_file
+  
+   white_list_registered_users:  
+    This will allow registered user to create or update an ticket even
+    when they are not added to the 'white_list' in the configuration 
+    file.
+
+   white_list_file:
+    This will read allowed users from a file. One email address per line
+
+   Suggested by: randy add psg dot com, closes ticket #288
+   Author: Bas van der Vlies
 
 2.4.7 

trunk/email2trac.py.in

@@ -439 +439 @@
 
 
+    def acl_list_from_file(self, f, keyword):
+        """
+        Read the email address from a file
+        """ 
+        self.logger.debug('function acl_list_from_file %s : %s' %(f, keyword)) 
+        
+        if  not os.path.isfile(f):
+            self.logger.error('%s_file: %s does not exists' %(keyword, f) )
+        else:
+            ## read whole file and replace '\n' with ''
+            #
+            addr_l = open(f, 'r').readlines()
+            s = ','.join(addr_l).replace('\n','')
+
+            try:
+                self.parameters[keyword] = "%s,%s" %(self.parameters[keyword], s)
+            except KeyError, detail:
+                self.parameters[keyword] = s
+
 ########## DEBUG functions  ###########################################################
 
@@ -1691 +1710 @@
         self.get_sender_info(m)
 
-        #
+
+        if self.parameters.white_list_file:
+            self.acl_list_from_file(self.parameters.white_list_file, 'white_list')
 
         if not ( self.email_header_acl('white_list', self.email_addr, True) or self.allow_registered_user ) :