refactor elog mail stuff so it's reusable by other tools (like glsa-check)

svn path=/main/trunk/; revision=3484

2 files changed, 97 insertions, 57 deletions

diff --git a/pym/elog_modules/mod_mail.py b/pym/elog_modules/mod_mail.py
index cc67015f7..b8e17a51a 100644
--- a/pym/elog_modules/mod_mail.py
+++ b/pym/elog_modules/mod_mail.py
@@ -1,61 +1,22 @@
-import smtplib, email.Message, socket, portage_exception
+# portage.py -- core Portage functionality
+# Copyright 1998-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+import portage_mail, socket
 
 def process(mysettings, cpv, logentries, fulltext):
-	mymailhost = "localhost"
-	mymailport = 25
-	mymailuser = ""
-	mymailpasswd = ""
-	myrecipient = "root@localhost"
-	
-	# Syntax for PORTAGE_LOG_MAILURI (if defined):
-	# adress [[user:passwd@]mailserver[:port]]
-	# where adress:     recipient adress
-	#       user:       username for smtp auth (defaults to none)
-	#       passwd:     password for smtp auth (defaults to none)
-	#       mailserver: smtp server that should be used to deliver the mail (defaults to localhost)
-	#       port:       port to use on the given smtp server (defaults to 25, values > 100000 indicate that starttls should be used on (port-100000))
-	if " " in mysettings["PORTAGE_ELOG_MAILURI"]:
-		myrecipient, mymailuri = mysettings["PORTAGE_ELOG_MAILURI"].split()
-		if "@" in mymailuri:
-			myauthdata, myconndata = mymailuri.rsplit("@", 1)
-			try:
-				mymailuser,mymailpasswd = myauthdata.split(":")
-			except ValueError:
-				print "!!! invalid SMTP AUTH configuration, trying unauthenticated ..."
-		else:
-			myconndata = mymailuri
-		if ":" in myconndata:
-			mymailhost,mymailport = myconndata.split(":")
-		else:
-			mymailhost = myconndata
+	if mysettings.has_key("PORTAGE_ELOG_MAILURI"):
+		myrecipient = mysettings["PORTAGE_ELOG_MAILURI"].split()[0]
 	else:
-		myrecipient = mysettings["PORTAGE_ELOG_MAILURI"]
-	try:
-		myfrom = mysettings["PORTAGE_ELOG_MAILFROM"]
-		
-		mymessage = email.Message.Message()
-		mymessage.set_unixfrom(myfrom)
-		mymessage.set_payload(fulltext)
-		mymessage["To"] = myrecipient
-		mymessage["From"] = myfrom
-		
-		mysubject = mysettings["PORTAGE_ELOG_MAILSUBJECT"]
-		mysubject = mysubject.replace("${PACKAGE}", cpv)
-		mysubject = mysubject.replace("${HOST}", socket.getfqdn())
-		
-		mymessage["Subject"] = mysubject
-				
-		if int(mymailport) > 100000:
-			myconn = smtplib.SMTP(mymailhost, int(mymailport) - 100000)
-			myconn.starttls()
-		else:
-			myconn = smtplib.SMTP(mymailhost, mymailport)
-		if mymailuser != "" and mymailpasswd != "":
-			myconn.login(mymailuser, mymailpasswd)
-		myconn.sendmail(myfrom, myrecipient, mymessage.as_string())
-		myconn.quit()
-	except smtplib.SMTPException, e:
-		raise portage_exception.PortageException("!!! An error occured while trying to send logmail:\n"+str(e))
-	except socket.error, e:
-		raise portage_exception.PortageException("!!! A network error occured while trying to send logmail:\n"+str(e)+"\nSure you configured PORTAGE_ELOG_MAILURI correctly?")
+		myrecipient = "root@localhost"
+	
+	myfrom = mysettings["PORTAGE_ELOG_MAILFROM"]
+	mysubject = mysettings["PORTAGE_ELOG_MAILSUBJECT"]
+	mysubject = mysubject.replace("${PACKAGE}", cpv)
+	mysubject = mysubject.replace("${HOST}", socket.getfqdn())
+
+	mymessage = portage_mail.create_message(myfrom, myrecipient, mysubject, fulltext)
+	portage_mail.send_mail(mysettings, mymessage)
+
 	return
diff --git a/pym/portage_mail.py b/pym/portage_mail.py
new file mode 100644
index 000000000..9588ea210
--- /dev/null
+++ b/pym/portage_mail.py
@@ -0,0 +1,79 @@
+# portage.py -- core Portage functionality
+# Copyright 1998-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id: portage.py 3483 2006-06-10 21:40:40Z genone $
+
+import portage_exception, socket, smtplib
+from email.MIMEText import MIMEText as TextMessage
+from email.MIMEMultipart import MIMEMultipart as MultipartMessage
+from email.MIMEBase import MIMEBase as BaseMessage
+
+def create_message(sender, recipient, subject, body, attachments=None):
+	if attachments == None:
+		mymessage = TextMessage(body)
+	else:
+		mymessage = MultipartMessage()
+		mymessage.attach(TextMessage(body))
+		for x in attachments:
+			if isinstance(x, BaseMessage):
+				mymessage.attach(x)
+			elif isinstance(x, str):
+				mymessage.attach(TextMessage(x))
+			else:
+				raise portage_exception.PortageException("Can't handle type of attachment: %s" % type(x))
+
+	mymessage.set_unixfrom(sender)
+	mymessage["To"] = recipient
+	mymessage["From"] = sender
+	mymessage["Subject"] = subject
+				
+	return mymessage
+
+def send_mail(mysettings, message):
+	mymailhost = "localhost"
+	mymailport = 25
+	mymailuser = ""
+	mymailpasswd = ""
+	myrecipient = "root@localhost"
+	
+	# Syntax for PORTAGE_LOG_MAILURI (if defined):
+	# adress [[user:passwd@]mailserver[:port]]
+	# where adress:     recipient adress
+	#       user:       username for smtp auth (defaults to none)
+	#       passwd:     password for smtp auth (defaults to none)
+	#       mailserver: smtp server that should be used to deliver the mail (defaults to localhost)
+	#       port:       port to use on the given smtp server (defaults to 25, values > 100000 indicate that starttls should be used on (port-100000))
+	if " " in mysettings["PORTAGE_ELOG_MAILURI"]:
+		myrecipient, mymailuri = mysettings["PORTAGE_ELOG_MAILURI"].split()
+		if "@" in mymailuri:
+			myauthdata, myconndata = mymailuri.rsplit("@", 1)
+			try:
+				mymailuser,mymailpasswd = myauthdata.split(":")
+			except ValueError:
+				print "!!! invalid SMTP AUTH configuration, trying unauthenticated ..."
+		else:
+			myconndata = mymailuri
+		if ":" in myconndata:
+			mymailhost,mymailport = myconndata.split(":")
+		else:
+			mymailhost = myconndata
+	else:
+		myrecipient = mysettings["PORTAGE_ELOG_MAILURI"]
+	try:
+		myfrom = message.get("From")
+		
+		if int(mymailport) > 100000:
+			myconn = smtplib.SMTP(mymailhost, int(mymailport) - 100000)
+			myconn.starttls()
+		else:
+			myconn = smtplib.SMTP(mymailhost, mymailport)
+		if mymailuser != "" and mymailpasswd != "":
+			myconn.login(mymailuser, mymailpasswd)
+		myconn.sendmail(myfrom, myrecipient, message.as_string())
+		myconn.quit()
+	except smtplib.SMTPException, e:
+		raise portage_exception.PortageException("!!! An error occured while trying to send logmail:\n"+str(e))
+	except socket.error, e:
+		raise portage_exception.PortageException("!!! A network error occured while trying to send logmail:\n"+str(e)+"\nSure you configured PORTAGE_ELOG_MAILURI correctly?")
+	return
+