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

small cleanup

Browse Source
This commit is contained in:
Chuck 2013-07-03 23:21:04 +07:00
parent f4676e2685
commit 13cc794880
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/class_pop3Server.py
View File

@ -176,13 +176,19 @@ class bitmessagePOP3Connection(asyncore.dispatcher):
shared.printLock.release() shared.printLock.release()
raise Exception("Invalid Bitmessage address: {}".format(self.address)) raise Exception("Invalid Bitmessage address: {}".format(self.address))
self.address = addBMIfNotPresent(self.address)
# 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
# If no password is set, then the identity is not available for SMTP/POP3 access. # If no password is set, then the identity is not available for SMTP/POP3 access.
try: try:
self.pw = shared.config.get(addBMIfNotPresent(self.address), "smtppop3password") if shared.config.getboolean(self.address, "enabled"):
self.pw = shared.config.get(self.address, "smtppop3password")
yield "+OK user accepted" yield "+OK user accepted"
return
except: except:
yield "-ERR account not available" pass
yield "-ERR access denied"
self.close() self.close()
def handlePass(self, data): def handlePass(self, data):

6
src/class_smtpServer.py
View File

@ -147,16 +147,20 @@ class bitmessageSMTPChannel(asynchat.async_chat):
shared.printLock.release() shared.printLock.release()
raise Exception("Invalid Bitmessage address: {}".format(self.address)) raise Exception("Invalid Bitmessage address: {}".format(self.address))
self.address = addBMIfNotPresent(self.address)
# 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
# If no password is set, then the identity is not available for SMTP/POP3 access. # If no password is set, then the identity is not available for SMTP/POP3 access.
try: try:
self.pw = shared.config.get(addBMIfNotPresent(self.address), "smtppop3password") if shared.config.getboolean(self.address, "enabled"):
self.pw = shared.config.get(self.address, "smtppop3password")
if pw == self.pw: if pw == self.pw:
self.push('235 Authentication successful. Proceed.') self.push('235 Authentication successful. Proceed.')
self.logged_in = True self.logged_in = True
return return
except: except:
pass pass
self.push('530 Access denied.') self.push('530 Access denied.')
self.close_when_done() self.close_when_done()