mais correcoes de bugs no ppsmtpd.py, @todo - processar mensagens > 4k

Author: Leandro Mendes

__main__.py

@@ -4,24 +4,27 @@
 from PPFilter import *
 import syslog, os, sys, pwd
 import ppsmtpd, socket
-import threading
+import threading, signal
 
 syslog.openlog('ppfilter', syslog.LOG_PID|syslog.LOG_NOWAIT, syslog.LOG_MAIL)
 
+def handler(signum, frame):
+    print 'recebido'
+
 class NonRootException(Exception):
     pass
 
 class SMTPD(ppsmtpd.SMTPServer):
 
     message  = None
 
-    def process_message(self, mail_from, rcpts_to, message):
+    def process_message(self, mail_from, rcpts_to, message_data):
 
-        self.message = message 
+        self.message_data = message_data
         filepath = None
 
         try:
-            self.message = {'mailfrom': mail_from, 'rcpts': rcpts_to, 'data': message}
+            self.message = {'mailfrom': mail_from, 'rcpts': rcpts_to, 'data': message_data}
             filepath = enqueuer.enqueue(self.message)
             if filepath != None:
                 sc = default.DefaultFilter(filepath)
@@ -38,13 +41,13 @@ def process_message(self, mail_from, rcpts_to, message):
             return        
 
         except scanner.ContentFilterSpamException, e:
-            if spam_final_action == "tag":
+            if config.spam_final_action == "tag":
                 msg = message.Message(filepath)
                 eml = msg.get_message()
                 eml.add_header("X-Spam-Status", "Spam, score: %s" % (e) )
                 msg.write_message()
                 self.send_back(filepath)
-            elif spam_final_action == "discard":
+            elif config.spam_final_action == "discard":
                 pass
 
     def send_back(self, filepath):

ppfilter

@@ -3,4 +3,4 @@
 PWD=$(pwd)
 export PYTHONPATH=".:${PWD}/lib"
 
-python teste.py
+python .

ppsmtpd.py

@@ -1,9 +1,9 @@
 import socket
-import signal
 import SocketServer
 import threading
 import sys
 import re
+import signal
 
 class SMTPServer(SocketServer.ThreadingMixIn, SocketServer.TCPServer):
 
@@ -13,57 +13,86 @@ def process_message(self, mail_from, rcpts_to, message):
 class SMTPRequestHandler(SocketServer.BaseRequestHandler):
 
     read_data = False
-    helo_host = 
-    mail_from = 
+    helo_host = None
+    mail_from = None
     rcpts_to = []
-    message = 
+    message = None
     hostname = socket.gethostname()
     message = ''
 
     def handle(self):
-        while True:
-            try:
-                if (self.read_data or self.request):
+        try:
+            self.f_socket = self.request.makefile()
+            self.send_data("220 %s PPFilter ESMTP" % (self.hostname) )
+            while True:
+                if self.read_data:
+                    self.data = self.request.recv(4096)
+                    print self.data + '*'
+                    for text in self.data.split('\r\n'):
+                        if text and text[0] == '.':
+                            self.data = 'DOT'
+                        else:
+                            self.message += text + "\r\n"
+                        
+                   # if re.match('^\.$', self.data.strip()):
+                   #     self.data = 'DOT'
+                    self.parse_commands()
+
+                else:
                     self.data = self.request.recv(1024)
-                    if self.parse_commands():
-                        pass
-            except AttributeError:
-                self.request.send('500 Unknown command\r\n')
-            except Exception:
-                pass
+                    print self.data + '*'
+                    self.parse_commands()
+                
+        finally:
+            self.request.close()
+#        except AttributeError:
+#            self.request.send('500 Unknown command\r\n')
+#        except Exception:
+#            pass
+
+    def send_data(self, data):
+        print data
+        self.request.send(data + "\r\n")
+        self.f_socket.flush()
 
     def parse_commands(self):
         cmd = []
         cmd = self.data.split(' ')
         if (len(cmd) < 2):
             cmd[0] = self.data.strip()
-        print len(cmd)
+
         method = (('self.smtp_' + cmd[0].upper().strip()) + '()')
+        print method
         eval(method)
 
     def smtp_MAIL(self):
         self.mail_from = self.data.split(':')[1].strip()
-        self.request.send('250 Ok\r\n')
+        self.send_data('250 Ok')
 
+    def smtp_EHLO(self):
+        self.smtp_HELO()
 
     def smtp_HELO(self):
         self.helo_host = self.data.split(' ')[1].strip()
-        self.request.send(('250 %s\r\n' % self.hostname))
+        self.send_data(("250 %s" % self.hostname))
 
     def smtp_QUIT(self):
-        self.request.send('221 Bye\r\n')
+        self.send_data('221 Bye')
         self.request.close()
 
     def smtp_DOT(self):
         response = self.server.process_message(self.mail_from, self.rcpts_to, self.message)
-        if ((type(response).__name__ == 'str') and self.request.send((response + '\r\n'))):
-            pass
+        if type(response).__name__ == 'str':
+            self.send_data((response))
+        else:
+            self.send_data('250 Ok')
         self.read_data = False
 
     def smtp_RCPT(self):
         self.rcpts_to.append(self.data.split(':')[1].strip())
-        self.request.send('250 Ok\r\n')
+        self.send_data('250 Ok')
 
     def smtp_DATA(self):
-        self.request.send("354 Start mail input; end with '.'\r\n")
+        print 'waiting for data'
+        self.send_data("354 Start mail input; end with '.'")
         self.read_data = True