Ticket #238: ticket_creators.patch

File ticket_creators.patch, 7.6 KB (added by anonymous, 13 years ago)

  • email2trac-2.0. 

    diff -rupN email2trac-2.0.2//configure email2trac-2.0.2-patch-ticket_create//configure
    old new GREP 
    638638EGREP
    639639DEBUG
    640640email2trac_conf
     641email2trac_ticket_creators_conf
    641642SYSTEM_EMAIL2TRAC_CONF
     643SYSTEM_EMAIL2TRAC_TICKET_CREATORS_CONF
    642644LIBOBJS
    643645LTLIBOBJS'
    644646ac_subst_files=''
    … … fi 
    32583260if test "$sysconfdir" = '${prefix}/etc'; then
    32593261  if test "x$prefix" = xNONE; then
    32603262    email2trac_conf="$ac_default_prefix/etc/email2trac.conf"
     3263    email2trac_ticket_creators_conf="$ac_default_prefix/etc/email2trac_ticket_creators.conf"
    32613264  else
    32623265    email2trac_conf="$prefix/etc/email2trac.conf"
     3266    email2trac_ticket_creators_conf="$prefix/etc/email2trac_ticket_creators.conf"
    32633267  fi
    32643268else
    32653269  email2trac_conf="$sysconfdir/email2trac.conf"
     3270  email2trac_ticket_creators_conf="$sysconfdir/email2trac_ticket_creators.conf"
    32663271fi
    32673272
    32683273cat >>confdefs.h <<_ACEOF
    32693274#define SYSTEM_EMAIL2TRAC_CONF "$email2trac_conf"
     3275#define SYSTEM_EMAIL2TRAC_TICKET_CREATORS_CONF "$email2trac_conf"
    32703276_ACEOF
    32713277
    32723278
    … … GREP!$GREP$ac_delim 
    39673973EGREP!$EGREP$ac_delim
    39683974DEBUG!$DEBUG$ac_delim
    39693975email2trac_conf!$email2trac_conf$ac_delim
     3976email2trac_ticket_creators_conf!$email2trac_ticket_creators_conf$ac_delim
    39703977SYSTEM_EMAIL2TRAC_CONF!$SYSTEM_EMAIL2TRAC_CONF$ac_delim
     3978SYSTEM_EMAIL2TRAC_TICKET_CREATORS_CONF!$SYSTEM_EMAIL2TRAC_TICKET_CREATORS_CONF$ac_delim
    39713979LIBOBJS!$LIBOBJS$ac_delim
    39723980LTLIBOBJS!$LTLIBOBJS$ac_delim
    39733981_ACEOF
    39743982
    3975   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then
     3983  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 66; then
    39763984    break
    39773985  elif $ac_last_try; then
    39783986    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

  • email2trac.py.in 

    diff -rupN email2trac-2.0.2//email2trac.py.in email2trac-2.0.2-patch-ticket_create//email2trac.py.in
    old new class TicketEmailParser(object): 
    188188            self.parameters.email_quote = '> '
    189189
    190190        if not self.parameters.ticket_update_by_subject_lookback:
    191             self.parameters.ticket_update_by_subject_lookback = 30
     191            self.parameters.ticket_update_by_subject_lookback = 30     
    192192
    193193        if self.parameters.verbatim_format == None:
    194194            self.parameters.verbatim_format = 1
    … … class TicketEmailParser(object): 
    687687        """
    688688        self.logger.debug("function check_permission")
    689689
     690        ## If the permission system is set to 'custom'
     691        # then check wether the sender is authorized
     692        # to create new tickets (allows to use different
     693        # permissions than trac)
     694        # -Note: the email addresses of the authorized
     695        # users have to appear in the configuration file
     696        # found at PREFIX/email2trac_ticket_creators_conf
     697        if self.parameters.ticket_permission_system in ['custom']:
     698            ticket_creators_file = '@email2trac_ticket_creators_conf@'
     699            try:
     700                ticket_creators = open(ticket_creators_file,'r').read().strip('\n').split(',')               
     701                if self.author in ticket_creators:
     702                    return True
     703                return False
     704            except Exception:
     705                self.logger.info('Ticket creators file could not be read')
     706                return False
     707
    690708        if self.parameters.ticket_permission_system in ['trac']:
    691709
    692710            perm = PermissionSystem(self.env)
    … … class TicketEmailParser(object): 
    10641082
    10651083        self.set_ticket_fields(tkt)
    10661084
    1067         ## Check the permission of the reporter
    1068         #
    10691085        if self.parameters.ticket_permission_system:
    10701086            if not self.check_permission(tkt, 'TICKET_CREATE'):
    10711087                self.logger.info('Reporter: %s has no permission to create tickets' %self.author)
    … … class TicketEmailParser(object): 
    16601676                #
    16611677                self.new_ticket(m, subject, spam_msg)
    16621678
    1663 
    16641679########## BODY TEXT functions  ###########################################################
    16651680
    16661681    def strip_signature(self, text):
    … … def ReadConfig(file, name): 
    22102225    ## use some trac internals to get the defaults
    22112226    #
    22122227    tmp = config.parser.defaults()
     2228    # #TODO : find a way to not use this, and add ticket_dont_create to the defaults
     2229    # tmp['ticket_dont_create'] = '0'
     2230   
    22132231    project =  SaraDict()
    22142232
    22152233    for option, value in tmp.items():

  • email2trac_ticket_creators.conf 

    diff -rupN email2trac-2.0.2//email2trac_ticket_creators.conf email2trac-2.0.2-patch-ticket_create//email2trac_ticket_creators.conf
    old new  
     1basv@sara.nl

  • email2trac-2.0. 

    diff -rupN email2trac-2.0.2//Makefile.in email2trac-2.0.2-patch-ticket_create//Makefile.in
    old new install-conf: 
    4747        then \
    4848                $(INSTALL) -c -m 644 -o $(INSTALL_USER) email2trac.conf $(DESTDIR)/$(CONFIG)/email2trac.conf ;\
    4949        fi
     50        if [ ! -f  $(DESTDIR)/$(CONFIG)/email2trac_ticket_creators.conf ] ; \
     51        then \
     52                $(INSTALL) -c -m 644 -o $(INSTALL_USER) email2trac_ticket_creators.conf $(DESTDIR)/$(CONFIG)/email2trac_ticket_creators.conf ;\
     53        fi
    5054 
    5155clean:
    5256        rm run_email2trac

  • email2trac-2.0. 

    diff -rupN email2trac-2.0.2//msg.txt email2trac-2.0.2-patch-ticket_create//msg.txt
    old new  
    1 From basv@sara.nl  Wed Mar  8 15:29:17 2006
    2 Return-Path: <basv@sara.nl>
    3 X-Original-To: test@subtrac.sara.nl
    4 Delivered-To: test@subtrac.sara.nl
    5 Received: from surfboard.ka.sara.nl (surfboard.ka.sara.nl [145.100.6.3])
    6         by localhost.localdomain (Postfix) with ESMTP id 506702800682
    7         for <test@subtrac.sara.nl>; Wed,  8 Mar 2006 15:29:17 +0100 (CET)
    8 Received: from [145.100.6.134] ([145.100.6.134] RDNS failed) by
    9         surfboard.ka.sara.nl with Microsoft SMTPSVC(6.0.3790.1830);
    10         Wed, 8 Mar 2006 15:29:17 +0100
    11 Message-ID: <440EEA39.6070200@sara.nl>
    12 Date: Wed, 08 Mar 2006 15:29:13 +0100
    13 From: Bas van der Vlies <basv@sara.nl>
    14 User-Agent: Thunderbird 1.5 (Windows/20051201)
    15 MIME-Version: 1.0
    16 To: test@subtrac.sara.nl
    17 Subject: Test123
    18 Content-Type: multipart/mixed; boundary="------------070800080005060203060809"
    19 X-OriginalArrivalTime: 08 Mar 2006 14:29:17.0140 (UTC)
    20         FILETIME=[AE40B940:01C642BC]
    21 
    22 This is a multi-part message in MIME format.
    23 --------------070800080005060203060809
    24 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
    25 Content-Transfer-Encoding: 7bit
    26 
    27 Test1234
    28 Test1234
    29 
    30 --
    31 --
    32 ********************************************************************
    33 *                                                                  *
    34 *  Bas van der Vlies                     e-mail: basv@sara.nl      *
    35 *  SARA - Academic Computing Services    phone:  +31 20 592 8012   *
    36 *  Kruislaan 415                         fax:    +31 20 6683167    *
    37 *  1098 SJ Amsterdam                                               *
    38 *                                                                  *
    39 ********************************************************************
    40 
    41 --------------070800080005060203060809
    42 Content-Type: text/plain;
    43  name="basje.txt"
    44 Content-Transfer-Encoding: 7bit
    45 Content-Disposition: inline;
    46  filename="basje.txt"
    47 
    48 test123
    49 test1234
    50 
    51 --------------070800080005060203060809--