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

Don't close socket on most basic errors, if the connection can continue.

Browse Source
This commit is contained in:
Chuck 2013-07-05 14:21:46 +07:00
parent 726ec2d05b
commit b254a32dba
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/class_smtpServer.py
View File

@ -128,18 +128,15 @@ class bitmessageSMTPChannel(asynchat.async_chat):
encoding, pw = arg.split(' ') encoding, pw = arg.split(' ')
if encoding != 'PLAIN': if encoding != 'PLAIN':
self.push('501 encoding not understood') self.push('501 encoding not understood')
self.close_when_done()
return return
z, username, pw = base64.b64decode(pw).split('\x00') z, username, pw = base64.b64decode(pw).split('\x00')
if z != '': if z != '':
self.push('501 encoding not understood') self.push('501 encoding not understood')
self.close_when_done()
return return
if '@' not in username: if '@' not in username:
self.push('530 Access denied.') self.push('530 Access denied.')
self.close_when_done()
return return
capitalization, address = username.split('@', 1) capitalization, address = username.split('@', 1)
@ -163,7 +160,6 @@ class bitmessageSMTPChannel(asynchat.async_chat):
# Must match full email address with capitalization # Must match full email address with capitalization
if username != self.fullUsername: if username != self.fullUsername:
self.push('530 Access denied.') self.push('530 Access denied.')
self.close_when_done()
return return
# Each identity must be enabled independly by setting the smtppop3password for the identity # Each identity must be enabled independly by setting the smtppop3password for the identity
@ -179,7 +175,6 @@ class bitmessageSMTPChannel(asynchat.async_chat):
pass pass
self.push('530 Access denied.') self.push('530 Access denied.')
self.close_when_done()
def smtp_NOOP(self, arg): def smtp_NOOP(self, arg):
if arg: if arg:
@ -209,7 +204,6 @@ class bitmessageSMTPChannel(asynchat.async_chat):
def smtp_MAIL(self, arg): def smtp_MAIL(self, arg):
if not self.logged_in: if not self.logged_in:
self.push('503 Not authenticated.') self.push('503 Not authenticated.')
self.close_when_done()
return return
print >> smtpd.DEBUGSTREAM, '===> MAIL', arg print >> smtpd.DEBUGSTREAM, '===> MAIL', arg
@ -230,7 +224,6 @@ class bitmessageSMTPChannel(asynchat.async_chat):
def smtp_RCPT(self, arg): def smtp_RCPT(self, arg):
if not self.logged_in: if not self.logged_in:
self.push('503 Not authenticated.') self.push('503 Not authenticated.')
self.close_when_done()
return return
print >> smtpd.DEBUGSTREAM, '===> RCPT', arg print >> smtpd.DEBUGSTREAM, '===> RCPT', arg
@ -261,7 +254,6 @@ class bitmessageSMTPChannel(asynchat.async_chat):
def smtp_DATA(self, arg): def smtp_DATA(self, arg):
if not self.logged_in: if not self.logged_in:
self.push('503 Not authenticated.') self.push('503 Not authenticated.')
self.close_when_done()
return return
if not self.__rcpttos: if not self.__rcpttos:
self.push('503 Error: need RCPT command') self.push('503 Error: need RCPT command')