Changeset 28

Timestamp:

10/13/09 18:32:35 (1 month ago)

Author:

oriol

Message:

beta1 of learn_recipients it can be a release candidate in next days

Location:

src/trunk/frontend/learn_recipients

Files:

• .settings/org.eclipse.core.resources.prefs (modified) (1 diff)
• learn_recipients.tac.py (modified) (5 diffs)
• learn_recipients.tac.py.bak (copied) (copied from src/trunk/frontend/learn_recipients/learn_recipients.tac.py)
• smtplib2.py (added)

src/trunk/frontend/learn_recipients/.settings/org.eclipse.core.resources.prefs

@@ -1 @@
-#Mon Oct 05 16:30:05 CEST 2009
+#Tue Oct 13 18:32:30 CEST 2009
 eclipse.preferences.version=1
 encoding/learn_recipients.tac.py=iso-8859-15
+encoding/learn_recipients.tac.py.bak=iso-8859-15

src/trunk/frontend/learn_recipients/learn_recipients.tac.py

@@ -5 +5 @@
 # (cc) Oriol Rius, 20090716
 #
-# Descripció:
-#   Rep peticions de verificació d'existÚncia d'email des del postfix, el primer que fa és 
+# Descripció:
+#   Rep peticions de verificació d'existÚncia d'email des del postfix, el primer que fa és 
 #  comprovar si existeix la compte de correu que demana l'usuari a la bbdd, si existeix tornem un ok.
-#   En cas contrari, demana al 'transport services' quin és el servidor SMTP que rep aquestes 
+#   En cas contrari, demana al 'transport services' quin és el servidor SMTP que rep aquestes 
 #  peticions llavors es connecta al servidor i comprova si existeix la compte de correu. El resultat
-#  el reporta a la connexió original que s'ha rebut.
-#   Tal com esta configurat el postfix, només s'haurien de rebre validacions d'emails d'usuaris que
+#  el reporta a la connexió original que s'ha rebut.
+#   Tal com esta configurat el postfix, només s'haurien de rebre validacions d'emails d'usuaris que
 #  pertanyen a dominis on es fa relay.
 #   Amb aquest servei s'aconsegueix tenir un sistema de 'cache' dels usuaris locals.
 #   
 #
-
+import sys 
+sys.path.append('./')
 from zope.interface import implements
 from twisted.application import service
 application = service.Application("SMTP Proxy")
 from twisted.application import internet
-from twisted.internet import protocol, defer
+from twisted.internet import protocol, defer, threads, reactor
 from twisted.mail import smtp
-import logging,tempfile,os,smtplib,popen2
+import logging,tempfile,os,smtplib2,popen2
 import MySQLdb,time
+from twisted.internet.protocol import Protocol, Factory
 
 # Configuration
 HOST='127.0.0.1'
-PORT=25004
+PORT=25010
 TTL=30*24*60*60 # 1month to expire
 DSPAM="dspam"
@@ -35 +37 @@
 bot_buffer='/tmp/buffer.bot'
 DRY_MODE=False
+#control de threads
+fils = 0
+#control de conneccions
+connections = 0
+
 
 # Logs
@@ -66 +73 @@
     #    return True
     logging.debug("verify_user: "+HOST+":"+str(PORT)+" - "+DOMAIN+" -f:"+SUSER+"-d:"+DUSER)
-    s=smtplib.SMTP()
-    try:
-        resp=s.connect(HOST,PORT)
-    except:
+    intent=1
+    surt=False
+    while intent < 3 and surt is not True:
+        try:
+            s=smtplib2.SMTP()
+            resp=s.connect(HOST,PORT)
+            surt=True
+        except:
+            intent=intent+1
+            logging.error('verify_user: #'+str(intent)+' trying to connect to:'+HOST+":"+str(PORT))
+            #time.sleep(0.5)
+    if surt is False:
+        logging.error('verify_user: cannot connect to:'+HOST+":"+str(PORT))
         return False
     if (resp[0]!=220):
+        logging.error('verify_user: after conntect to:'+HOST+":"+str(PORT)+' no recieved 220 resp')
         return False
     s.set_debuglevel(0)
@@ -77 +94 @@
         resp=s.docmd("ehlo "+DOMAIN)
     except:
+        logging.error('verify_user: after conntect to:'+HOST+":"+str(PORT)+' error sending "ehlo" command')
         return False
     if (resp[0]!=250):
+        logging.error('verify_user: after conntect to:'+HOST+":"+str(PORT)+' error waiting 250 resp after "ehlo" command')
         return False
     try:
         resp=s.docmd("mail from:<"+SUSER+">")
     except:
+        logging.error('verify_user: after conntect to:'+HOST+":"+str(PORT)+' error sending "mail from" command')        
         return False
     if (resp[0]!=250):
+        logging.error('verify_user: after conntect to:'+HOST+":"+str(PORT)+' error waiting 250 resp after "mail from" command')
         return False
     try:
         resp=s.docmd("rcpt to:<"+DUSER+">")
     except:
+        logging.error('verify_user: after conntect to:'+HOST+":"+str(PORT)+' error sending "rcpt to" command')
         return False
     logging.debug("debug_vrfy_sender:"+str(resp))
     if (resp[0]!=250):
+        #logging.error('verify_user: after conntect to:'+HOST+":"+str(PORT)+' error waiting 250 resp "rcpt to" command')
         return False
     try:
         s.docmd("quit")
     except:
-        return False
+        pass
     return True
 
@@ -137 +160 @@
     logging.info("---end")
 
-# SMTP server
-class SmtpDelivery(object):
-    implements(smtp.IMessageDelivery)
-
-    def validateTo(self, user):
-        global cursor
-        user = str(user).strip("'")
-        # preguntem a la bbdd
-        marca_inici = time.time()
-        logging.info('*** verifying: '+str(user)+" ***")
-        query = "SELECT uid,ts,locked FROM dspam_virtual_uids WHERE username = '"+str(user)+"'"
-        logging.debug(query)
-        try:
-            cursor.execute (query)
-        except:
-            logging.error("query: "+str(query))
-            bot("learn_recipients: error: query: "+str(query))
-            logging.info('return '+str(user)+'  code=450')
-            calcul_temps(marca_inici)                
-            raise smtp.SMTPBadRcpt('code=450')            
-        out = cursor.fetchall()
-        logging.debug(str(out))
-        if len(out) > 0:
-            ts = out[0][1]
-            locked = out[0][2]
-            if ts == None:
-                locked = True
-            if locked or time.mktime(ts.timetuple()) > time.time()-TTL:
-                # correu existeix, validat!
-                logging.info("Validate: "+str(user)+" Ok!")
-                if out[0][2] == False:
-                    # actualitzem TS
-                    query = "UPDATE dspam_virtual_uids SET ts = now() WHERE uid = "+str(out[0][0])
-                    logging.debug(query)
-                    if not DRY_MODE: cursor.execute (query)
-                calcul_temps(marca_inici)
-                logging.info('return '+str(user)+' code=250')
-                return
-        # obtenim servidor smtp on hem de validar el correu
-        smtp_server = run_cmd("postmap -q "+str(user)+" tcp:91.121.104.91:25403")
-        logging.debug(smtp_server)
-        try:
-            # parsegem sortida
-            camps=smtp_server[0].split(':')
-            if camps[1][0] == '[':
-                server=camps[1][1:-1]
-            else:
-                server=camps[1]
-            port=camps[2][:-1]
-            logging.debug("Transport server: "+str(server)+":"+str(port))
-        except:
-            if smtp_server == 'smtp':
-                # borrem correu de la bbdd, no hi és?!?!?!?
-                if len(out)>0:
-                    uid=out[0][0]
-                    borrar_email(uid,user,cursor)
-                else:
-                    logging.error("Error: cannot delete from database: "+str(user))
-                logging.info('return '+str(user)+'  code=550')
-                calcul_temps(marca_inici)
-                raise smtp.SMTPBadRcpt('code=550')
-            else:
-                # timeout o no s'ha pogut aconseguir la info
-                logging.info('return '+str(user)+'  code=450')
-                calcul_temps(marca_inici)                
-                raise smtp.SMTPBadRcpt('code=450')
-        # preguntem al servidor smtp si existeix el correu
-        if verify_user(server,port,str(str(user).split('@')[1]),str(self.email_source),str(user)):
-            # afegim email a la bbdd o actualitzem ts
-            logging.debug('Update TS or Insert in database of: '+str(user))
-            query = "UPDATE dspam_virtual_uids SET ts = now() WHERE username = '"+str(user)+"'"
-            logging.debug(query)
-            if not DRY_MODE: 
-                canviat=cursor.execute (query)
-                if canviat == 0:
-                    # no existeix a la bbdd el donem d'alta
-                    query="INSERT INTO dspam_virtual_uids SET username='"+str(user)+"', ts=NOW()"
-                    try:
-                        canviat=cursor.execute (query)
-                    except:
-                        logging.error('ERROR: '+query)
-        else:
-            # borrem email de la bbdd
+
+def validTo(user):
+    global fils,connections
+    fils = fils + 1
+    conn = MySQLdb.connect ("87.98.228.217","dspam","ges2ges","dspam")
+    cursor = conn.cursor ()
+    user = str(user).strip("'")
+    # preguntem a la bbdd
+    marca_inici = time.time()
+    logging.info('validTo: instanced in conn #'+str(connections)+' thread#'+str(fils))
+    logging.info('*** verifying: '+str(user)+" ***")
+    query = "SELECT uid,ts,locked FROM dspam_virtual_uids WHERE username = '"+str(user)+"'"
+    logging.debug(query)
+    try:
+        cursor.execute (query)
+    except:
+        logging.error("query: "+str(query))
+        bot("learn_recipients: error: query: "+str(query))
+        logging.info('return '+str(user)+'  code=450')
+        calcul_temps(marca_inici)   
+        conn.close()             
+        return "450"            
+    out = cursor.fetchall()
+    logging.debug(str(out))
+    if len(out) > 0:
+        ts = out[0][1]
+        locked = out[0][2]
+        if ts == None:
+            locked = True
+        if locked or time.mktime(ts.timetuple()) > time.time()-TTL:
+            # correu existeix, validat!
+            logging.info("Validate: "+str(user)+" Ok!")
+            if out[0][2] == False:
+                # actualitzem TS
+                query = "UPDATE dspam_virtual_uids SET ts = now() WHERE uid = "+str(out[0][0])
+                logging.debug(query)
+                if not DRY_MODE: cursor.execute (query)
+            calcul_temps(marca_inici)
+            logging.info('return '+str(user)+' code=250')
+            conn.close()
+            return "250"
+    # obtenim servidor smtp on hem de validar el correu
+    smtp_server = run_cmd("postmap -q "+str(user)+" tcp:91.121.104.91:25403")
+    logging.debug(smtp_server)
+    try:
+        # parsegem sortida
+        camps=smtp_server[0].split(':')
+        if camps[1][0] == '[':
+            server=camps[1][1:-1]
+        else:
+            server=camps[1]
+        port=camps[2][:-1]
+        logging.debug("Transport server: "+str(server)+":"+str(port))
+    except:
+        if smtp_server == 'smtp':
+            # borrem correu de la bbdd, no hi és?!?!?!?
             if len(out)>0:
-                uid=out[0][0]                
+                uid=out[0][0]
                 borrar_email(uid,user,cursor)
             else:
-                logging.debug("Not exist in recipient server: "+str(user))
+                logging.error("Error: cannot delete from database: "+str(user))
+            logging.info('return '+str(user)+'  code=550')
             calcul_temps(marca_inici)
-            logging.info('return '+str(user)+'  code=550')                
-            raise smtp.SMTPBadRcpt('code=550')
+            conn.close()
+            return "550"
+        else:
+            # timeout o no s'ha pogut aconseguir la info
+            logging.info('return '+str(user)+'  code=450')
+            calcul_temps(marca_inici) 
+            conn.close()               
+            return "450"
+    # preguntem al servidor smtp si existeix el correu
+    if verify_user(server,port,str(str(user).split('@')[1]),'verifysender@lana2.com',str(user)):
+        # afegim email a la bbdd o actualitzem ts
+        logging.debug('Update TS or Insert in database of: '+str(user))
+        query = "UPDATE dspam_virtual_uids SET ts = now() WHERE username = '"+str(user)+"'"
+        logging.debug(query)
+        if not DRY_MODE: 
+            canviat=cursor.execute (query)
+            if canviat == 0:
+                # no existeix a la bbdd el donem d'alta
+                query="INSERT INTO dspam_virtual_uids SET username='"+str(user)+"', ts=NOW()"
+                try:
+                    canviat=cursor.execute (query)
+                except:
+                    logging.error('ERROR:'+query)
+    else:
+        # borrem email de la bbdd
+        if len(out)>0:
+            uid=out[0][0]                
+            borrar_email(uid,user,cursor)
+        else:
+            logging.debug("Not exist in recipient server: "+str(user))
         calcul_temps(marca_inici)
-        logging.info('*** return '+str(user)+' code=250 ***')           
-        return
-
-    def validateFrom(self, helo, origin):
-        self.email_source = origin
-        return origin
-
-    def receivedHeader(self, helo, origin, recipients):
-        return ''
-
-# SMTP factory
-class SmtpDeliveryFactory(object):
-    implements(smtp.IMessageDeliveryFactory)
-
-    def getMessageDelivery(self):
-        return SmtpDelivery()
-
-
-class ESMTPFactory(protocol.ServerFactory):
-    protocol = smtp.ESMTP
-
-    def buildProtocol(self, addr):
-        p = self.protocol()
-        p.deliveryFactory = SmtpDeliveryFactory()
-        p.factory = self
-        return p
+        logging.info('return '+str(user)+'  code=550')     
+        conn.close()           
+        return "550"
+    calcul_temps(marca_inici)
+    logging.info('*** return '+str(user)+' code=250 ***')   
+    conn.close()        
+    return "250"
+
+
+
+
+# myESTMP factory
+class myESTMP(Protocol):   
+    def connectionMade(self):
+        global connections
+        connections = connections +1
+        self.transport.write("220 active_connections#"+str(connections)+" threads#"+str(fils)+"\n")
+    
+    def dataReceived(self,dades):
+        #processar comanda
+        # usem la propietat 'wait' perquÚ no s'envii un resultat de comanda despres del rcpt
+        self.wait = False
+        for data in dades.split("\n"):
+            try:
+                cmd = data.split(' ')
+                cmd = cmd[0]
+            except:
+                try:
+                    cmd = data.split(':')
+                    cmd = cmd[0]
+                except:
+                    cmd = data
+            cmd=cmd.strip().lower()
+            if cmd is not '':
+                if cmd == 'rcpt':
+                    try:
+                        aux = data.split('<')
+                        aux = aux[1].split('>')
+                        email = aux[0]
+                    except:
+                        self._syntax_error()
+                        self._end()
+                    self.wait = True
+                    d = threads.deferToThread(validTo,email)
+                    d.addCallback(self._rcvd_cb)
+                    d.addErrback(self._rcvd_cb)                    
+                elif cmd == 'rset':
+                    self._rset()
+                elif cmd == 'quit':
+                    self._quit()
+                else:
+                    self._c250()
+
+    
+    def lostConnection(self,reason):
+        global connections 
+        connections = connections -1
+        
+    def _rcvd_cb(self,estat):
+        global fils
+        fils = fils -1
+        if estat == '250':
+            self._c250()
+        elif estat == '450':
+            self._c450()
+        else:
+            self._c550()
+        self.wait = False
+        
+
+    def _rset(self):
+        if self.wait:
+            reactor.callLater(0.1,self._rset)
+        else:
+            self._c250()
+            
+    def _quit(self):
+        if self.wait:
+            reactor.callLater(0.1,self._quit)
+        else:
+            self._end()
+            
+    def _c250(self):
+        self.transport.write('250'+"\n")    
+
+    def _c450(self):
+        self.transport.write('450'+"\n")
+
+    def _c550(self):
+        self.transport.write('550'+"\n")
+    
+    def _c502(self):
+        self.transport.write('502'+"\n")
+    
+    def _c501(self):
+        self.transport.write('501'+"\n")                
+        
+    def _end(self):
+        self.transport.write('221'+"\n")
+        self.transport.loseConnection()       
+        global connections 
+        connections = connections -1         
+    
+
+
+
+class ESMTPFactory(Factory):
+    protocol = myESTMP
 
 
 # connectem al servidor MySQL
-conn = MySQLdb.connect ("87.98.228.217","dspam","ges2ges","dspam")
-cursor = conn.cursor ()
+#conn = MySQLdb.connect ("87.98.228.217","dspam","ges2ges","dspam")
+#cursor = conn.cursor ()
 # launch SMTP server
 smtpServerService = internet.TCPServer(PORT, ESMTPFactory(), interface=HOST)