emails: make bad headers error show what headers we investigated.
- makes debugging easier.
This commit is contained in:
parent
25732899d2
commit
9d45467ca3
1 changed files with 9 additions and 4 deletions
|
|
@ -114,14 +114,18 @@ class Message(object):
|
|||
|
||||
return response
|
||||
|
||||
def _get_headers(self):
|
||||
headers = [self.subject, self.sender]
|
||||
headers += list(self.send_to)
|
||||
headers += self.extra_headers.values()
|
||||
return headers
|
||||
|
||||
def is_bad_headers(self):
|
||||
"""
|
||||
Checks for bad headers i.e. newlines in subject, sender or recipients.
|
||||
"""
|
||||
|
||||
headers = [self.subject, self.sender]
|
||||
headers += list(self.send_to)
|
||||
headers += self.extra_headers.values()
|
||||
headers = self._get_headers()
|
||||
|
||||
for val in headers:
|
||||
for c in '\r\n':
|
||||
|
|
@ -144,7 +148,8 @@ class Message(object):
|
|||
raise InvalidMessage("No sender address has been set")
|
||||
|
||||
if self.is_bad_headers():
|
||||
raise BadHeaders
|
||||
headers = self._get_headers()
|
||||
raise BadHeaders(headers)
|
||||
|
||||
def add_recipient(self, recipient):
|
||||
"""
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue