Bitmessage/PyBitmessage-2025-01-25
Archived
2
0
Fork 0
Code Issues 167 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Provide an error to the SMTP client if there's a problem delivering the message.

Browse Source
This commit is contained in:
Chuck 2013-07-05 16:02:00 +07:00
parent 6b534953de
commit 32e73d577c
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/class_smtpServer.py
View File

@ -90,6 +90,7 @@ class bitmessageSMTPChannel(asynchat.async_chat):
if self.__state != self.DATA: if self.__state != self.DATA:
self.invalid_command('451 Internal confusion') self.invalid_command('451 Internal confusion')
return return
# Remove extraneous carriage returns and de-transparency according # Remove extraneous carriage returns and de-transparency according
# to RFC 821, Section 4.5.2. # to RFC 821, Section 4.5.2.
data = [] data = []
@ -98,11 +99,16 @@ class bitmessageSMTPChannel(asynchat.async_chat):
data.append(text[1:]) data.append(text[1:])
else: else:
data.append(text) data.append(text)
self.__data = '\n'.join(data) self.__data = '\n'.join(data)
status = self.__server.process_message(self.__peer, try:
self.address, status = self.__server.process_message(self.__peer,
self.__rcpttos, self.address,
self.__data) self.__rcpttos,
self.__data)
except Exception, e:
status = '451 Requested action aborted: {}'.format(str(e))
self.__rcpttos = [] self.__rcpttos = []
self.__mailfrom = None self.__mailfrom = None
self.__state = self.COMMAND self.__state = self.COMMAND
@ -110,7 +116,7 @@ class bitmessageSMTPChannel(asynchat.async_chat):
if not status: if not status:
self.push('250 Ok') self.push('250 Ok')
else: else:
self.push(status) self.invalid_command(status)
# SMTP and ESMTP commands # SMTP and ESMTP commands
def smtp_HELP(self, arg): def smtp_HELP(self, arg):
@ -407,7 +413,7 @@ class bitmessageSMTPServer(smtpd.SMTPServer):
shared.printLock.acquire() shared.printLock.acquire()
print "Error: One of the addresses to which you are sending a message, {}, is yours. Unfortunately the Bitmessage client cannot process its own messages. Please try running a second client on a different computer or within a VM.".format(toAddress) print "Error: One of the addresses to which you are sending a message, {}, is yours. Unfortunately the Bitmessage client cannot process its own messages. Please try running a second client on a different computer or within a VM.".format(toAddress)
shared.printLock.release() shared.printLock.release()
raise Exception("Cannot send message to {}".format(toAddress)) raise Exception("An address that you are sending a message to, {}, is yours. Unfortunately the Bitmessage client cannot process its own messages. Please try running a second client on a different computer or within a VM.".format(toAddress))
# The subject is specially formatted to identify it from non-E-mail messages. # The subject is specially formatted to identify it from non-E-mail messages.
# TODO - The bitfield will be used to convey things like external attachments, etc. # TODO - The bitfield will be used to convey things like external attachments, etc.