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

add printlocks

Browse Source
This commit is contained in:
Chuck 2013-07-10 17:02:45 +07:00
parent 6eea004723
commit 295341a9dd
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/class_pop3Server.py
View File

@ -295,7 +295,8 @@ class bitmessagePOP3Server(asyncore.dispatcher):
@staticmethod @staticmethod
def reformatMessageForReceipt(toAddress, fromAddress, body, subject): def reformatMessageForReceipt(toAddress, fromAddress, body, subject):
message = parser.Parser().parsestr(body) message = parser.Parser().parsestr(body)
print(message) with shared.printLock:
print(message)
subject_is_valid = False subject_is_valid = False
@ -392,7 +393,8 @@ class bitmessagePOP3Server(asyncore.dispatcher):
@staticmethod @staticmethod
def reformatMessageForMailingList(toAddress, fromAddress, body, subject, mailingListName): def reformatMessageForMailingList(toAddress, fromAddress, body, subject, mailingListName):
message = parser.Parser().parsestr(body) message = parser.Parser().parsestr(body)
print(message) with shared.printLock:
print(message)
subject_is_valid = False subject_is_valid = False

22
src/class_smtpServer.py
View File

@ -42,7 +42,8 @@ class bitmessageSMTPChannel(asynchat.async_chat):
if err[0] != errno.ENOTCONN: if err[0] != errno.ENOTCONN:
raise raise
return return
print >> smtpd.DEBUGSTREAM, 'Peer:', repr(self.__peer) with shared.printLock:
print >> smtpd.DEBUGSTREAM, 'Peer:', repr(self.__peer)
self.push('220 %s %s' % (self.__fqdn, self.__version)) self.push('220 %s %s' % (self.__fqdn, self.__version))
self.set_terminator('\r\n') self.set_terminator('\r\n')
@ -66,7 +67,8 @@ class bitmessageSMTPChannel(asynchat.async_chat):
# Implementation of base class abstract method # Implementation of base class abstract method
def found_terminator(self): def found_terminator(self):
line = ''.join(self.__line) line = ''.join(self.__line)
print >> smtpd.DEBUGSTREAM, 'Data:', repr(line) with shared.printLock:
print >> smtpd.DEBUGSTREAM, 'Data:', repr(line)
self.__line = [] self.__line = []
if self.__state == self.COMMAND: if self.__state == self.COMMAND:
if not line: if not line:
@ -236,7 +238,8 @@ class bitmessageSMTPChannel(asynchat.async_chat):
return address return address
def smtp_MAIL(self, arg): def smtp_MAIL(self, arg):
print >> smtpd.DEBUGSTREAM, '===> MAIL', arg with shared.printLock:
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:
@ -256,11 +259,13 @@ class bitmessageSMTPChannel(asynchat.async_chat):
return return
self.__mailfrom = address self.__mailfrom = address
print >> smtpd.DEBUGSTREAM, 'sender:', self.__mailfrom with shared.printLock:
print >> smtpd.DEBUGSTREAM, 'sender:', self.__mailfrom
self.push('250 Ok') self.push('250 Ok')
def smtp_RCPT(self, arg): def smtp_RCPT(self, arg):
print >> smtpd.DEBUGSTREAM, '===> RCPT', arg with shared.printLock:
print >> smtpd.DEBUGSTREAM, '===> RCPT', arg
if not self.__mailfrom: if not self.__mailfrom:
self.invalid_command('503 Error: need MAIL command') self.invalid_command('503 Error: need MAIL command')
return return
@ -279,7 +284,8 @@ class bitmessageSMTPChannel(asynchat.async_chat):
return return
realAddress = applyBase58Capitalization(address, int(capitalization)) realAddress = applyBase58Capitalization(address, int(capitalization))
self.__rcpttos.append('{}@{}'.format(getBase58Capitaliation(realAddress), realAddress)) self.__rcpttos.append('{}@{}'.format(getBase58Capitaliation(realAddress), realAddress))
print >> smtpd.DEBUGSTREAM, 'recips:', self.__rcpttos with shared.printLock:
print >> smtpd.DEBUGSTREAM, 'recips:', self.__rcpttos
self.push('250 Ok') self.push('250 Ok')
def smtp_RSET(self, arg): def smtp_RSET(self, arg):
@ -347,7 +353,6 @@ class bitmessageSMTPServer(smtpd.SMTPServer):
headersToStrip = "Message-ID, User-Agent" headersToStrip = "Message-ID, User-Agent"
headersToStrip = [x.strip() for x in headersToStrip.split(',') if len(x.strip()) > 0] headersToStrip = [x.strip() for x in headersToStrip.split(',') if len(x.strip()) > 0]
print(headersToStrip)
for h in headersToStrip: for h in headersToStrip:
if h in message: if h in message:
del message[h] del message[h]
@ -369,7 +374,8 @@ class bitmessageSMTPServer(smtpd.SMTPServer):
gen = generator.Generator(fp, mangle_from_=False, maxheaderlen=128) gen = generator.Generator(fp, mangle_from_=False, maxheaderlen=128)
gen.flatten(message) gen.flatten(message)
message_as_text = fp.getvalue() message_as_text = fp.getvalue()
print(message_as_text) with shared.printLink:
print(message_as_text)
checksum = hashlib.sha256(message_as_text).digest()[:2] checksum = hashlib.sha256(message_as_text).digest()[:2]
checksum = (ord(checksum[0]) << 8) | ord(checksum[1]) checksum = (ord(checksum[0]) << 8) | ord(checksum[1])