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

some minor improvements to smtp protocol

Browse Source
This commit is contained in:
Chuck 2013-07-05 14:28:52 +07:00
parent b254a32dba
commit f155eab5f5
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/class_smtpServer.py
View File

@ -127,12 +127,12 @@ class bitmessageSMTPChannel(asynchat.async_chat):
def smtp_AUTH(self, arg): def smtp_AUTH(self, arg):
encoding, pw = arg.split(' ') encoding, pw = arg.split(' ')
if encoding != 'PLAIN': if encoding != 'PLAIN':
self.push('501 encoding not understood') self.push('501 method not understood')
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 method not understood')
return return
if '@' not in username: if '@' not in username:
@ -202,34 +202,38 @@ class bitmessageSMTPChannel(asynchat.async_chat):
return address return address
def smtp_MAIL(self, arg): def smtp_MAIL(self, arg):
if not self.logged_in:
self.push('503 Not authenticated.')
return
print >> smtpd.DEBUGSTREAM, '===> MAIL', arg print >> smtpd.DEBUGSTREAM, '===> MAIL', arg
address = self.__getaddr('FROM:', arg) if arg else None address = self.__getaddr('FROM:', arg) if arg else None
if not address: if not address:
self.push('501 Syntax: MAIL FROM:<address>') self.push('501 Syntax: MAIL FROM:<address>')
return return
if self.__mailfrom: if self.__mailfrom:
self.push('503 Error: nested MAIL command') self.push('503 Error: nested MAIL command')
return return
if not self.logged_in:
self.push('503 Not authenticated.')
return
if address != self.fullUsername: if address != self.fullUsername:
self.push('530 Access denied: address domain must match Bitmessage identity') self.push('530 Access denied: address domain must match Bitmessage identity')
return return
self.__mailfrom = address self.__mailfrom = address
print >> smtpd.DEBUGSTREAM, 'sender:', self.__mailfrom print >> smtpd.DEBUGSTREAM, 'sender:', self.__mailfrom
self.push('250 Ok') self.push('250 Ok')
def smtp_RCPT(self, arg): def smtp_RCPT(self, arg):
if not self.logged_in:
self.push('503 Not authenticated.')
return
print >> smtpd.DEBUGSTREAM, '===> RCPT', arg print >> smtpd.DEBUGSTREAM, '===> RCPT', arg
if not self.__mailfrom: if not self.__mailfrom:
self.push('503 Error: need MAIL command') self.push('503 Error: need MAIL command')
return return
if not self.logged_in:
# This will never happen. :)
self.push('503 Not authenticated.')
return
address = self.__getaddr('TO:', arg) if arg else None address = self.__getaddr('TO:', arg) if arg else None
if not address: if not address:
self.push('501 Syntax: RCPT TO: <address>') self.push('501 Syntax: RCPT TO: <address>')