Changeset 15:8ae771653ffe in mailjam for postman/mta.py

Timestamp:

May 21, 2012, 7:22:27 PM (12 years ago)

Author:

Borja Lopez <borja@…>

Branch:

default

Phase:

public

Message:

Added a postman-mta.conf version to be used in the tests

Added a script bin/postman-mta that will run the MTA client from a shell

Renamed the bin/postman_server script to bin/postman-server

Disabled the tests from tests/mta.py, as they are totally outdated and they
break the tests.

Replaced the old code in mta.Sendmail with a new mta.MTAClient class, which
contains code that actually *works* against a postman server (tests to come!)

Restructured the postman-mta.conf configuration file. The sections have better
names now (server, archive) and the archive section contains parameters which
names that reflect much better what they are used for.

Added a new parameter to the postman-mta.conf file (server.uri) that allows
us to set the uri to where any MTA client will have to connect, in only one
shorter line.

Fixed some typos in postman.config

Updated the setup.py script so the bin/postman-* scripts are installed
properly in the bin/ directory.

Added a function, proper_etc_path(), to the setup.py script so the path where
configuration files have to be installed is correctly set when building a
distribution/source package (still to be tested).

Updated the MANIFEST

File:

• postman/mta.py (modified) (4 diffs)

postman/mta.py

@@ -11 +11 @@
 """
 
-import sys, email, smtplib
+import os, sys, email, smtplib, xmlrpclib
 from datetime import datetime
-from models import MailingList
-import config
+from postman.models import MailingList
+from postman.config import MTAClientConfig
+from postman.tools import validate_email_address
 
-class Sendmail():
+class MTAClient():
     
-    def __init__(self, mailing_list=None, configfile=None):
-        if not isinstance(mailing_list, MailingList):
-            raise ValueError(mailing_list, ' is not a valid mailing list')
-        self.mailing_list = mailing_list
-        self.suscriptors = self.mailing_list.members_addresses
-        self.reply_to = self.mailing_list.address
+    def __init__(self, address=None, configfile=None):
+        if not validate_email_address(address):
+            raise ValueError(address, ' is not a valid email address')
+
+        mta_config = MTAClientConfig()
+        mta_config.load()
+        self.config = mta_config.config
+        self.rpc = xmlrpclib.ServerProxy(self.config['server']['uri'])
+        self.address = self._validate_address(address)
+        self.suscriptors = self.rpc.members.list(address)
+        self.reply_to = self.address
         self.raw_email = None
         self.queue = []
-        self.archive_config = config.get_config_parameters('archive',
-                                                           configfile)
+
+    def _validate_archive_path(self):
+        """
+        Validate that the archive path exists. If not, try to create it
+        """
+        if not os.path.exists(self.config['archive']['path']):
+            # FIXME: This will raise an IOError if the user has no
+            # privileges to create the directory, perhaps we should catch
+            # that and show an error instead
+            os.makedirs(self.config['archive']['path'])
+        return True        
         
-    def get_raw_email(self):
-        try:        
-            self.raw_email = sys.stdin.read()
-        except:
-            raise IOError('Can not get a valid email from stdin')
+    def _validate_address(self, address=None):
+        """
+        The address provided by the user will be valid only if it is a
+        valid email address and if it is the email address of an already
+        existing mailing list
+        """
+        if not validate_email_address(address):
+            raise ValueError(address, ' is not a valid email address')
+        if not address in self.rpc.lists.addresses():
+            raise ValueError(address,
+                             ' is not the address of any existing mailing list')
+        # If it is valid, return it
+        return address
+    
+    def get_raw_email(self, raw_email=None):
+        """
+        get the raw data containing email information. If raw_email is None,
+        try to get the data from stdin
+        """
+        if not raw_email:
+            try:
+                self.raw_email = sys.stdin.read()
+            except:
+                raise IOError('Can not get a valid email from stdin')
+        else:
+            self.raw_email = raw_email
+        # FIXME: We should perform some checks on the raw data, ensuring
+        # it is a valid email text
         return self.raw_email
 
@@ -40 +78 @@
             # FIXME: perhaps a while loop here, with some maximum recursion
             # check, would be nice here
-            self.get_raw_email
-        filename = os.path.join(self.archive_config['path'],
+            self.get_raw_email()
+        # Check the path to the archive exists
+        self._validate_archive_path()
+        filename = os.path.join(self.config['archive']['path'],
                                 datetime.today().strftime('%Y%d%m%H%M%S%f'))
         tmpfile = file(filename, 'w')
@@ -49 +89 @@
 
     def send_email(self):
+        """
+        Send emails from the queue, if there is any
+        """
         if self.queue:
             next_email = self.queue.pop()
@@ -54 +97 @@
             email_data = email.message_from_file(email_file)
             email_file.close()
-
             email_data['Reply-to'] = self.reply_to
-
-            smtp_conn = smtplib.SMTP()
-            smtp_conn.connect()
-            smtp_conn.sendmail(email_data['From'], self.suscriptors,
-                               email_data.as_string())
-            smtp_conn.close()
+            print 'SENDING EMAIL:'
+            print email_data
+            #smtp_conn = smtplib.SMTP()
+            #smtp_conn.connect()
+            #smtp_conn.sendmail(email_data['From'], self.suscriptors,
+            #                   email_data.as_string())
+            #smtp_conn.close()
+            # FIXME: enable tmp data removal here:
+            # if not self.config['archive']['persistent']:
+            #     REMOVE THE FILE FROM DISK
 
     def run(self):
-        self.get_raw_email()
         self.save_raw_email()
         self.send_email()