Changeset in

Timestamp:

05/05/09 12:57:54 (3 years ago)

Author:

John Hampton <pacopablo@…>

Children:

5e94bfb2a2639853b058404f7fd21601d0d9872d

Parents:

c8845e4129ccc08b18467b5028c93885c1aba213

git-committer:

John Hampton <pacopablo@pacopablo.com> / 2009-05-05T12:57:54Z-0700

Message:

Flushing out imap ticket submission

Location:

resourcetotrac/resourcetotrac

Files:

• api.py (modified) (3 diffs)
• email/imap.py (modified) (3 diffs)
• email/parsers/ticket.py (modified) (7 diffs)
• email/util.py (modified) (1 diff)

resourcetotrac/resourcetotrac/api.py

@@ -77 +77 @@
         """ Return whether or not to parse the given resource type """
 
-    def parse_message(self, resource_type, message):
+    def parse_message(self, resource_type, message, options):
         """ Parses the message and returns a child instance of
         BaseParsedMesssage
@@ -97 +97 @@
     """ Base class for parsed messages. """
 
-    def __init__(self, message=None):
+    def __init__(self, message=None, options={}):
         self.raw_message = message
 
@@ -132 +132 @@
 
     def get_attachments(self):
-        """ Return a list of (filename, attachment) tuples """A
+        """ Return a list of (filename, attachment) tuples """
         return []
 

resourcetotrac/resourcetotrac/email/imap.py

@@ -50 +50 @@
     passwd = Option('resource2trac', 'imap.passwd',
                     doc="IMAP password")
+    server_hops = IntOption('resource2trac', 'imap.server.hops', default=2,
+                            doc="Number of servers to back-track in order to "
+                                "find the IP of the sender")
 
     # IDataSource Methods
@@ -148 +151 @@
         BaseParsedMessage subclass
         """
+        options = {'server_hops': self.server_hops}
         for p in self.type_parsers:
             resource_type = p.get_resource_type(msg)
@@ -155 +159 @@
         for p in self.resource_parsers:
             if p.match_resource_type(resource_type):
-                return p.parse_message(resource_type, msg)
+                return p.parse_message(resource_type, msg, options)
             continue
         return None

resourcetotrac/resourcetotrac/email/parsers/ticket.py

@@ -18 +18 @@
 from resourcetotrac.api import BaseParsedMessage
 from resourcetotrac.email.api import IEmailTypeParser, IEmailResourceParser
-from resourcetotrac.email.util import strip_re, get_author_email, get_cc
+from resourcetotrac.email.util import strip_re, get_author_email, get_cc, get_author
 
 __all__ = [
@@ -26 +26 @@
 
 pattern = r'^(((?P<update>(re|RE|Re|rE)(:?[ ]*?))?\[(?P<project>.*?)] #(?P<id>\d+?): (?P<summary>.*))|([Tt][Ii][Cc][Kk][Ee][Tt]:?[ ]?(?P<newsummary>.*)))$'
+ip_pattern = r'^from .*? \(.*?\[(?P<serverip>.*?)]\)$'
 TICKET_SUBJECT_RE = re.compile(pattern)
+TICKET_SERVER_IP_RE = re.compile(ip_pattern)
 
 class EmailTicketParser(Component)
@@ -51 +53 @@
         return resource_type.lower() == 'ticket'
 
-    def parse_message(self, resource_type, msg):
+    def parse_message(self, resource_type, msg, options={}):
        """ Return an EmailTicketParsedMessage object """ 
         if resource_type.lower() != 'ticket':
             return BaseParsedMessage()
-        return EmailTicketParsedMessaage(msg)
+        return EmailTicketParsedMessaage(msg, options)
 
 class EmailTicketParsedMessage(BaseParsedMessage):
     """ Parse a ticket email """
 
-    def __init__(self, msg):
+    def __init__(self, msg, options):
         BaseParsedMessage.__init__(self, msg)
         match_groups = TICKET_SUBJECT_RE.match(msg['Subject']).groupdict()
@@ -68 +70 @@
         self.new = (not self.id) and match_groups['newsummary'] and True
         self.project_name = match_groups['project']
+        self.server_hops = options['server_hops']
 
     def get_author(self):
@@ -75 +78 @@
     def get_ip(self):
         """ return the IP of the author. """
-        return '0.0.0.0'
+        ips = []
+        for l in msg.get_all('received', []):
+            l = l.split('\r\n')[0]
+            g = re.match(s, l)
+            ips.append(g and g.groupdict()['serverip'] or 'None')
+            continue
+        if self.server_hops > len(ips):
+            hops = -1
+        else:
+            hops = self.server_hops - 1
+        return ips[hops][0].isdigit() and ips[hops] or '0.0.0.0'
 
     def get_id(self):
         """ Return the id of the resource """
-        return ''
+        return self.id
 
     def get_type(self):
         """ Return the type of resource """
-        return 'unknown'
+        return 'ticket'
 
     def get_data(self):
@@ -91 +104 @@
     def get_fields(self):
         """ Return a dictionary of {field: value} pairs for the resource """
+        fields = {
+            'summary': self.summary,
+            'cc': get_cc(self.raw_message),
+        }
+        fields.update(get_field_changes(self.raw_message))
         return {}
 
@@ -98 +116 @@
         The options dictionary is specific to each resource type
         """
-        return {}
+        options = {
+            'update': self.update
+        }
+        return options
 
     def get_attachments(self):
-        """ Return a list of (filename, attachment) tuples """A
+        """ Return a list of (filename, attachment) tuples """
         return []
 

resourcetotrac/resourcetotrac/email/util.py

@@ -41 +41 @@
     cnx = env.get_db_cnx()
     cur = cnx.cursor()
-    cur.execute("SELECT sid FROM session_attribute WHERE name = 'email' AND value = %s", (address,))
+    cur.execute("SELECT sid "
+                "  FROM session_attribute "
+                " WHERE name = 'email' "
+                "   AND value = %s", (address,))
+    author = cur.fetchone()[0]
+    cur = None
     cnx.close()
     cnx = None
+    return author
 
 def get_author_email(msg):