external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Deliver emails to Cc in smtplib code path

Browse source 
When using the sendmail() function with smtplib.SMTP or
smtplib.SMTP_SSL, the list of actual recipients for the email (to be
translated to RCPT commands) has to be provided as a parameter.

Update the notification script and add all Cc recipients to that
parameter.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
This commit is contained in:
Lukas Fleischer 2020-08-27 07:11:17 -04:00
parent 03a6fa2f7e
commit c4f4ac510b
2 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
aurweb/scripts/notify.py
View file

@ -14,10 +14,6 @@ import aurweb.l10n
aur_location = aurweb.config.get('options', 'aur_location')
def headers_cc(cclist):
return {'Cc': str.join(', ', cclist)}
def headers_msgid(thread_id):
return {'Message-ID': thread_id}
@ -53,6 +49,9 @@ class Notification:
def get_headers(self):
return {}
def get_cc(self):
return []
def get_body_fmt(self, lang):
body = ''
for line in self.get_body(lang).splitlines():
@ -80,6 +79,8 @@ class Notification:
msg['From'] = sender
msg['Reply-to'] = reply_to
msg['To'] = to
if self.get_cc():
msg['Cc'] = str.join(', ', self.get_cc())
msg['X-AUR-Reason'] = reason
msg['Date'] = email.utils.formatdate(localtime=True)
@ -116,6 +117,7 @@ class Notification:
server.login(user, passwd)
server.set_debuglevel(0)
deliver_to = [to] + self.get_cc()
server.sendmail(sender, to, msg.as_bytes())
server.quit()
@ -444,6 +446,9 @@ class RequestOpenNotification(Notification):
def get_recipients(self):
return [(self._to, 'en')]
def get_cc(self):
return self._cc
def get_subject(self, lang):
return '[PRQ#%d] %s Request for %s' % \
(self._reqid, self._reqtype.title(), self._pkgbase)
@ -472,7 +477,6 @@ class RequestOpenNotification(Notification):
# Use a deterministic Message-ID for the first email referencing a
# request.
headers = headers_msgid(thread_id)
headers.update(headers_cc(self._cc))
return headers
@ -502,6 +506,9 @@ class RequestCloseNotification(Notification):
def get_recipients(self):
return [(self._to, 'en')]
def get_cc(self):
return self._cc
def get_subject(self, lang):
return '[PRQ#%d] %s Request for %s %s' % (self._reqid,
self._reqtype.title(),
@ -531,7 +538,6 @@ class RequestCloseNotification(Notification):
def get_headers(self):
thread_id = '<pkg-request-' + str(self._reqid) + '@aur.archlinux.org>'
headers = headers_reply(thread_id)
headers.update(headers_cc(self._cc))
return headers