Infrastructure/fedora-infrastructure
1
0
Fork 0
Code Issues 70 Pull requests Projects Releases Packages Wiki Activity Actions

Report uploading username in email as well

Browse source
This commit is contained in:
Jon Stanley 2009-11-21 17:27:57 -05:00
parent bf991365a5
commit 79b64b6bfa
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
scripts/upload.cgi/upload.cgi
View file

@ -11,6 +11,7 @@ import sys
import cgi import cgi
import tempfile import tempfile
import grp import grp
import syslog
import smtplib import smtplib
from email.mine.text import MIMEText from email.mine.text import MIMEText
try: try:
@ -53,18 +54,21 @@ def check_auth(username):
pass pass
return authenticated return authenticated
def send_email(name, md5, filename): def send_email(name, md5, filename, username):
text='File %s has been uploaded to the lookaside cache with md5sum %s' % \ text = 'File %s for package %s has been uploaded to the lookaside cache with md5sum %s by %s' % \
(filename, md5) (filename, name, md5, username)
msg = MIMEText(text) msg = MIMEText(text)
sender = 'nobody@fedoraproject.org' sender = 'nobody@fedoraproject.org'
recepients = [ '%s-owner@fedoraproject.org' % name, \ recepients = [ '%s-owner@fedoraproject.org' % name, \
'fedora-extras-commits@redhat.com' ] 'fedora-extras-commits@redhat.com' ]
msg['Subject'] = 'File %s uploaded to lookaside cache' % filename msg['Subject'] = 'File %s uploaded to lookaside cache by %s' % ( filename, username)
msg['From'] = sender msg['From'] = sender
msg['To'] = recepients msg['To'] = recepients
s = smtplib.SMTP(host='bastion.fedoraproject.org') try:
s.sendmail(sender, recepients, msg.as_string()) s = smtplib.SMTP(host='bastion.fedoraproject.org')
s.sendmail(sender, recepients, msg.as_string())
except:
syslog.syslog('sending mail for upload of %s failed!' % filename)
def main(): def main():
os.umask(002) os.umask(002)
@ -167,7 +171,7 @@ def main():
os.rename(tmpfile, dest_file) os.rename(tmpfile, dest_file)
print >> sys.stderr, '[username=%s] Stored %s (%d bytes)' % (username, dest_file, filesize) print >> sys.stderr, '[username=%s] Stored %s (%d bytes)' % (username, dest_file, filesize)
print 'File %s size %d MD5 %s stored OK' % (filename, filesize, md5sum) print 'File %s size %d MD5 %s stored OK' % (filename, filesize, md5sum)
send_email(name, md5sum, filename) send_email(name, md5sum, filename, username)
if __name__ == '__main__': if __name__ == '__main__':
main() main()