Skip to content

Z
Zope
Commit 41d13927 authored by Jeffrey Shell's avatar Jeffrey Shell
Browse files
Options

added new decapitate method to handle some strange errors in some messages 

got new interface up to specs:
parent 030628e5
Hide whitespace changes
Inline Side-by-side
Showing with 189 additions and 215 deletions
lib/python/Products/MailHost/MailHost.py
View file @ 41d13927
......@@ -2,233 +2,207 @@ from Globals import Persistent, HTMLFile, HTML
from socket import *
import Acquisition, sys, regex, string
#$Id: MailHost.py,v 1.2 1997/09/09 21:33:41 jeffrey Exp $
__version__ = "$Revision: 1.2 $"[11:-2]
#$Id: MailHost.py,v 1.3 1997/09/10 15:05:35 jeffrey Exp $
__version__ = "$Revision: 1.3 $"[11:-2]
smtpError = "SMTP Error"
MailHostError = "MailHost Error"
addForm=HTMLFile('MailHost/addMailHost_form')
def add(self, id='aMailHost', title='Some mail thing', smtp_host=None,
localhost='localhost', smtp_port=25, REQUEST):
' add a MailHost into the system '
i=MailHost() #create new mail host
i.id=id #give it id
i.title=title #title
i._init(localHost=localhost, smtpHost=smtp_host, smtpPort=smtp_port)
self._setObject(id,i) #register it
return self.manage_main(self,REQUEST) #and whatever this does.. :)
localhost='localhost', smtp_port=25, REQUEST):
' add a MailHost into the system '
i=MailHost() #create new mail host
i.id=id #give it id
i.title=title #title
i._init(localHost=localhost, smtpHost=smtp_host, smtpPort=smtp_port)
self._setObject(id,i) #register it
return self.manage_main(self,REQUEST) #and whatever this does.. :)
class MailHost(Persistent, Acquisition.Implicit):
'a mailhost...?'
manage=HTMLFile('MailHost/manageMailHost')
index_html=HTMLFile('MailHost/mailHost')
icon="MailHost/MailHost_icon.gif"
def __init__(self):
'nothing yet'
pass
def _init(self, localHost, smtpHost, smtpPort):
self.localHost=localHost
self.smtpHost=smtpHost
self.smtpPort=smtpPort
self.sentMessages=0
def manage_makeChanges(self, title, localHost, smtpHost, smtpPort):
'make the changes'
self.title=title
self.localHost=localHost
self.smtpHost=smtpHost
self.smtpPort=smtpPort
return self.manage(self,REQUEST)
def __log(self):
self.sentMessages=self.sentMessages + 1
def sendTemplate(trueself, self, messageTemplate,
statusTemplate=None, mto=None, mfrom=None, REQUEST):
'render a mail template, then send it...'
mtemplate = getattr(self, messageTemplate)
messageText = mtemplate(self, trueself.REQUEST)
headers, message = decapitate(messageText)
if mto: headers['to'] = mto
if mfrom: headers['from'] = mfrom
for requiredHeader in ('to', 'from', 'subject'):
if not headers.has_key(requiredHeader):
raise MailHostError,"Message missing SMTP Header '%s'"\
% requiredHeader
SendMail(trueself.smtpHost, trueself.smtpPort,
trueself.localHost).send(
mfrom=headers['from'], mto=headers['to'],
subj=headers['subject'], body=messageText
)
self.__log()
return ("sent","sent...")
#return getattr(self,statusTemplate)(self, self.REQUEST,
# messageText=message)
def send(self, messageText, mto=None, mfrom=None):
'send a rendered message'
headers, message = decapitate(messageText)
if mto: headers['to'] = mto
if mfrom: headers['from'] = mfrom
for requiredHeader in ('to', 'from', 'subject'):
if not headers.has_key(requiredHeader):
raise MailHostError,"Message missing SMTP Header '%s'"\
% requiredHeader
SendMail(self.smtpHost, self.smtpPort, self.localHost).send(
mfrom=headers['from'], mto=headers['to'],
subj=headers['subject'], body=messageText)
self.__log()
return ("sent","sent...")
#return getattr(self,statusTemplate)(self, self.REQUEST,
# messageText=message)
def simple_send(self, mto, mfrom, subject, body):
'like the simplist send or something'
body="subject: %s\n\n%s" % (subject, body)
SendMail(self.smtpHost, self.smtpPort, self.localHost).send(
mfrom=mfrom, mto=mto, subj=subject, body=body)
self.__log()
return ("sent","sent...")
# def send(trueself, self):
# 'uhh, sponges off the request and mails it..?'
# if trueself.REQUEST.has_key('d_template'):
# mtemplate = getattr(self, trueself.REQUEST['d_template'])
# else:
# mtemplate = getattr(self, trueself.mailTemplate)
# messageText = mtemplate(self, trueself.REQUEST)
# headers, message = decapitate(messageText)
# for requiredHeader in ('to', 'from', 'subject'):
# if not headers.has_key(requiredHeader):
# raise MailHostError, "Message missing SMTP Header '%s'" \
# % requiredHeader
#
# SendMail(trueself.smtpHost, trueself.smtpPort,
# trueself.localHost).send(
# mfrom=headers['from'], mto=headers['to'],
# subj=headers['subject'], body=messageText
# )
#
# return getattr(self,self.sentMailTemplate)(self, self.REQUEST,
# messageText=message)
#
# def trueSend(trueself, self=None, REQUEST=None, **kw):
# if REQUEST: kw=REQUEST
# if self == None: self=trueself
# if kw.has_key('d_template'):
# mtemplate = getattr(self, kw['d_template'])
# else:
# mtemplate = getattr(self, trueself.mailTemplate)
# messageText = mtemplate(self, kw)
# headers, message = decapitate(messageText)
# for requiredHeader in ('to', 'from', 'subject'):
# if not headers.has_key(requiredHeader):
# raise MailHostError, "Message missing SMTP Header '%s'" \
# % requiredHeader
#
# SendMail(trueself.smtpHost, trueself.smtpPort,
# trueself.localHost).send(
# mfrom=headers['from'], mto=headers['to'],
# subj=headers['subject'], body=messageText
# )
#
# return getattr(trueself,trueself.sentMailTemplate)(self, kw,
# messageText=message)
class SendMail:
def __init__(self, smtpHost, smtpPort, localHost="localhost"):
self.conn = socket(AF_INET, SOCK_STREAM)
self.conn.connect(smtpHost, smtpPort)
self.conn.send("helo "+localHost+"\r\n")
self._check('220')
def __del__(self):
self.close()
def _check(self, lev='250'):
data = self.conn.recv(1024)
if data[:3] != lev:
raise smtpError, "Expected %s, got %s from SMTP"%(lev, data[:3])
def send(self, mfrom, mto, subj, body):
self.conn.send("mail from:<%s>\n"%mfrom)
self._check()
if type(mto) == type([1,2]):
for person in mto:
self.conn.send("rcpt to:<%s>\n" % person)
self._check()
else:
self.conn.send("rcpt to:<%s>\n"%mto)
self._check()
self.conn.send("data\n")
self._check()
self.conn.send(body)
self.conn.send("\n.\n")
self._check('354')
def _close(self):
self.conn.send("quit\n")
self.conn.close()
'a mailhost...?'
manage=HTMLFile('MailHost/manageMailHost')
index_html=HTMLFile('MailHost/mailHost')
icon="MailHost/MailHost_icon.gif"
def __init__(self):
'nothing yet'
pass
def _init(self, localHost, smtpHost, smtpPort):
self.localHost=localHost
self.smtpHost=smtpHost
self.smtpPort=smtpPort
self.sentMessages=0
def manage_makeChanges(self, title, localHost, smtpHost, smtpPort):
'make the changes'
self.title=title
self.localHost=localHost
self.smtpHost=smtpHost
self.smtpPort=smtpPort
return self.manage(self,REQUEST)
def __log(self):
self.sentMessages=self.sentMessages + 1
def sendTemplate(trueself, self, messageTemplate,
statusTemplate=None, mto=None, mfrom=None, REQUEST):
'render a mail template, then send it...'
mtemplate = getattr(self, messageTemplate)
messageText = mtemplate(self, trueself.REQUEST)
headers, message = newDecapitate(messageText)
if mto: headers['to'] = mto
if mfrom: headers['from'] = mfrom
for requiredHeader in ('to', 'from', 'subject'):
if not headers.has_key(requiredHeader):
raise MailHostError,"Message missing SMTP Header '%s'"\
% requiredHeader
SendMail(trueself.smtpHost, trueself.smtpPort,
trueself.localHost).send(
mfrom=headers['from'], mto=headers['to'],
subj=headers['subject'], body=messageText
)
self.__log()
return ("sent","sent...")
#return getattr(self,statusTemplate)(self, self.REQUEST,
# messageText=message)
def send(self, messageText, mto=None, mfrom=None):
'send a rendered message'
headers, message = newDecapitate(messageText)
if mto: headers['to'] = mto
if mfrom: headers['from'] = mfrom
for requiredHeader in ('to', 'from', 'subject'):
if not headers.has_key(requiredHeader):
raise MailHostError,"Message missing SMTP Header '%s'"\
% requiredHeader
SendMail(self.smtpHost, self.smtpPort, self.localHost).send(
mfrom=headers['from'], mto=headers['to'],
subj=headers['subject'], body=messageText)
self.__log()
return ("sent","sent...")
#return getattr(self,statusTemplate)(self, self.REQUEST,
# messageText=message)
def simple_send(self, mto, mfrom, subject, body):
'like the simplist send or something'
body="subject: %s\n\n%s" % (subject, body)
SendMail(self.smtpHost, self.smtpPort, self.localHost).send(
mfrom=mfrom, mto=mto, subj=subject, body=body)
self.__log()
return ("sent","sent...")
class SendMail:
def __init__(self, smtpHost, smtpPort, localHost="localhost"):
self.conn = socket(AF_INET, SOCK_STREAM)
self.conn.connect(smtpHost, smtpPort)
self.conn.send("helo "+localHost+"\r\n")
self._check('220')
def __del__(self):
self.close()
def _check(self, lev='250'):
data = self.conn.recv(1024)
if data[:3] != lev:
raise smtpError, "Expected %s, got %s from SMTP"%(lev, data[:3])
def send(self, mfrom, mto, subj, body):
self.conn.send("mail from:<%s>\n"%mfrom)
self._check()
if type(mto) == type([1,2]):
for person in mto:
self.conn.send("rcpt to:<%s>\n" % person)
self._check()
else:
self.conn.send("rcpt to:<%s>\n"%mto)
self._check()
self.conn.send("data\n")
self._check()
self.conn.send(body)
self.conn.send("\n.\n")
self._check('354')
def _close(self):
self.conn.send("quit\n")
self.conn.close()
def newDecapitate(message):
blank_re =regex.compile('^[%s]+$' % string.whitespace)
header_re=regex.symcomp('^\(<headerName>[^\0- <>:]+\):\(<headerText>.*\)$')
linecount=0; headerDict={}
maxwell=map(lambda x: string.strip(x),string.split(message,'\n'))
for line in maxwell:
if not line: break
if blank_re.match(line) >= 0: break
if header_re.match(line) >=0:
headerDict[string.lower(header_re.group('headerName'))] =\
string.strip(header_re.group('headerText'))
linecount=linecount+1
body=string.join(maxwell[linecount:],'\n')
return headerDict, body
def decapitate(message,
header_re=regex.compile(
'\(\('
'[^\0- <>:]+:[^\n]*\n'
'\|'
'[ \t]+[^\0- ][^\n]*\n'
'\)+\)[ \t]*\n\([\0-\377]+\)'
),
space_re=regex.compile('\([ \t]+\)'),
name_re=regex.compile('\([^\0- <>:]+\):\([^\n]*\)'),
):
if header_re.match(message) < 0: return message
headers, body = header_re.group(1,3)
headers=string.split(headers,'\n')
headerDict={}
i=1
while i < len(headers):
if not headers[i]:
del headers[i]
elif space_re.match(headers[i]) >= 0:
headers[i-1]="%s %s" % (headers[i-1],
headers[i][len(space_re.group(1)):])
del headers[i]
else:
i=i+1
for i in range(len(headers)):
if name_re.match(headers[i]) >= 0:
k, v = name_re.group(1,2)
k=string.lower(k); v=string.strip(v)
headerDict[k]=v
else:
raise ValueError, 'Invalid Header (%d): %s ' % (i,headers[i])
if headerDict.has_key('to'):
headerDict['to']=map(
lambda x: string.strip(x),
string.split(headerDict['to'], ',')
)
return headerDict, body
header_re=regex.compile(
'\(\('
'[^\0- <>:]+:[^\n]*\n'
'\|'
'[ \t]+[^\0- ][^\n]*\n'
'\)+\)[ \t]*\n\([\0-\377]+\)'
),
#r'(([^\0- <>:]+:[^\n]*\n|[ \t]+[^\0- ][^\n]*\n)+)[ \t]*\n([\0-\377]+)'
space_re=regex.compile('\([ \t]+\)'),
name_re=regex.compile('\([^\0- <>:]+\):\([^\n]*\)'),
):
if header_re.match(message) < 0: return message
headers, body = header_re.group(1,3)
headers=string.split(headers,'\n')
headerDict={}
i=1
while i < len(headers):
if not headers[i]:
del headers[i]
elif space_re.match(headers[i]) >= 0:
headers[i-1]="%s %s" % (headers[i-1],
headers[i][len(space_re.group(1)):])
del headers[i]
else:
i=i+1
for i in range(len(headers)):
if name_re.match(headers[i]) >= 0:
k, v = name_re.group(1,2)
k=string.lower(k); v=string.strip(v)
headerDict[k]=v
else:
raise ValueError, 'Invalid Header (%d): %s ' % (i,headers[i])
if headerDict.has_key('to'):
headerDict['to']=map(
lambda x: string.strip(x),
string.split(headerDict['to'], ',')
)
return (headerDict, body)
#$Log: MailHost.py,v $
#Revision 1.2 1997/09/09 21:33:41 jeffrey
#New send features _somewhat_ working. simple_send works (litely),
#sentTemplate works, but does not (yet) completely overthrow the to: from:
#headers...
#Revision 1.3 1997/09/10 15:05:35 jeffrey
#added new decapitate method to handle some strange errors in some messages
#
#got new interface up to specs:
#
#Revision 1.1 1997/09/09 20:50:29 jeffrey
#Revision 1.1 1997/09/09 20:50:29 jeffrey
#Managed changing of names.
#
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7