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

Parse message and add bitmessage header field. Include checksum in subject line.

Browse Source
This commit is contained in:
Chuck 2013-07-04 13:57:39 +07:00
parent 561a3f8eae
commit 02ec955790
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/class_smtpServer.py
View File

@ -1,6 +1,8 @@
from cStringIO import StringIO
from pyelliptic.openssl import OpenSSL from pyelliptic.openssl import OpenSSL
import asynchat import asynchat
import base64 import base64
from email import parser, generator
import errno import errno
import shared import shared
import smtpd import smtpd
@ -291,7 +293,17 @@ class bitmessageSMTPServer(smtpd.SMTPServer):
#print('--------') #print('--------')
#print(type(address)) #print(type(address))
message = data message = parser.Parser().parsestr(data)
message['Bitmessage-Version'] = shared.softwareVersion
print(message)
fp = StringIO()
gen = generator.Generator(fp, mangle_from_=False, maxheaderlen=128)
gen.flatten(message)
message_as_text = fp.getvalue()
checksum = hashlib.sha256(message_as_text).digest()[:2]
checksum = (ord(checksum[0]) << 8) | ord(checksum[1])
# Determine the fromAddress and make sure it's an owned identity # Determine the fromAddress and make sure it's an owned identity
fromAddress = address fromAddress = address
@ -367,10 +379,11 @@ class bitmessageSMTPServer(smtpd.SMTPServer):
# 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.
subject = "<Bitmessage Mail: 00000000000000000000>" # Reserved flags. # Last 2 bytes are two bytes of the sha256 checksum of message
subject = "<Bitmessage Mail: 0000000000000000{:04x}>".format(checksum) # Reserved flags.
ackdata = OpenSSL.rand(32) ackdata = OpenSSL.rand(32)
t = ('', toAddress, toRipe, fromAddress, subject, message, ackdata, int(time.time()), 'msgqueued', 1, 1, 'sent', 2) t = ('', toAddress, toRipe, fromAddress, subject, message_as_text, ackdata, int(time.time()), 'msgqueued', 1, 1, 'sent', 2)
helper_sent.insert(t) helper_sent.insert(t)
toLabel = '' toLabel = ''
@ -383,7 +396,7 @@ class bitmessageSMTPServer(smtpd.SMTPServer):
if queryreturn != []: if queryreturn != []:
for row in queryreturn: for row in queryreturn:
toLabel, = row toLabel, = row
shared.UISignalQueue.put(('displayNewSentMessage', (toAddress, toLabel, fromAddress, subject, message, ackdata))) shared.UISignalQueue.put(('displayNewSentMessage', (toAddress, toLabel, fromAddress, subject, message_as_text, ackdata)))
shared.workerQueue.put(('sendmessage', toAddress)) shared.workerQueue.put(('sendmessage', toAddress))
# TODO - what should we do with ackdata.encode('hex') ? # TODO - what should we do with ackdata.encode('hex') ?