From 5bf56c374e4fb6c8add590f6dc31eb88197edbd5 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 21 Nov 2009 22:28:31 -0500 Subject: [PATCH 1/4] upload.cgi: Use the uploader's name/address as sender --- configs/web/applications/upload.cgi | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/configs/web/applications/upload.cgi b/configs/web/applications/upload.cgi index 626506a..baa7b4a 100644 --- a/configs/web/applications/upload.cgi +++ b/configs/web/applications/upload.cgi @@ -11,9 +11,11 @@ import sys import cgi import tempfile import grp +import pwd import syslog import smtplib +from email import Header, Utils try: from email.mime.text import MIMEText except ImportError: @@ -63,7 +65,21 @@ def send_email(name, md5, filename, username): text = 'File %s for package %s has been uploaded to the lookaside cache with md5sum %s by %s' % \ (filename, name, md5, username) msg = MIMEText(text) - sender = 'nobody@fedoraproject.org' + try: + sender_name = pwd.getpwnam(username)[4] + sender_email = '%s@fedoraproject.org' % username + except KeyError: + sender_name = '' + sender_email = 'nobody@fedoraproject.org' + syslog.syslog('Unable to find account info for %s (uploading %s)' % + (username, filename)) + if sender_name: + try: + sender_name = unicode(sender_name, 'ascii') + except UnicodeDecodeError: + sender_name = Header.Header(sender_name, 'utf-8').encode() + msg.set_charset('utf-8') + sender = Utils.formataddr((sender_name, sender_email)) recipients = [ '%s-owner@fedoraproject.org' % name, \ 'fedora-extras-commits@redhat.com' ] msg['Subject'] = 'File %s uploaded to lookaside cache by %s' % ( filename, username) -- 1.6.5.2