Bitmessage/PyBitmessage-2024-12-18
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 52 Actions Packages Projects Releases 5 Wiki Activity

Merge branch 'binary' into py3

Browse Source
This commit is contained in:
Kashiko Koibumi 2024-05-28 08:40:40 +09:00
commit 6ec9fb1a7e
No known key found for this signature in database
GPG Key ID: 8F06E069E37C40C4
33 changed files with 331 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/addresses.py
View File

@ -187,7 +187,7 @@ def decodeAddress(address):
integer = decodeBase58(address) integer = decodeBase58(address)
if integer == 0: if integer == 0:
status = 'invalidcharacters' status = 'invalidcharacters'
return status, 0, 0, '' return status, 0, 0, b''
# after converting to hex, the string will be prepended # after converting to hex, the string will be prepended
# with a 0x and appended with a L in python2 # with a 0x and appended with a L in python2
hexdata = hex(integer)[2:].rstrip('L') hexdata = hex(integer)[2:].rstrip('L')
@ -200,23 +200,23 @@ def decodeAddress(address):
if checksum != double_sha512(data[:-4])[0:4]: if checksum != double_sha512(data[:-4])[0:4]:
status = 'checksumfailed' status = 'checksumfailed'
return status, 0, 0, '' return status, 0, 0, b''
try: try:
addressVersionNumber, bytesUsedByVersionNumber = decodeVarint(data[:9]) addressVersionNumber, bytesUsedByVersionNumber = decodeVarint(data[:9])
except varintDecodeError as e: except varintDecodeError as e:
logger.error(str(e)) logger.error(str(e))
status = 'varintmalformed' status = 'varintmalformed'
return status, 0, 0, '' return status, 0, 0, b''
if addressVersionNumber > 4: if addressVersionNumber > 4:
logger.error('cannot decode address version numbers this high') logger.error('cannot decode address version numbers this high')
status = 'versiontoohigh' status = 'versiontoohigh'
return status, 0, 0, '' return status, 0, 0, b''
elif addressVersionNumber == 0: elif addressVersionNumber == 0:
logger.error('cannot decode address version numbers of zero.') logger.error('cannot decode address version numbers of zero.')
status = 'versiontoohigh' status = 'versiontoohigh'
return status, 0, 0, '' return status, 0, 0, b''
try: try:
streamNumber, bytesUsedByStreamNumber = \ streamNumber, bytesUsedByStreamNumber = \
@ -224,7 +224,7 @@ def decodeAddress(address):
except varintDecodeError as e: except varintDecodeError as e:
logger.error(str(e)) logger.error(str(e))
status = 'varintmalformed' status = 'varintmalformed'
return status, 0, 0, '' return status, 0, 0, b''
status = 'success' status = 'success'
if addressVersionNumber == 1: if addressVersionNumber == 1:
@ -242,21 +242,21 @@ def decodeAddress(address):
return status, addressVersionNumber, streamNumber, \ return status, addressVersionNumber, streamNumber, \
b'\x00\x00' + embeddedRipeData b'\x00\x00' + embeddedRipeData
elif len(embeddedRipeData) < 18: elif len(embeddedRipeData) < 18:
return 'ripetooshort', 0, 0, '' return 'ripetooshort', 0, 0, b''
elif len(embeddedRipeData) > 20: elif len(embeddedRipeData) > 20:
return 'ripetoolong', 0, 0, '' return 'ripetoolong', 0, 0, b''
return 'otherproblem', 0, 0, '' return 'otherproblem', 0, 0, b''
elif addressVersionNumber == 4: elif addressVersionNumber == 4:
embeddedRipeData = \ embeddedRipeData = \
data[bytesUsedByVersionNumber + bytesUsedByStreamNumber:-4] data[bytesUsedByVersionNumber + bytesUsedByStreamNumber:-4]
if embeddedRipeData[0:1] == b'\x00': if embeddedRipeData[0:1] == b'\x00':
# In order to enforce address non-malleability, encoded # In order to enforce address non-malleability, encoded
# RIPE data must have NULL bytes removed from the front # RIPE data must have NULL bytes removed from the front
return 'encodingproblem', 0, 0, '' return 'encodingproblem', 0, 0, b''
elif len(embeddedRipeData) > 20: elif len(embeddedRipeData) > 20:
return 'ripetoolong', 0, 0, '' return 'ripetoolong', 0, 0, b''
elif len(embeddedRipeData) < 4: elif len(embeddedRipeData) < 4:
return 'ripetooshort', 0, 0, '' return 'ripetooshort', 0, 0, b''
x00string = b'\x00' * (20 - len(embeddedRipeData)) x00string = b'\x00' * (20 - len(embeddedRipeData))
return status, addressVersionNumber, streamNumber, \ return status, addressVersionNumber, streamNumber, \
x00string + embeddedRipeData x00string + embeddedRipeData

34
src/api.py
View File

@ -71,6 +71,7 @@ from struct import pack, unpack
import six import six
from six.moves import configparser, http_client, xmlrpc_server from six.moves import configparser, http_client, xmlrpc_server
from six.moves.reprlib import repr from six.moves.reprlib import repr
from dbcompat import dbstr
import helper_inbox import helper_inbox
import helper_sent import helper_sent
@ -532,12 +533,12 @@ class BMRPCDispatcher(object):
message = shared.fixPotentiallyInvalidUTF8Data(message) message = shared.fixPotentiallyInvalidUTF8Data(message)
return { return {
'msgid': hexlify(msgid), 'msgid': hexlify(msgid),
'toAddress': toAddress, 'toAddress': toAddress.decode("utf-8", "replace"),
'fromAddress': fromAddress, 'fromAddress': fromAddress.decode("utf-8", "replace"),
'subject': base64.b64encode(subject), 'subject': base64.b64encode(subject),
'message': base64.b64encode(message), 'message': base64.b64encode(message),
'encodingType': encodingtype, 'encodingType': encodingtype,
'receivedTime': received, 'receivedTime': received.decode("utf-8", "replace"),
'read': read 'read': read
} }
@ -599,11 +600,12 @@ class BMRPCDispatcher(object):
""" """
queryreturn = sqlQuery( queryreturn = sqlQuery(
"SELECT label, address from addressbook WHERE label = ?", "SELECT label, address from addressbook WHERE label = ?",
label dbstr(label)
) if label else sqlQuery("SELECT label, address from addressbook") ) if label else sqlQuery("SELECT label, address from addressbook")
data = [] data = []
for label, address in queryreturn: for label, address in queryreturn:
label = shared.fixPotentiallyInvalidUTF8Data(label) label = shared.fixPotentiallyInvalidUTF8Data(label)
address = address.decode("utf-8", "replace")
data.append({ data.append({
'label': base64.b64encode(label), 'label': base64.b64encode(label),
'address': address 'address': address
@ -619,12 +621,12 @@ class BMRPCDispatcher(object):
self._verifyAddress(address) self._verifyAddress(address)
# TODO: add unique together constraint in the table # TODO: add unique together constraint in the table
queryreturn = sqlQuery( queryreturn = sqlQuery(
"SELECT address FROM addressbook WHERE address=?", address) "SELECT address FROM addressbook WHERE address=?", dbstr(address))
if queryreturn != []: if queryreturn != []:
raise APIError( raise APIError(
16, 'You already have this address in your address book.') 16, 'You already have this address in your address book.')
sqlExecute("INSERT INTO addressbook VALUES(?,?)", label, address) sqlExecute("INSERT INTO addressbook VALUES(?,?)", dbstr(label), dbstr(address))
queues.UISignalQueue.put(('rerenderMessagelistFromLabels', '')) queues.UISignalQueue.put(('rerenderMessagelistFromLabels', ''))
queues.UISignalQueue.put(('rerenderMessagelistToLabels', '')) queues.UISignalQueue.put(('rerenderMessagelistToLabels', ''))
queues.UISignalQueue.put(('rerenderAddressBook', '')) queues.UISignalQueue.put(('rerenderAddressBook', ''))
@ -636,7 +638,7 @@ class BMRPCDispatcher(object):
"""Delete an entry from address book.""" """Delete an entry from address book."""
address = addBMIfNotPresent(address) address = addBMIfNotPresent(address)
self._verifyAddress(address) self._verifyAddress(address)
sqlExecute('DELETE FROM addressbook WHERE address=?', address) sqlExecute('DELETE FROM addressbook WHERE address=?', dbstr(address))
queues.UISignalQueue.put(('rerenderMessagelistFromLabels', '')) queues.UISignalQueue.put(('rerenderMessagelistFromLabels', ''))
queues.UISignalQueue.put(('rerenderMessagelistToLabels', '')) queues.UISignalQueue.put(('rerenderMessagelistToLabels', ''))
queues.UISignalQueue.put(('rerenderAddressBook', '')) queues.UISignalQueue.put(('rerenderAddressBook', ''))
@ -920,6 +922,7 @@ class BMRPCDispatcher(object):
" ORDER BY received" " ORDER BY received"
) )
return {"inboxMessages": [ return {"inboxMessages": [
self._dump_inbox_message(*data) for data in queryreturn self._dump_inbox_message(*data) for data in queryreturn
]} ]}
@ -1019,7 +1022,7 @@ class BMRPCDispatcher(object):
queryreturn = sqlQuery( queryreturn = sqlQuery(
"SELECT msgid, toaddress, fromaddress, subject, received," "SELECT msgid, toaddress, fromaddress, subject, received,"
" message, encodingtype, read FROM inbox WHERE folder='inbox'" " message, encodingtype, read FROM inbox WHERE folder='inbox'"
" AND toAddress=?", toAddress) " AND toAddress=?", dbstr(toAddress))
return {"inboxMessages": [ return {"inboxMessages": [
self._dump_inbox_message(*data) for data in queryreturn self._dump_inbox_message(*data) for data in queryreturn
]} ]}
@ -1056,7 +1059,7 @@ class BMRPCDispatcher(object):
"SELECT msgid, toaddress, fromaddress, subject, lastactiontime," "SELECT msgid, toaddress, fromaddress, subject, lastactiontime,"
" message, encodingtype, status, ackdata FROM sent" " message, encodingtype, status, ackdata FROM sent"
" WHERE folder='sent' AND fromAddress=? ORDER BY lastactiontime", " WHERE folder='sent' AND fromAddress=? ORDER BY lastactiontime",
fromAddress dbstr(fromAddress)
) )
return {"sentMessages": [ return {"sentMessages": [
self._dump_sent_message(*data) for data in queryreturn self._dump_sent_message(*data) for data in queryreturn
@ -1151,9 +1154,9 @@ class BMRPCDispatcher(object):
toLabel = '' toLabel = ''
queryreturn = sqlQuery( queryreturn = sqlQuery(
"SELECT label FROM addressbook WHERE address=?", toAddress) "SELECT label FROM addressbook WHERE address=?", dbstr(toAddress))
try: try:
toLabel = queryreturn[0][0] toLabel = queryreturn[0][0].decode("utf-8", "replace")
except IndexError: except IndexError:
pass pass
@ -1220,7 +1223,7 @@ class BMRPCDispatcher(object):
queryreturn = sqlQuery( queryreturn = sqlQuery(
"SELECT status FROM sent where ackdata=?", ackdata) "SELECT status FROM sent where ackdata=?", ackdata)
try: try:
return queryreturn[0][0] return queryreturn[0][0].decode("utf-8", "replace")
except IndexError: except IndexError:
return 'notfound' return 'notfound'
@ -1239,11 +1242,11 @@ class BMRPCDispatcher(object):
# First we must check to see if the address is already in the # First we must check to see if the address is already in the
# subscriptions list. # subscriptions list.
queryreturn = sqlQuery( queryreturn = sqlQuery(
"SELECT * FROM subscriptions WHERE address=?", address) "SELECT * FROM subscriptions WHERE address=?", dbstr(address))
if queryreturn: if queryreturn:
raise APIError(16, 'You are already subscribed to that address.') raise APIError(16, 'You are already subscribed to that address.')
sqlExecute( sqlExecute(
"INSERT INTO subscriptions VALUES (?,?,?)", label, address, True) "INSERT INTO subscriptions VALUES (?,?,?)", dbstr(label), dbstr(address), True)
shared.reloadBroadcastSendersForWhichImWatching() shared.reloadBroadcastSendersForWhichImWatching()
queues.UISignalQueue.put(('rerenderMessagelistFromLabels', '')) queues.UISignalQueue.put(('rerenderMessagelistFromLabels', ''))
queues.UISignalQueue.put(('rerenderSubscriptions', '')) queues.UISignalQueue.put(('rerenderSubscriptions', ''))
@ -1257,7 +1260,7 @@ class BMRPCDispatcher(object):
""" """
address = addBMIfNotPresent(address) address = addBMIfNotPresent(address)
sqlExecute("DELETE FROM subscriptions WHERE address=?", address) sqlExecute("DELETE FROM subscriptions WHERE address=?", dbstr(address))
shared.reloadBroadcastSendersForWhichImWatching() shared.reloadBroadcastSendersForWhichImWatching()
queues.UISignalQueue.put(('rerenderMessagelistFromLabels', '')) queues.UISignalQueue.put(('rerenderMessagelistFromLabels', ''))
queues.UISignalQueue.put(('rerenderSubscriptions', '')) queues.UISignalQueue.put(('rerenderSubscriptions', ''))
@ -1275,6 +1278,7 @@ class BMRPCDispatcher(object):
data = [] data = []
for label, address, enabled in queryreturn: for label, address, enabled in queryreturn:
label = shared.fixPotentiallyInvalidUTF8Data(label) label = shared.fixPotentiallyInvalidUTF8Data(label)
address = address.decode("utf-8", "replace")
data.append({ data.append({
'label': base64.b64encode(label), 'label': base64.b64encode(label),
'address': address, 'address': address,

71
src/bitmessagecurses/__init__.py
View File

@ -31,6 +31,7 @@ import state
from addresses import addBMIfNotPresent, decodeAddress from addresses import addBMIfNotPresent, decodeAddress
from bmconfigparser import config from bmconfigparser import config
from helper_sql import sqlExecute, sqlQuery from helper_sql import sqlExecute, sqlQuery
from dbcompat import dbstr
# pylint: disable=global-statement # pylint: disable=global-statement
@ -402,6 +403,7 @@ def handlech(c, stdscr):
body = "\n\n------------------------------------------------------\n" body = "\n\n------------------------------------------------------\n"
for row in ret: for row in ret:
body, = row body, = row
body = body.decode("utf-8", "replace")
sendMessage(fromaddr, toaddr, ischan, subject, body, True) sendMessage(fromaddr, toaddr, ischan, subject, body, True)
dialogreset(stdscr) dialogreset(stdscr)
@ -411,7 +413,7 @@ def handlech(c, stdscr):
r, t = d.inputbox("Label for address \"" + addr + "\"") r, t = d.inputbox("Label for address \"" + addr + "\"")
if r == d.DIALOG_OK: if r == d.DIALOG_OK:
label = t label = t
sqlExecute("INSERT INTO addressbook VALUES (?,?)", label, addr) sqlExecute("INSERT INTO addressbook VALUES (?,?)", dbstr(label), dbstr(addr))
# Prepend entry # Prepend entry
addrbook.reverse() addrbook.reverse()
addrbook.append([label, addr]) addrbook.append([label, addr])
@ -427,6 +429,7 @@ def handlech(c, stdscr):
if ret != []: if ret != []:
for row in ret: for row in ret:
msg, = row msg, = row
msg = msg.decode("utf-8", "replace")
fh = open(t, "a") # Open in append mode just in case fh = open(t, "a") # Open in append mode just in case
fh.write(msg) fh.write(msg)
fh.close() fh.close()
@ -464,7 +467,7 @@ def handlech(c, stdscr):
data = "" data = ""
ret = sqlQuery( ret = sqlQuery(
"SELECT message FROM sent WHERE subject=? AND ackdata=?", "SELECT message FROM sent WHERE subject=? AND ackdata=?",
sentbox[sentcur][4], dbstr(sentbox[sentcur][4]),
sentbox[sentcur][6]) sentbox[sentcur][6])
if ret != []: if ret != []:
for row in ret: for row in ret:
@ -479,7 +482,7 @@ def handlech(c, stdscr):
elif t == "2": # Move to trash elif t == "2": # Move to trash
sqlExecute( sqlExecute(
"UPDATE sent SET folder='trash' WHERE subject=? AND ackdata=?", "UPDATE sent SET folder='trash' WHERE subject=? AND ackdata=?",
sentbox[sentcur][4], dbstr(sentbox[sentcur][4]),
sentbox[sentcur][6]) sentbox[sentcur][6])
del sentbox[sentcur] del sentbox[sentcur]
scrollbox(d, unicode( scrollbox(d, unicode(
@ -712,29 +715,29 @@ def handlech(c, stdscr):
subscriptions.append([label, addr, True]) subscriptions.append([label, addr, True])
subscriptions.reverse() subscriptions.reverse()
sqlExecute("INSERT INTO subscriptions VALUES (?,?,?)", label, addr, True) sqlExecute("INSERT INTO subscriptions VALUES (?,?,?)", dbstr(label), dbstr(addr), True)
shared.reloadBroadcastSendersForWhichImWatching() shared.reloadBroadcastSendersForWhichImWatching()
elif t == "2": elif t == "2":
r, t = d.inputbox("Type in \"I want to delete this subscription\"") r, t = d.inputbox("Type in \"I want to delete this subscription\"")
if r == d.DIALOG_OK and t == "I want to delete this subscription": if r == d.DIALOG_OK and t == "I want to delete this subscription":
sqlExecute( sqlExecute(
"DELETE FROM subscriptions WHERE label=? AND address=?", "DELETE FROM subscriptions WHERE label=? AND address=?",
subscriptions[subcur][0], dbstr(subscriptions[subcur][0]),
subscriptions[subcur][1]) dbstr(subscriptions[subcur][1]))
shared.reloadBroadcastSendersForWhichImWatching() shared.reloadBroadcastSendersForWhichImWatching()
del subscriptions[subcur] del subscriptions[subcur]
elif t == "3": elif t == "3":
sqlExecute( sqlExecute(
"UPDATE subscriptions SET enabled=1 WHERE label=? AND address=?", "UPDATE subscriptions SET enabled=1 WHERE label=? AND address=?",
subscriptions[subcur][0], dbstr(subscriptions[subcur][0]),
subscriptions[subcur][1]) dbstr(subscriptions[subcur][1]))
shared.reloadBroadcastSendersForWhichImWatching() shared.reloadBroadcastSendersForWhichImWatching()
subscriptions[subcur][2] = True subscriptions[subcur][2] = True
elif t == "4": elif t == "4":
sqlExecute( sqlExecute(
"UPDATE subscriptions SET enabled=0 WHERE label=? AND address=?", "UPDATE subscriptions SET enabled=0 WHERE label=? AND address=?",
subscriptions[subcur][0], dbstr(subscriptions[subcur][0]),
subscriptions[subcur][1]) dbstr(subscriptions[subcur][1]))
shared.reloadBroadcastSendersForWhichImWatching() shared.reloadBroadcastSendersForWhichImWatching()
subscriptions[subcur][2] = False subscriptions[subcur][2] = False
elif menutab == 6: elif menutab == 6:
@ -763,7 +766,7 @@ def handlech(c, stdscr):
subscriptions.append([label, addr, True]) subscriptions.append([label, addr, True])
subscriptions.reverse() subscriptions.reverse()
sqlExecute("INSERT INTO subscriptions VALUES (?,?,?)", label, addr, True) sqlExecute("INSERT INTO subscriptions VALUES (?,?,?)", dbstr(label), dbstr(addr), True)
shared.reloadBroadcastSendersForWhichImWatching() shared.reloadBroadcastSendersForWhichImWatching()
elif t == "3": elif t == "3":
r, t = d.inputbox("Input new address") r, t = d.inputbox("Input new address")
@ -772,7 +775,7 @@ def handlech(c, stdscr):
if addr not in [item[1] for i, item in enumerate(addrbook)]: if addr not in [item[1] for i, item in enumerate(addrbook)]:
r, t = d.inputbox("Label for address \"" + addr + "\"") r, t = d.inputbox("Label for address \"" + addr + "\"")
if r == d.DIALOG_OK: if r == d.DIALOG_OK:
sqlExecute("INSERT INTO addressbook VALUES (?,?)", t, addr) sqlExecute("INSERT INTO addressbook VALUES (?,?)", dbstr(t), dbstr(addr))
# Prepend entry # Prepend entry
addrbook.reverse() addrbook.reverse()
addrbook.append([t, addr]) addrbook.append([t, addr])
@ -784,8 +787,8 @@ def handlech(c, stdscr):
if r == d.DIALOG_OK and t == "I want to delete this Address Book entry": if r == d.DIALOG_OK and t == "I want to delete this Address Book entry":
sqlExecute( sqlExecute(
"DELETE FROM addressbook WHERE label=? AND address=?", "DELETE FROM addressbook WHERE label=? AND address=?",
addrbook[abookcur][0], dbstr(addrbook[abookcur][0]),
addrbook[abookcur][1]) dbstr(addrbook[abookcur][1]))
del addrbook[abookcur] del addrbook[abookcur]
elif menutab == 7: elif menutab == 7:
set_background_title(d, "Blacklist Dialog Box") set_background_title(d, "Blacklist Dialog Box")
@ -801,20 +804,20 @@ def handlech(c, stdscr):
if r == d.DIALOG_OK and t == "I want to delete this Blacklist entry": if r == d.DIALOG_OK and t == "I want to delete this Blacklist entry":
sqlExecute( sqlExecute(
"DELETE FROM blacklist WHERE label=? AND address=?", "DELETE FROM blacklist WHERE label=? AND address=?",
blacklist[blackcur][0], dbstr(blacklist[blackcur][0]),
blacklist[blackcur][1]) dbstr(blacklist[blackcur][1]))
del blacklist[blackcur] del blacklist[blackcur]
elif t == "2": elif t == "2":
sqlExecute( sqlExecute(
"UPDATE blacklist SET enabled=1 WHERE label=? AND address=?", "UPDATE blacklist SET enabled=1 WHERE label=? AND address=?",
blacklist[blackcur][0], dbstr(blacklist[blackcur][0]),
blacklist[blackcur][1]) dbstr(blacklist[blackcur][1]))
blacklist[blackcur][2] = True blacklist[blackcur][2] = True
elif t == "3": elif t == "3":
sqlExecute( sqlExecute(
"UPDATE blacklist SET enabled=0 WHERE label=? AND address=?", "UPDATE blacklist SET enabled=0 WHERE label=? AND address=?",
blacklist[blackcur][0], dbstr(blacklist[blackcur][0]),
blacklist[blackcur][1]) dbstr(blacklist[blackcur][1]))
blacklist[blackcur][2] = False blacklist[blackcur][2] = False
dialogreset(stdscr) dialogreset(stdscr)
else: else:
@ -992,10 +995,13 @@ def loadInbox():
ret = sqlQuery("""SELECT msgid, toaddress, fromaddress, subject, received, read ret = sqlQuery("""SELECT msgid, toaddress, fromaddress, subject, received, read
FROM inbox WHERE folder='inbox' AND %s LIKE ? FROM inbox WHERE folder='inbox' AND %s LIKE ?
ORDER BY received ORDER BY received
""" % (where,), what) """ % (where,), dbstr(what))
for row in ret: for row in ret:
msgid, toaddr, fromaddr, subject, received, read = row msgid, toaddr, fromaddr, subject, received, read = row
toaddr = toaddr.decode("utf-8", "replace")
fromaddr = fromaddr.decode("utf-8", "replace")
subject = ascii(shared.fixPotentiallyInvalidUTF8Data(subject)) subject = ascii(shared.fixPotentiallyInvalidUTF8Data(subject))
received = received.decode("utf-8", "replace")
# Set label for to address # Set label for to address
try: try:
@ -1014,18 +1020,19 @@ def loadInbox():
if config.has_section(fromaddr): if config.has_section(fromaddr):
fromlabel = config.get(fromaddr, "label") fromlabel = config.get(fromaddr, "label")
if fromlabel == "": # Check Address Book if fromlabel == "": # Check Address Book
qr = sqlQuery("SELECT label FROM addressbook WHERE address=?", fromaddr) qr = sqlQuery("SELECT label FROM addressbook WHERE address=?", dbstr(fromaddr))
if qr != []: if qr != []:
for r in qr: for r in qr:
fromlabel, = r fromlabel, = r
fromlabel = shared.fixPotentiallyInvalidUTF8Data(fromlabel)
if fromlabel == "": # Check Subscriptions if fromlabel == "": # Check Subscriptions
qr = sqlQuery("SELECT label FROM subscriptions WHERE address=?", fromaddr) qr = sqlQuery("SELECT label FROM subscriptions WHERE address=?", dbstr(fromaddr))
if qr != []: if qr != []:
for r in qr: for r in qr:
fromlabel, = r fromlabel, = r
fromlabel = shared.fixPotentiallyInvalidUTF8Data(fromlabel)
if fromlabel == "": if fromlabel == "":
fromlabel = fromaddr fromlabel = fromaddr
fromlabel = shared.fixPotentiallyInvalidUTF8Data(fromlabel)
# Load into array # Load into array
inbox.append([ inbox.append([
@ -1045,22 +1052,27 @@ def loadSent():
ret = sqlQuery("""SELECT toaddress, fromaddress, subject, status, ackdata, lastactiontime ret = sqlQuery("""SELECT toaddress, fromaddress, subject, status, ackdata, lastactiontime
FROM sent WHERE folder='sent' AND %s LIKE ? FROM sent WHERE folder='sent' AND %s LIKE ?
ORDER BY lastactiontime ORDER BY lastactiontime
""" % (where,), what) """ % (where,), dbstr(what))
for row in ret: for row in ret:
toaddr, fromaddr, subject, status, ackdata, lastactiontime = row toaddr, fromaddr, subject, status, ackdata, lastactiontime = row
toaddr = toaddr.decode("utf-8", "replace")
fromaddr = fromaddr.decode("utf-8", "replace")
subject = ascii(shared.fixPotentiallyInvalidUTF8Data(subject)) subject = ascii(shared.fixPotentiallyInvalidUTF8Data(subject))
status = status.decode("utf-8", "replace")
# Set label for to address # Set label for to address
tolabel = "" tolabel = ""
qr = sqlQuery("SELECT label FROM addressbook WHERE address=?", toaddr) qr = sqlQuery("SELECT label FROM addressbook WHERE address=?", dbstr(toaddr))
if qr != []: if qr != []:
for r in qr: for r in qr:
tolabel, = r tolabel, = r
tolabel = tolabel.decode("utf-8", "replace")
if tolabel == "": if tolabel == "":
qr = sqlQuery("SELECT label FROM subscriptions WHERE address=?", toaddr) qr = sqlQuery("SELECT label FROM subscriptions WHERE address=?", dbstr(toaddr))
if qr != []: if qr != []:
for r in qr: for r in qr:
tolabel, = r tolabel, = r
tolabel = tolabel.decode("utf-8", "replace")
if tolabel == "": if tolabel == "":
if config.has_section(toaddr): if config.has_section(toaddr):
tolabel = config.get(toaddr, "label") tolabel = config.get(toaddr, "label")
@ -1130,6 +1142,7 @@ def loadAddrBook():
for row in ret: for row in ret:
label, addr = row label, addr = row
label = shared.fixPotentiallyInvalidUTF8Data(label) label = shared.fixPotentiallyInvalidUTF8Data(label)
addr = addr.decode("utf-8", "replace")
addrbook.append([label, addr]) addrbook.append([label, addr])
addrbook.reverse() addrbook.reverse()
@ -1139,6 +1152,8 @@ def loadSubscriptions():
ret = sqlQuery("SELECT label, address, enabled FROM subscriptions") ret = sqlQuery("SELECT label, address, enabled FROM subscriptions")
for row in ret: for row in ret:
label, address, enabled = row label, address, enabled = row
label = label.decode("utf-8", "replace")
address = address.decode("utf-8", "replace")
subscriptions.append([label, address, enabled]) subscriptions.append([label, address, enabled])
subscriptions.reverse() subscriptions.reverse()
@ -1153,6 +1168,8 @@ def loadBlackWhiteList():
ret = sqlQuery("SELECT label, address, enabled FROM whitelist") ret = sqlQuery("SELECT label, address, enabled FROM whitelist")
for row in ret: for row in ret:
label, address, enabled = row label, address, enabled = row
label = label.decode("utf-8", "replace")
address = address.decode("utf-8", "replace")
blacklist.append([label, address, enabled]) blacklist.append([label, address, enabled])
blacklist.reverse() blacklist.reverse()

16
src/bitmessagekivy/baseclass/addressbook.py
View File

@ -29,6 +29,7 @@ from pybitmessage.bitmessagekivy.baseclass.common import (
from pybitmessage.bitmessagekivy.baseclass.popup import SavedAddressDetailPopup from pybitmessage.bitmessagekivy.baseclass.popup import SavedAddressDetailPopup
from pybitmessage.bitmessagekivy.baseclass.addressbook_widgets import HelperAddressBook from pybitmessage.bitmessagekivy.baseclass.addressbook_widgets import HelperAddressBook
from pybitmessage.helper_sql import sqlExecute from pybitmessage.helper_sql import sqlExecute
from dbcompat import dbstr
logger = logging.getLogger('default') logger = logging.getLogger('default')
@ -59,7 +60,7 @@ class AddressBook(Screen, HelperAddressBook):
self.ids.tag_label.text = '' self.ids.tag_label.text = ''
self.queryreturn = kivy_helper_search.search_sql( self.queryreturn = kivy_helper_search.search_sql(
xAddress, account, "addressbook", where, what, False) xAddress, account, "addressbook", where, what, False)
self.queryreturn = [obj for obj in reversed(self.queryreturn)] self.queryreturn = [[obj[0].decode("utf-8", "replace"), obj[1].decode("utf-8", "replace")] for obj in reversed(self.queryreturn)]
if self.queryreturn: if self.queryreturn:
self.ids.tag_label.text = 'Address Book' self.ids.tag_label.text = 'Address Book'
self.has_refreshed = True self.has_refreshed = True
@ -131,7 +132,7 @@ class AddressBook(Screen, HelperAddressBook):
if self.ids.ml.children is not None: if self.ids.ml.children is not None:
self.ids.tag_label.text = '' self.ids.tag_label.text = ''
sqlExecute( sqlExecute(
"DELETE FROM addressbook WHERE address = ?", address) "DELETE FROM addressbook WHERE address = ?", dbstr(address))
toast('Address Deleted') toast('Address Deleted')
def close_pop(self, instance): def close_pop(self, instance):
@ -142,8 +143,13 @@ class AddressBook(Screen, HelperAddressBook):
def update_addbook_label(self, instance): def update_addbook_label(self, instance):
"""Updating the label of address book address""" """Updating the label of address book address"""
address_list = kivy_helper_search.search_sql(folder="addressbook") address_list = kivy_helper_search.search_sql(folder="addressbook")
stored_labels = [labels[0] for labels in address_list] stored_labels = [labels[0].decode("utf-8", "replace") for labels in address_list]
add_dict = dict(address_list) add_dict = {}
for row in address_list:
label, address = row
label = label.decode("utf-8", "replace")
address = address.decode("utf-8", "replace")
add_dict[label] = address
label = str(self.addbook_popup.content_cls.ids.add_label.text) label = str(self.addbook_popup.content_cls.ids.add_label.text)
if label in stored_labels and self.address == add_dict[label]: if label in stored_labels and self.address == add_dict[label]:
stored_labels.remove(label) stored_labels.remove(label)
@ -151,7 +157,7 @@ class AddressBook(Screen, HelperAddressBook):
sqlExecute(""" sqlExecute("""
UPDATE addressbook UPDATE addressbook
SET label = ? SET label = ?
WHERE address = ?""", label, self.addbook_popup.content_cls.address) WHERE address = ?""", dbstr(label), dbstr(self.addbook_popup.content_cls.address))
App.get_running_app().root.ids.id_addressbook.ids.ml.clear_widgets() App.get_running_app().root.ids.id_addressbook.ids.ml.clear_widgets()
App.get_running_app().root.ids.id_addressbook.loadAddresslist(None, 'All', '') App.get_running_app().root.ids.id_addressbook.loadAddresslist(None, 'All', '')
self.addbook_popup.dismiss() self.addbook_popup.dismiss()

10
src/bitmessagekivy/baseclass/maildetail.py
View File

@ -119,16 +119,16 @@ class MailDetail(Screen): # pylint: disable=too-many-instance-attributes
def assign_mail_details(self, data): def assign_mail_details(self, data):
"""Assigning mail details""" """Assigning mail details"""
subject = data[0][2].decode() if isinstance(data[0][2], bytes) else data[0][2] subject = data[0][2].decode("utf-8", "replace") if isinstance(data[0][2], bytes) else data[0][2]
body = data[0][3].decode() if isinstance(data[0][2], bytes) else data[0][3] body = data[0][3].decode("utf-8", "replace") if isinstance(data[0][2], bytes) else data[0][3]
self.to_addr = data[0][0] if len(data[0][0]) > 4 else ' ' self.to_addr = data[0][0].decode("utf-8", "replace") if len(data[0][0]) > 4 else ' '
self.from_addr = data[0][1] self.from_addr = data[0][1].decode("utf-8", "replace")
self.subject = subject.capitalize( self.subject = subject.capitalize(
) if subject.capitalize() else self.no_subject ) if subject.capitalize() else self.no_subject
self.message = body self.message = body
if len(data[0]) == 7: if len(data[0]) == 7:
self.status = data[0][4] self.status = data[0][4].decode("utf-8", "replace")
self.time_tag = show_time_history(data[0][4]) if self.kivy_state.detail_page_type == 'inbox' \ self.time_tag = show_time_history(data[0][4]) if self.kivy_state.detail_page_type == 'inbox' \
else show_time_history(data[0][6]) else show_time_history(data[0][6])
self.avatarImg = os.path.join(self.kivy_state.imageDir, 'draft-icon.png') \ self.avatarImg = os.path.join(self.kivy_state.imageDir, 'draft-icon.png') \

13
src/bitmessagekivy/baseclass/popup.py
View File

@ -59,7 +59,7 @@ class AddAddressPopup(BoxLayout):
"""Checking address is valid or not""" """Checking address is valid or not"""
my_addresses = ( my_addresses = (
App.get_running_app().root.ids.content_drawer.ids.identity_dropdown.values) App.get_running_app().root.ids.content_drawer.ids.identity_dropdown.values)
add_book = [addr[1] for addr in kivy_helper_search.search_sql( add_book = [addr[1].decode("utf-8", "replace") for addr in kivy_helper_search.search_sql(
folder="addressbook")] folder="addressbook")]
entered_text = str(instance.text).strip() entered_text = str(instance.text).strip()
if entered_text in add_book: if entered_text in add_book:
@ -84,7 +84,7 @@ class AddAddressPopup(BoxLayout):
def checkLabel_valid(self, instance): def checkLabel_valid(self, instance):
"""Checking address label is unique or not""" """Checking address label is unique or not"""
entered_label = instance.text.strip() entered_label = instance.text.strip()
addr_labels = [labels[0] for labels in kivy_helper_search.search_sql( addr_labels = [labels[0].decode("utf-8", "replace") for labels in kivy_helper_search.search_sql(
folder="addressbook")] folder="addressbook")]
if entered_label in addr_labels: if entered_label in addr_labels:
self.ids.label.error = True self.ids.label.error = True
@ -125,8 +125,13 @@ class SavedAddressDetailPopup(BoxLayout):
"""Checking address label is unique of not""" """Checking address label is unique of not"""
entered_label = str(instance.text.strip()) entered_label = str(instance.text.strip())
address_list = kivy_helper_search.search_sql(folder="addressbook") address_list = kivy_helper_search.search_sql(folder="addressbook")
addr_labels = [labels[0] for labels in address_list] addr_labels = [labels[0].decode("utf-8", "replace") for labels in address_list]
add_dict = dict(address_list) add_dict = {}
for row in address_list:
label, address = row
label = label.decode("utf-8", "replace")
address = address.decode("utf-8", "replace")
add_dict[label] = address
if self.address and entered_label in addr_labels \ if self.address and entered_label in addr_labels \
and self.address != add_dict[entered_label]: and self.address != add_dict[entered_label]:
self.ids.add_label.error = True self.ids.add_label.error = True

13
src/bitmessagekivy/kivy_helper_search.py
View File

@ -2,6 +2,7 @@
Sql queries for bitmessagekivy Sql queries for bitmessagekivy
""" """
from pybitmessage.helper_sql import sqlQuery from pybitmessage.helper_sql import sqlQuery
from dbcompat import dbstr
def search_sql( def search_sql(
@ -30,21 +31,21 @@ def search_sql(
if account is not None: if account is not None:
if xAddress == 'both': if xAddress == 'both':
sqlStatementParts.append("(fromaddress = ? OR toaddress = ?)") sqlStatementParts.append("(fromaddress = ? OR toaddress = ?)")
sqlArguments.append(account) sqlArguments.append(dbstr(account))
sqlArguments.append(account) sqlArguments.append(dbstr(account))
else: else:
sqlStatementParts.append(xAddress + " = ? ") sqlStatementParts.append(xAddress + " = ? ")
sqlArguments.append(account) sqlArguments.append(dbstr(account))
if folder != "addressbook": if folder != "addressbook":
if folder is not None: if folder is not None:
if folder == "new": if folder == "new":
folder = "inbox" folder = "inbox"
unreadOnly = True unreadOnly = True
sqlStatementParts.append("folder = ? ") sqlStatementParts.append("folder = ? ")
sqlArguments.append(folder) sqlArguments.append(dbstr(folder))
else: else:
sqlStatementParts.append("folder != ?") sqlStatementParts.append("folder != ?")
sqlArguments.append("trash") sqlArguments.append(dbstr("trash"))
if what is not None: if what is not None:
for colmns in where: for colmns in where:
if len(where) > 1: if len(where) > 1:
@ -54,7 +55,7 @@ def search_sql(
filter_col += " or %s LIKE ? )" % (colmns) filter_col += " or %s LIKE ? )" % (colmns)
else: else:
filter_col = "%s LIKE ?" % (colmns) filter_col = "%s LIKE ?" % (colmns)
sqlArguments.append(what) sqlArguments.append(dbstr(what))
sqlStatementParts.append(filter_col) sqlStatementParts.append(filter_col)
if unreadOnly: if unreadOnly:
sqlStatementParts.append("read = 0") sqlStatementParts.append("read = 0")

55
src/bitmessageqt/__init__.py
View File

@ -20,6 +20,7 @@ from six.moves import range as xrange
from unqstr import ustr, unic from unqstr import ustr, unic
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from PyQt4.QtNetwork import QLocalSocket, QLocalServer from PyQt4.QtNetwork import QLocalSocket, QLocalServer
from dbcompat import dbstr
import shared import shared
import state import state
@ -555,6 +556,8 @@ class MyForm(settingsmixin.SMainWindow):
"GROUP BY toaddress, folder") "GROUP BY toaddress, folder")
for row in queryreturn: for row in queryreturn:
toaddress, folder, cnt = row toaddress, folder, cnt = row
toaddress = toaddress.decode("utf-8", "replace")
folder = folder.decode("utf-8", "replace")
total += cnt total += cnt
if toaddress in db and folder in db[toaddress]: if toaddress in db and folder in db[toaddress]:
db[toaddress][folder] = cnt db[toaddress][folder] = cnt
@ -1047,6 +1050,8 @@ class MyForm(settingsmixin.SMainWindow):
normalUnread = {} normalUnread = {}
broadcastsUnread = {} broadcastsUnread = {}
for addr, fld, count in queryReturn: for addr, fld, count in queryReturn:
addr = addr.decode("utf-8", "replace")
fld = fld.decode("utf-8", "replace")
try: try:
normalUnread[addr][fld] = count normalUnread[addr][fld] = count
except KeyError: except KeyError:
@ -1066,8 +1071,10 @@ class MyForm(settingsmixin.SMainWindow):
queryReturn = sqlQuery( queryReturn = sqlQuery(
'SELECT fromaddress, folder, COUNT(msgid) AS cnt' 'SELECT fromaddress, folder, COUNT(msgid) AS cnt'
' FROM inbox WHERE read = 0 AND toaddress = ?' ' FROM inbox WHERE read = 0 AND toaddress = ?'
' GROUP BY fromaddress, folder', str_broadcast_subscribers) ' GROUP BY fromaddress, folder', dbstr(str_broadcast_subscribers))
for addr, fld, count in queryReturn: for addr, fld, count in queryReturn:
addr = addr.decode("utf-8", "replace")
fld = fld.decode("utf-8", "replace")
try: try:
broadcastsUnread[addr][fld] = count broadcastsUnread[addr][fld] = count
except KeyError: except KeyError:
@ -1246,7 +1253,14 @@ class MyForm(settingsmixin.SMainWindow):
xAddress, account, "sent", where, what, False) xAddress, account, "sent", where, what, False)
for row in queryreturn: for row in queryreturn:
self.addMessageListItemSent(tableWidget, *row) r = []
r.append(row[0].decode("utf-8", "replace")) # toaddress
r.append(row[1].decode("utf-8", "replace")) # fromaddress
r.append(row[2].decode("utf-8", "replace")) # subject
r.append(row[3].decode("utf-8", "replace")) # status
r.append(row[3]) # ackdata
r.append(row[4]) # lastactiontime
self.addMessageListItemSent(tableWidget, *r)
tableWidget.horizontalHeader().setSortIndicator( tableWidget.horizontalHeader().setSortIndicator(
3, QtCore.Qt.DescendingOrder) 3, QtCore.Qt.DescendingOrder)
@ -1287,6 +1301,10 @@ class MyForm(settingsmixin.SMainWindow):
for row in queryreturn: for row in queryreturn:
toAddress, fromAddress, subject, _, msgid, received, read = row toAddress, fromAddress, subject, _, msgid, received, read = row
toAddress = toAddress.decode("utf-8", "replace")
fromAddress = fromAddress.decode("utf-8", "replace")
subject = subject.decode("utf-8", "replace")
received = received.decode("utf-8", "replace")
self.addMessageListItemInbox( self.addMessageListItemInbox(
tableWidget, toAddress, fromAddress, subject, tableWidget, toAddress, fromAddress, subject,
msgid, received, read) msgid, received, read)
@ -1372,6 +1390,7 @@ class MyForm(settingsmixin.SMainWindow):
SELECT msgid, toaddress, read FROM inbox where folder='inbox' SELECT msgid, toaddress, read FROM inbox where folder='inbox'
''') ''')
for msgid, toAddress, read in queryreturn: for msgid, toAddress, read in queryreturn:
toAddress = toAddress.decode("utf-8", "replace")
if not read: if not read:
# increment the unread subscriptions if True (1) # increment the unread subscriptions if True (1)
@ -1450,7 +1469,7 @@ class MyForm(settingsmixin.SMainWindow):
# Adapters and converters for QT <-> sqlite # Adapters and converters for QT <-> sqlite
def sqlInit(self): def sqlInit(self):
register_adapter(QtCore.QByteArray, str) register_adapter(QtCore.QByteArray, bytes)
def indicatorInit(self): def indicatorInit(self):
""" """
@ -2018,6 +2037,8 @@ class MyForm(settingsmixin.SMainWindow):
queryreturn = sqlQuery('SELECT label, address FROM subscriptions WHERE enabled = 1') queryreturn = sqlQuery('SELECT label, address FROM subscriptions WHERE enabled = 1')
for row in queryreturn: for row in queryreturn:
label, address = row label, address = row
label = label.decode("utf-8", "replace")
address = address.decode("utf-8", "replace")
newRows[address] = [label, AccountMixin.SUBSCRIPTION] newRows[address] = [label, AccountMixin.SUBSCRIPTION]
# chans # chans
for address in config.addresses(True): for address in config.addresses(True):
@ -2028,6 +2049,8 @@ class MyForm(settingsmixin.SMainWindow):
queryreturn = sqlQuery('SELECT * FROM addressbook') queryreturn = sqlQuery('SELECT * FROM addressbook')
for row in queryreturn: for row in queryreturn:
label, address = row label, address = row
label = label.decode("utf-8", "replace")
address = address.decode("utf-8", "replace")
newRows[address] = [label, AccountMixin.NORMAL] newRows[address] = [label, AccountMixin.NORMAL]
completerList = [] completerList = []
@ -2272,10 +2295,11 @@ class MyForm(settingsmixin.SMainWindow):
subject=subject, message=message, encoding=encoding) subject=subject, message=message, encoding=encoding)
toLabel = '' toLabel = ''
queryreturn = sqlQuery('''select label from addressbook where address=?''', queryreturn = sqlQuery('''select label from addressbook where address=?''',
toAddress) dbstr(toAddress))
if queryreturn != []: if queryreturn != []:
for row in queryreturn: for row in queryreturn:
toLabel, = row toLabel, = row
toLabel = toLabel.decode("utf-8", "replace")
self.displayNewSentMessage( self.displayNewSentMessage(
toAddress, toLabel, fromAddress, subject, message, ackdata) toAddress, toLabel, fromAddress, subject, message, ackdata)
@ -2560,7 +2584,7 @@ class MyForm(settingsmixin.SMainWindow):
# Add to database (perhaps this should be separated from the MyForm class) # Add to database (perhaps this should be separated from the MyForm class)
sqlExecute( sqlExecute(
'''INSERT INTO subscriptions VALUES (?,?,?)''', '''INSERT INTO subscriptions VALUES (?,?,?)''',
label, address, True dbstr(label), dbstr(address), True
) )
self.rerenderMessagelistFromLabels() self.rerenderMessagelistFromLabels()
shared.reloadBroadcastSendersForWhichImWatching() shared.reloadBroadcastSendersForWhichImWatching()
@ -2923,6 +2947,7 @@ class MyForm(settingsmixin.SMainWindow):
if queryreturn != []: if queryreturn != []:
for row in queryreturn: for row in queryreturn:
messageText, = row messageText, = row
messageText = messageText.decode("utf-8", "replace")
lines = messageText.split('\n') lines = messageText.split('\n')
totalLines = len(lines) totalLines = len(lines)
@ -3046,6 +3071,7 @@ class MyForm(settingsmixin.SMainWindow):
if queryreturn != []: if queryreturn != []:
for row in queryreturn: for row in queryreturn:
messageAtCurrentInboxRow, = row messageAtCurrentInboxRow, = row
messageAtCurrentInboxRow = messageAtCurrentInboxRow.decode("utf-8", "replace")
acct.parseMessage( acct.parseMessage(
toAddressAtCurrentInboxRow, fromAddressAtCurrentInboxRow, toAddressAtCurrentInboxRow, fromAddressAtCurrentInboxRow,
tableWidget.item(currentInboxRow, 2).subject, tableWidget.item(currentInboxRow, 2).subject,
@ -3157,13 +3183,13 @@ class MyForm(settingsmixin.SMainWindow):
currentInboxRow, 0).data(QtCore.Qt.UserRole) currentInboxRow, 0).data(QtCore.Qt.UserRole)
# Let's make sure that it isn't already in the address book # Let's make sure that it isn't already in the address book
queryreturn = sqlQuery('''select * from blacklist where address=?''', queryreturn = sqlQuery('''select * from blacklist where address=?''',
addressAtCurrentInboxRow) dbstr(addressAtCurrentInboxRow))
if queryreturn == []: if queryreturn == []:
label = "\"" + tableWidget.item(currentInboxRow, 2).subject + "\" in " + config.get( label = "\"" + tableWidget.item(currentInboxRow, 2).subject + "\" in " + config.get(
recipientAddress, "label") recipientAddress, "label")
sqlExecute('''INSERT INTO blacklist VALUES (?,?, ?)''', sqlExecute('''INSERT INTO blacklist VALUES (?,?, ?)''',
label, dbstr(label),
addressAtCurrentInboxRow, True) dbstr(addressAtCurrentInboxRow), True)
self.ui.blackwhitelist.rerenderBlackWhiteList() self.ui.blackwhitelist.rerenderBlackWhiteList()
self.updateStatusBar(_translate( self.updateStatusBar(_translate(
"MainWindow", "MainWindow",
@ -3277,6 +3303,7 @@ class MyForm(settingsmixin.SMainWindow):
if queryreturn != []: if queryreturn != []:
for row in queryreturn: for row in queryreturn:
message, = row message, = row
message = message.decode("utf-8", "replace")
defaultFilename = "".join(x for x in subjectAtCurrentInboxRow if x.isalnum()) + '.txt' defaultFilename = "".join(x for x in subjectAtCurrentInboxRow if x.isalnum()) + '.txt'
filename = QtGui.QFileDialog.getSaveFileName( filename = QtGui.QFileDialog.getSaveFileName(
@ -3288,7 +3315,7 @@ class MyForm(settingsmixin.SMainWindow):
return return
try: try:
f = open(filename, 'w') f = open(filename, 'w')
f.write(message) f.write(message.encode("utf-8", "replace"))
f.close() f.close()
except Exception: except Exception:
logger.exception('Message not saved', exc_info=True) logger.exception('Message not saved', exc_info=True)
@ -3349,7 +3376,7 @@ class MyForm(settingsmixin.SMainWindow):
0].row() 0].row()
item = self.ui.tableWidgetAddressBook.item(currentRow, 0) item = self.ui.tableWidgetAddressBook.item(currentRow, 0)
sqlExecute( sqlExecute(
'DELETE FROM addressbook WHERE address=?', item.address) 'DELETE FROM addressbook WHERE address=?', dbstr(item.address))
self.ui.tableWidgetAddressBook.removeRow(currentRow) self.ui.tableWidgetAddressBook.removeRow(currentRow)
self.rerenderMessagelistFromLabels() self.rerenderMessagelistFromLabels()
self.rerenderMessagelistToLabels() self.rerenderMessagelistToLabels()
@ -3449,7 +3476,7 @@ class MyForm(settingsmixin.SMainWindow):
return return
address = self.getCurrentAccount() address = self.getCurrentAccount()
sqlExecute('''DELETE FROM subscriptions WHERE address=?''', sqlExecute('''DELETE FROM subscriptions WHERE address=?''',
address) dbstr(address))
self.rerenderTabTreeSubscriptions() self.rerenderTabTreeSubscriptions()
self.rerenderMessagelistFromLabels() self.rerenderMessagelistFromLabels()
self.rerenderAddressBook() self.rerenderAddressBook()
@ -3464,7 +3491,7 @@ class MyForm(settingsmixin.SMainWindow):
address = self.getCurrentAccount() address = self.getCurrentAccount()
sqlExecute( sqlExecute(
'''update subscriptions set enabled=1 WHERE address=?''', '''update subscriptions set enabled=1 WHERE address=?''',
address) dbstr(address))
account = self.getCurrentItem() account = self.getCurrentItem()
account.setEnabled(True) account.setEnabled(True)
self.rerenderAddressBook() self.rerenderAddressBook()
@ -3474,7 +3501,7 @@ class MyForm(settingsmixin.SMainWindow):
address = self.getCurrentAccount() address = self.getCurrentAccount()
sqlExecute( sqlExecute(
'''update subscriptions set enabled=0 WHERE address=?''', '''update subscriptions set enabled=0 WHERE address=?''',
address) dbstr(address))
account = self.getCurrentItem() account = self.getCurrentItem()
account.setEnabled(False) account.setEnabled(False)
self.rerenderAddressBook() self.rerenderAddressBook()
@ -4023,6 +4050,7 @@ class MyForm(settingsmixin.SMainWindow):
queryreturn = sqlQuery('''SELECT status FROM sent where ackdata=?''', ackData) queryreturn = sqlQuery('''SELECT status FROM sent where ackdata=?''', ackData)
for row in queryreturn: for row in queryreturn:
status, = row status, = row
status = status.decode("utf-8", "replace")
if status == 'toodifficult': if status == 'toodifficult':
self.popMenuSent.addAction(self.actionForceSend) self.popMenuSent.addAction(self.actionForceSend)
@ -4127,6 +4155,7 @@ class MyForm(settingsmixin.SMainWindow):
try: try:
message = queryreturn[-1][0] message = queryreturn[-1][0]
message = message.decode("utf-8", "replace")
except NameError: except NameError:
message = "" message = ""
except IndexError: except IndexError:

29
src/bitmessageqt/account.py
View File

@ -16,6 +16,7 @@ import time
from unqstr import ustr from unqstr import ustr
from PyQt4 import QtGui from PyQt4 import QtGui
from dbcompat import dbstr
import queues import queues
from addresses import decodeAddress from addresses import decodeAddress
@ -39,6 +40,8 @@ def getSortedSubscriptions(count=False):
ret = {} ret = {}
for row in queryreturn: for row in queryreturn:
label, address, enabled = row label, address, enabled = row
label = label.decode("utf-8", "replace")
address = address.decode("utf-8", "replace")
ret[address] = {} ret[address] = {}
ret[address]["inbox"] = {} ret[address]["inbox"] = {}
ret[address]["inbox"]['label'] = label ret[address]["inbox"]['label'] = label
@ -48,9 +51,11 @@ def getSortedSubscriptions(count=False):
queryreturn = sqlQuery('''SELECT fromaddress, folder, count(msgid) as cnt queryreturn = sqlQuery('''SELECT fromaddress, folder, count(msgid) as cnt
FROM inbox, subscriptions ON subscriptions.address = inbox.fromaddress FROM inbox, subscriptions ON subscriptions.address = inbox.fromaddress
WHERE read = 0 AND toaddress = ? WHERE read = 0 AND toaddress = ?
GROUP BY inbox.fromaddress, folder''', str_broadcast_subscribers) GROUP BY inbox.fromaddress, folder''', dbstr(str_broadcast_subscribers))
for row in queryreturn: for row in queryreturn:
address, folder, cnt = row address, folder, cnt = row
address = address.decode("utf-8", "replace")
folder = folder.decode("utf-8", "replace")
if folder not in ret[address]: if folder not in ret[address]:
ret[address][folder] = { ret[address][folder] = {
'label': ret[address]['inbox']['label'], 'label': ret[address]['inbox']['label'],
@ -101,7 +106,7 @@ class AccountColor(AccountMixin): # pylint: disable=too-few-public-methods
elif config.safeGetBoolean(self.address, 'chan'): elif config.safeGetBoolean(self.address, 'chan'):
self.type = AccountMixin.CHAN self.type = AccountMixin.CHAN
elif sqlQuery( elif sqlQuery(
'''select label from subscriptions where address=?''', self.address): '''select label from subscriptions where address=?''', dbstr(self.address)):
self.type = AccountMixin.SUBSCRIPTION self.type = AccountMixin.SUBSCRIPTION
else: else:
self.type = AccountMixin.NORMAL self.type = AccountMixin.NORMAL
@ -124,7 +129,7 @@ class BMAccount(object):
self.type = AccountMixin.BROADCAST self.type = AccountMixin.BROADCAST
else: else:
queryreturn = sqlQuery( queryreturn = sqlQuery(
'''select label from subscriptions where address=?''', self.address) '''select label from subscriptions where address=?''', dbstr(self.address))
if queryreturn: if queryreturn:
self.type = AccountMixin.SUBSCRIPTION self.type = AccountMixin.SUBSCRIPTION
@ -136,16 +141,18 @@ class BMAccount(object):
address = ustr(address) address = ustr(address)
label = config.safeGet(address, 'label', address) label = config.safeGet(address, 'label', address)
queryreturn = sqlQuery( queryreturn = sqlQuery(
'''select label from addressbook where address=?''', address) '''select label from addressbook where address=?''', dbstr(address))
if queryreturn != []: if queryreturn != []:
for row in queryreturn: for row in queryreturn:
label, = row label, = row
label = label.decode("utf-8", "replace")
else: else:
queryreturn = sqlQuery( queryreturn = sqlQuery(
'''select label from subscriptions where address=?''', address) '''select label from subscriptions where address=?''', dbstr(address))
if queryreturn != []: if queryreturn != []:
for row in queryreturn: for row in queryreturn:
label, = row label, = row
label = label.decode("utf-8", "replace")
return label return label
def parseMessage(self, toAddress, fromAddress, subject, message): def parseMessage(self, toAddress, fromAddress, subject, message):
@ -202,18 +209,18 @@ class GatewayAccount(BMAccount):
sqlExecute( sqlExecute(
'''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)''', '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)''',
'', '',
self.toAddress, dbstr(self.toAddress),
ripe, ripe,
self.fromAddress, dbstr(self.fromAddress),
self.subject, dbstr(self.subject),
self.message, dbstr(self.message),
ackdata, ackdata,
int(time.time()), # sentTime (this will never change) int(time.time()), # sentTime (this will never change)
int(time.time()), # lastActionTime int(time.time()), # lastActionTime
0, # sleepTill time. This will get set when the POW gets done. 0, # sleepTill time. This will get set when the POW gets done.
'msgqueued', dbstr('msgqueued'),
0, # retryNumber 0, # retryNumber
'sent', # folder dbstr('sent'), # folder
2, # encodingtype 2, # encodingtype
# not necessary to have a TTL higher than 2 days # not necessary to have a TTL higher than 2 days
min(config.getint('bitmessagesettings', 'ttl'), 86400 * 2) min(config.getint('bitmessagesettings', 'ttl'), 86400 * 2)

23
src/bitmessageqt/blacklist.py
View File

@ -1,5 +1,6 @@
from unqstr import ustr, unic from unqstr import ustr, unic
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from dbcompat import dbstr
from bitmessageqt import widgets from bitmessageqt import widgets
from addresses import addBMIfNotPresent from addresses import addBMIfNotPresent
@ -65,7 +66,7 @@ class Blacklist(QtGui.QWidget, RetranslateMixin):
# First we must check to see if the address is already in the # First we must check to see if the address is already in the
# address book. The user cannot add it again or else it will # address book. The user cannot add it again or else it will
# cause problems when updating and deleting the entry. # cause problems when updating and deleting the entry.
t = (address,) t = (dbstr(address),)
if config.get('bitmessagesettings', 'blackwhitelist') == 'black': if config.get('bitmessagesettings', 'blackwhitelist') == 'black':
sql = '''select * from blacklist where address=?''' sql = '''select * from blacklist where address=?'''
else: else:
@ -83,7 +84,7 @@ class Blacklist(QtGui.QWidget, RetranslateMixin):
QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled) QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
self.tableWidgetBlacklist.setItem(0, 1, newItem) self.tableWidgetBlacklist.setItem(0, 1, newItem)
self.tableWidgetBlacklist.setSortingEnabled(True) self.tableWidgetBlacklist.setSortingEnabled(True)
t = (ustr(self.NewBlacklistDialogInstance.lineEditLabel.text()), address, True) t = (dbstr(self.NewBlacklistDialogInstance.lineEditLabel.text()), dbstr(address), True)
if config.get('bitmessagesettings', 'blackwhitelist') == 'black': if config.get('bitmessagesettings', 'blackwhitelist') == 'black':
sql = '''INSERT INTO blacklist VALUES (?,?,?)''' sql = '''INSERT INTO blacklist VALUES (?,?,?)'''
else: else:
@ -112,10 +113,10 @@ class Blacklist(QtGui.QWidget, RetranslateMixin):
if isinstance(addressitem, QtGui.QTableWidgetItem): if isinstance(addressitem, QtGui.QTableWidgetItem):
if self.radioButtonBlacklist.isChecked(): if self.radioButtonBlacklist.isChecked():
sqlExecute('''UPDATE blacklist SET label=? WHERE address=?''', sqlExecute('''UPDATE blacklist SET label=? WHERE address=?''',
ustr(item.text()), ustr(addressitem.text())) dbstr(item.text()), dbstr(addressitem.text()))
else: else:
sqlExecute('''UPDATE whitelist SET label=? WHERE address=?''', sqlExecute('''UPDATE whitelist SET label=? WHERE address=?''',
ustr(item.text()), ustr(addressitem.text())) dbstr(item.text()), dbstr(addressitem.text()))
def init_blacklist_popup_menu(self, connectSignal=True): def init_blacklist_popup_menu(self, connectSignal=True):
# Popup menu for the Blacklist page # Popup menu for the Blacklist page
@ -172,6 +173,8 @@ class Blacklist(QtGui.QWidget, RetranslateMixin):
self.tableWidgetBlacklist.setSortingEnabled(False) self.tableWidgetBlacklist.setSortingEnabled(False)
for row in queryreturn: for row in queryreturn:
label, address, enabled = row label, address, enabled = row
label = label.decode("utf-8", "replace")
address = address.decode("utf-8", "replace")
self.tableWidgetBlacklist.insertRow(0) self.tableWidgetBlacklist.insertRow(0)
newItem = QtGui.QTableWidgetItem(unic(ustr(label))) newItem = QtGui.QTableWidgetItem(unic(ustr(label)))
if not enabled: if not enabled:
@ -199,11 +202,11 @@ class Blacklist(QtGui.QWidget, RetranslateMixin):
if config.get('bitmessagesettings', 'blackwhitelist') == 'black': if config.get('bitmessagesettings', 'blackwhitelist') == 'black':
sqlExecute( sqlExecute(
'''DELETE FROM blacklist WHERE label=? AND address=?''', '''DELETE FROM blacklist WHERE label=? AND address=?''',
ustr(labelAtCurrentRow), ustr(addressAtCurrentRow)) dbstr(labelAtCurrentRow), dbstr(addressAtCurrentRow))
else: else:
sqlExecute( sqlExecute(
'''DELETE FROM whitelist WHERE label=? AND address=?''', '''DELETE FROM whitelist WHERE label=? AND address=?''',
ustr(labelAtCurrentRow), ustr(addressAtCurrentRow)) dbstr(labelAtCurrentRow), dbstr(addressAtCurrentRow))
self.tableWidgetBlacklist.removeRow(currentRow) self.tableWidgetBlacklist.removeRow(currentRow)
def on_action_BlacklistClipboard(self): def on_action_BlacklistClipboard(self):
@ -228,11 +231,11 @@ class Blacklist(QtGui.QWidget, RetranslateMixin):
if config.get('bitmessagesettings', 'blackwhitelist') == 'black': if config.get('bitmessagesettings', 'blackwhitelist') == 'black':
sqlExecute( sqlExecute(
'''UPDATE blacklist SET enabled=1 WHERE address=?''', '''UPDATE blacklist SET enabled=1 WHERE address=?''',
ustr(addressAtCurrentRow)) dbstr(addressAtCurrentRow))
else: else:
sqlExecute( sqlExecute(
'''UPDATE whitelist SET enabled=1 WHERE address=?''', '''UPDATE whitelist SET enabled=1 WHERE address=?''',
ustr(addressAtCurrentRow)) dbstr(addressAtCurrentRow))
def on_action_BlacklistDisable(self): def on_action_BlacklistDisable(self):
currentRow = self.tableWidgetBlacklist.currentRow() currentRow = self.tableWidgetBlacklist.currentRow()
@ -244,10 +247,10 @@ class Blacklist(QtGui.QWidget, RetranslateMixin):
currentRow, 1).setTextColor(QtGui.QColor(128, 128, 128)) currentRow, 1).setTextColor(QtGui.QColor(128, 128, 128))
if config.get('bitmessagesettings', 'blackwhitelist') == 'black': if config.get('bitmessagesettings', 'blackwhitelist') == 'black':
sqlExecute( sqlExecute(
'''UPDATE blacklist SET enabled=0 WHERE address=?''', ustr(addressAtCurrentRow)) '''UPDATE blacklist SET enabled=0 WHERE address=?''', dbstr(addressAtCurrentRow))
else: else:
sqlExecute( sqlExecute(
'''UPDATE whitelist SET enabled=0 WHERE address=?''', ustr(addressAtCurrentRow)) '''UPDATE whitelist SET enabled=0 WHERE address=?''', dbstr(addressAtCurrentRow))
def on_action_BlacklistSetAvatar(self): def on_action_BlacklistSetAvatar(self):
self.window().on_action_SetAvatar(self.tableWidgetBlacklist) self.window().on_action_SetAvatar(self.tableWidgetBlacklist)

24
src/bitmessageqt/foldertree.py
View File

@ -8,6 +8,7 @@ from cgi import escape
from unqstr import ustr, unic from unqstr import ustr, unic
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from dbcompat import dbstr
from bmconfigparser import config from bmconfigparser import config
from helper_sql import sqlExecute, sqlQuery from helper_sql import sqlExecute, sqlQuery
@ -112,7 +113,7 @@ class AccountMixin(object):
elif config.safeGetBoolean(self.address, 'mailinglist'): elif config.safeGetBoolean(self.address, 'mailinglist'):
self.type = self.MAILINGLIST self.type = self.MAILINGLIST
elif sqlQuery( elif sqlQuery(
'''select label from subscriptions where address=?''', self.address): '''select label from subscriptions where address=?''', dbstr(self.address)):
self.type = AccountMixin.SUBSCRIPTION self.type = AccountMixin.SUBSCRIPTION
else: else:
self.type = self.NORMAL self.type = self.NORMAL
@ -129,15 +130,15 @@ class AccountMixin(object):
config.get(self.address, 'label'))) config.get(self.address, 'label')))
except Exception: except Exception:
queryreturn = sqlQuery( queryreturn = sqlQuery(
'''select label from addressbook where address=?''', self.address) '''select label from addressbook where address=?''', dbstr(self.address))
elif self.type == AccountMixin.SUBSCRIPTION: elif self.type == AccountMixin.SUBSCRIPTION:
queryreturn = sqlQuery( queryreturn = sqlQuery(
'''select label from subscriptions where address=?''', self.address) '''select label from subscriptions where address=?''', dbstr(self.address))
if queryreturn is not None: if queryreturn is not None:
if queryreturn != []: if queryreturn != []:
for row in queryreturn: for row in queryreturn:
retval, = row retval, = row
retval = unic(ustr(retval)) retval = unic(ustr(retval))
elif self.address is None or self.type == AccountMixin.ALL: elif self.address is None or self.type == AccountMixin.ALL:
return unic(_translate("MainWindow", "All accounts")) return unic(_translate("MainWindow", "All accounts"))
@ -306,7 +307,7 @@ class Ui_SubscriptionWidget(Ui_AddressWidget):
def _getLabel(self): def _getLabel(self):
queryreturn = sqlQuery( queryreturn = sqlQuery(
'''select label from subscriptions where address=?''', self.address) '''select label from subscriptions where address=?''', dbstr(self.address))
if queryreturn != []: if queryreturn != []:
for row in queryreturn: for row in queryreturn:
retval, = row retval, = row
@ -328,7 +329,7 @@ class Ui_SubscriptionWidget(Ui_AddressWidget):
label = unic(ustr(value)) label = unic(ustr(value))
sqlExecute( sqlExecute(
'''UPDATE subscriptions SET label=? WHERE address=?''', '''UPDATE subscriptions SET label=? WHERE address=?''',
label, self.address) dbstr(label), dbstr(self.address))
return super(Ui_SubscriptionWidget, self).setData(column, role, value) return super(Ui_SubscriptionWidget, self).setData(column, role, value)
@ -410,13 +411,14 @@ class MessageList_AddressWidget(BMAddressWidget):
config.get(self.address, 'label'))) config.get(self.address, 'label')))
except: except:
queryreturn = sqlQuery( queryreturn = sqlQuery(
'''select label from addressbook where address=?''', self.address) '''select label from addressbook where address=?''', dbstr(self.address))
elif self.type == AccountMixin.SUBSCRIPTION: elif self.type == AccountMixin.SUBSCRIPTION:
queryreturn = sqlQuery( queryreturn = sqlQuery(
'''select label from subscriptions where address=?''', self.address) '''select label from subscriptions where address=?''', dbstr(self.address))
if queryreturn: if queryreturn:
for row in queryreturn: for row in queryreturn:
newLabel = unic(ustr(row[0])) newLabel = row[0]
newLabel = unic(ustr(newLabel))
self.label = newLabel self.label = newLabel
@ -523,9 +525,9 @@ class Ui_AddressBookWidgetItem(BMAddressWidget):
config.set(self.address, 'label', self.label) config.set(self.address, 'label', self.label)
config.save() config.save()
except: except:
sqlExecute('''UPDATE addressbook set label=? WHERE address=?''', self.label, self.address) sqlExecute('''UPDATE addressbook set label=? WHERE address=?''', dbstr(self.label), dbstr(self.address))
elif self.type == AccountMixin.SUBSCRIPTION: elif self.type == AccountMixin.SUBSCRIPTION:
sqlExecute('''UPDATE subscriptions set label=? WHERE address=?''', self.label, self.address) sqlExecute('''UPDATE subscriptions set label=? WHERE address=?''', dbstr(self.label), dbstr(self.address))
else: else:
pass pass
return super(Ui_AddressBookWidgetItem, self).setData(role, value) return super(Ui_AddressBookWidgetItem, self).setData(role, value)

5
src/bitmessageqt/safehtmlparser.py
View File

@ -123,7 +123,10 @@ class SafeHTMLParser(HTMLParser):
self.sanitised += "&" + name + ";" self.sanitised += "&" + name + ";"
def feed(self, data): def feed(self, data):
data = unic(ustr(data)) try:
data = unic(ustr(data))
except TypeError:
pass
HTMLParser.feed(self, data) HTMLParser.feed(self, data)
tmp = SafeHTMLParser.replace_pre(data) tmp = SafeHTMLParser.replace_pre(data)
tmp = self.uriregex1.sub(r'<a href="\1">\1</a>', tmp) tmp = self.uriregex1.sub(r'<a href="\1">\1</a>', tmp)

7
src/bitmessageqt/support.py
View File

@ -8,6 +8,7 @@ import time
from unqstr import ustr, unic from unqstr import ustr, unic
from PyQt4 import QtCore from PyQt4 import QtCore
from dbcompat import dbstr
from bitmessageqt import account from bitmessageqt import account
import defaults import defaults
@ -68,12 +69,12 @@ Connected hosts: {}
def checkAddressBook(myapp): def checkAddressBook(myapp):
sqlExecute('DELETE from addressbook WHERE address=?', OLD_SUPPORT_ADDRESS) sqlExecute('DELETE from addressbook WHERE address=?', dbstr(OLD_SUPPORT_ADDRESS))
queryreturn = sqlQuery('SELECT * FROM addressbook WHERE address=?', SUPPORT_ADDRESS) queryreturn = sqlQuery('SELECT * FROM addressbook WHERE address=?', dbstr(SUPPORT_ADDRESS))
if queryreturn == []: if queryreturn == []:
sqlExecute( sqlExecute(
'INSERT INTO addressbook VALUES (?,?)', 'INSERT INTO addressbook VALUES (?,?)',
ustr(SUPPORT_LABEL), SUPPORT_ADDRESS) dbstr(SUPPORT_LABEL), dbstr(SUPPORT_ADDRESS))
myapp.rerenderAddressBook() myapp.rerenderAddressBook()

33
src/class_objectProcessor.py
View File

@ -33,6 +33,7 @@ from helper_sql import (
from network import knownnodes from network import knownnodes
from network.node import Peer from network.node import Peer
from tr import _translate from tr import _translate
from dbcompat import dbstr
logger = logging.getLogger('default') logger = logging.getLogger('default')
@ -330,19 +331,19 @@ class objectProcessor(threading.Thread):
queryreturn = sqlQuery( queryreturn = sqlQuery(
"SELECT usedpersonally FROM pubkeys WHERE address=?" "SELECT usedpersonally FROM pubkeys WHERE address=?"
" AND usedpersonally='yes'", address) " AND usedpersonally='yes'", dbstr(address))
# if this pubkey is already in our database and if we have # if this pubkey is already in our database and if we have
# used it personally: # used it personally:
if queryreturn != []: if queryreturn != []:
logger.info( logger.info(
'We HAVE used this pubkey personally. Updating time.') 'We HAVE used this pubkey personally. Updating time.')
t = (address, addressVersion, dataToStore, t = (dbstr(address), addressVersion, dataToStore,
int(time.time()), 'yes') int(time.time()), 'yes')
else: else:
logger.info( logger.info(
'We have NOT used this pubkey personally. Inserting' 'We have NOT used this pubkey personally. Inserting'
' in database.') ' in database.')
t = (address, addressVersion, dataToStore, t = (dbstr(address), addressVersion, dataToStore,
int(time.time()), 'no') int(time.time()), 'no')
sqlExecute('''INSERT INTO pubkeys VALUES (?,?,?,?,?)''', *t) sqlExecute('''INSERT INTO pubkeys VALUES (?,?,?,?,?)''', *t)
self.possibleNewPubkey(address) self.possibleNewPubkey(address)
@ -392,20 +393,20 @@ class objectProcessor(threading.Thread):
address = encodeAddress(addressVersion, streamNumber, ripe) address = encodeAddress(addressVersion, streamNumber, ripe)
queryreturn = sqlQuery( queryreturn = sqlQuery(
"SELECT usedpersonally FROM pubkeys WHERE address=?" "SELECT usedpersonally FROM pubkeys WHERE address=?"
" AND usedpersonally='yes'", address) " AND usedpersonally='yes'", dbstr(address))
# if this pubkey is already in our database and if we have # if this pubkey is already in our database and if we have
# used it personally: # used it personally:
if queryreturn != []: if queryreturn != []:
logger.info( logger.info(
'We HAVE used this pubkey personally. Updating time.') 'We HAVE used this pubkey personally. Updating time.')
t = (address, addressVersion, dataToStore, t = (dbstr(address), addressVersion, dataToStore,
int(time.time()), 'yes') int(time.time()), dbstr('yes'))
else: else:
logger.info( logger.info(
'We have NOT used this pubkey personally. Inserting' 'We have NOT used this pubkey personally. Inserting'
' in database.') ' in database.')
t = (address, addressVersion, dataToStore, t = (dbstr(address), addressVersion, dataToStore,
int(time.time()), 'no') int(time.time()), dbstr('no'))
sqlExecute('''INSERT INTO pubkeys VALUES (?,?,?,?,?)''', *t) sqlExecute('''INSERT INTO pubkeys VALUES (?,?,?,?,?)''', *t)
self.possibleNewPubkey(address) self.possibleNewPubkey(address)
@ -594,11 +595,11 @@ class objectProcessor(threading.Thread):
# person. # person.
sqlExecute( sqlExecute(
'''INSERT INTO pubkeys VALUES (?,?,?,?,?)''', '''INSERT INTO pubkeys VALUES (?,?,?,?,?)''',
fromAddress, dbstr(fromAddress),
sendersAddressVersionNumber, sendersAddressVersionNumber,
decryptedData[:endOfThePublicKeyPosition], decryptedData[:endOfThePublicKeyPosition],
int(time.time()), int(time.time()),
'yes') dbstr('yes'))
# Check to see whether we happen to be awaiting this # Check to see whether we happen to be awaiting this
# pubkey in order to send a message. If we are, it will do the POW # pubkey in order to send a message. If we are, it will do the POW
@ -635,7 +636,7 @@ class objectProcessor(threading.Thread):
'bitmessagesettings', 'blackwhitelist') == 'black': 'bitmessagesettings', 'blackwhitelist') == 'black':
queryreturn = sqlQuery( queryreturn = sqlQuery(
"SELECT label FROM blacklist where address=? and enabled='1'", "SELECT label FROM blacklist where address=? and enabled='1'",
fromAddress) dbstr(fromAddress))
if queryreturn != []: if queryreturn != []:
logger.info('Message ignored because address is in blacklist.') logger.info('Message ignored because address is in blacklist.')
@ -643,7 +644,7 @@ class objectProcessor(threading.Thread):
else: # We're using a whitelist else: # We're using a whitelist
queryreturn = sqlQuery( queryreturn = sqlQuery(
"SELECT label FROM whitelist where address=? and enabled='1'", "SELECT label FROM whitelist where address=? and enabled='1'",
fromAddress) dbstr(fromAddress))
if queryreturn == []: if queryreturn == []:
logger.info( logger.info(
'Message ignored because address not in whitelist.') 'Message ignored because address not in whitelist.')
@ -932,11 +933,11 @@ class objectProcessor(threading.Thread):
# Let's store the public key in case we want to reply to this person. # Let's store the public key in case we want to reply to this person.
sqlExecute('''INSERT INTO pubkeys VALUES (?,?,?,?,?)''', sqlExecute('''INSERT INTO pubkeys VALUES (?,?,?,?,?)''',
fromAddress, dbstr(fromAddress),
sendersAddressVersion, dbstr(sendersAddressVersion),
decryptedData[:endOfPubkeyPosition], decryptedData[:endOfPubkeyPosition],
int(time.time()), int(time.time()),
'yes') dbstr('yes'))
# Check to see whether we happen to be awaiting this # Check to see whether we happen to be awaiting this
# pubkey in order to send a message. If we are, it will do the POW # pubkey in order to send a message. If we are, it will do the POW
@ -1018,7 +1019,7 @@ class objectProcessor(threading.Thread):
"UPDATE sent SET status='doingmsgpow', retrynumber=0" "UPDATE sent SET status='doingmsgpow', retrynumber=0"
" WHERE toaddress=?" " WHERE toaddress=?"
" AND (status='awaitingpubkey' OR status='doingpubkeypow')" " AND (status='awaitingpubkey' OR status='doingpubkeypow')"
" AND folder='sent'", address) " AND folder='sent'", dbstr(address))
queues.workerQueue.put(('sendmessage', '')) queues.workerQueue.put(('sendmessage', ''))
@staticmethod @staticmethod

5
src/class_singleCleaner.py
View File

@ -29,6 +29,7 @@ from bmconfigparser import config
from helper_sql import sqlExecute, sqlQuery from helper_sql import sqlExecute, sqlQuery
from network import connectionpool, knownnodes, StoppableThread from network import connectionpool, knownnodes, StoppableThread
from tr import _translate from tr import _translate
from dbcompat import dbstr
#: Equals 4 weeks. You could make this longer if you want #: Equals 4 weeks. You could make this longer if you want
@ -99,6 +100,8 @@ class singleCleaner(StoppableThread):
tick - state.maximumLengthOfTimeToBotherResendingMessages tick - state.maximumLengthOfTimeToBotherResendingMessages
) )
for toAddress, ackData, status in queryreturn: for toAddress, ackData, status in queryreturn:
toAddress = toAddress.decode("utf-8", "replace")
status = status.decode("utf-8", "replace")
if status == 'awaitingpubkey': if status == 'awaitingpubkey':
self.resendPubkeyRequest(toAddress) self.resendPubkeyRequest(toAddress)
elif status == 'msgsent': elif status == 'msgsent':
@ -168,7 +171,7 @@ class singleCleaner(StoppableThread):
)) ))
sqlExecute( sqlExecute(
"UPDATE sent SET status = 'msgqueued'" "UPDATE sent SET status = 'msgqueued'"
" WHERE toaddress = ? AND folder = 'sent'", address) " WHERE toaddress = ? AND folder = 'sent'", dbstr(address))
queues.workerQueue.put(('sendmessage', '')) queues.workerQueue.put(('sendmessage', ''))
def resendMsg(self, ackdata): def resendMsg(self, ackdata):

36
src/class_singleWorker.py
View File

@ -31,6 +31,7 @@ from helper_sql import sqlExecute, sqlQuery
from network import knownnodes, StoppableThread from network import knownnodes, StoppableThread
from six.moves import configparser, queue from six.moves import configparser, queue
from six.moves.reprlib import repr from six.moves.reprlib import repr
from dbcompat import dbstr
def sizeof_fmt(num, suffix='h/s'): def sizeof_fmt(num, suffix='h/s'):
@ -74,6 +75,7 @@ class singleWorker(StoppableThread):
'''SELECT DISTINCT toaddress FROM sent''' '''SELECT DISTINCT toaddress FROM sent'''
''' WHERE (status='awaitingpubkey' AND folder='sent')''') ''' WHERE (status='awaitingpubkey' AND folder='sent')''')
for toAddress, in queryreturn: for toAddress, in queryreturn:
toAddress = toAddress.decode("utf-8", "replace")
toAddressVersionNumber, toStreamNumber, toRipe = \ toAddressVersionNumber, toStreamNumber, toRipe = \
decodeAddress(toAddress)[1:] decodeAddress(toAddress)[1:]
if toAddressVersionNumber <= 3: if toAddressVersionNumber <= 3:
@ -535,10 +537,13 @@ class singleWorker(StoppableThread):
queryreturn = sqlQuery( queryreturn = sqlQuery(
'''SELECT fromaddress, subject, message, ''' '''SELECT fromaddress, subject, message, '''
''' ackdata, ttl, encodingtype FROM sent ''' ''' ackdata, ttl, encodingtype FROM sent '''
''' WHERE status=? and folder='sent' ''', 'broadcastqueued') ''' WHERE status=? and folder='sent' ''', dbstr('broadcastqueued'))
for row in queryreturn: for row in queryreturn:
fromaddress, subject, body, ackdata, TTL, encoding = row fromaddress, subject, body, ackdata, TTL, encoding = row
fromaddress = fromaddress.decode("utf-8", "replace")
subject = subject.decode("utf-8", "replace")
body = body.decode("utf-8", "replace")
# status # status
_, addressVersionNumber, streamNumber, ripe = \ _, addressVersionNumber, streamNumber, ripe = \
decodeAddress(fromaddress) decodeAddress(fromaddress)
@ -707,7 +712,7 @@ class singleWorker(StoppableThread):
sqlExecute( sqlExecute(
'''UPDATE sent SET msgid=?, status=?, lastactiontime=? ''' '''UPDATE sent SET msgid=?, status=?, lastactiontime=? '''
''' WHERE ackdata=? AND folder='sent' ''', ''' WHERE ackdata=? AND folder='sent' ''',
inventoryHash, 'broadcastsent', int(time.time()), ackdata inventoryHash, dbstr('broadcastsent'), int(time.time()), ackdata
) )
def sendMsg(self): def sendMsg(self):
@ -727,6 +732,11 @@ class singleWorker(StoppableThread):
for row in queryreturn: for row in queryreturn:
toaddress, fromaddress, subject, message, \ toaddress, fromaddress, subject, message, \
ackdata, status, TTL, retryNumber, encoding = row ackdata, status, TTL, retryNumber, encoding = row
toaddress = toaddress.decode("utf-8", "replace")
fromaddress = fromaddress.decode("utf-8", "replace")
subject = subject.decode("utf-8", "replace")
message = message.decode("utf-8", "replace")
status = status.decode("utf-8", "replace")
# toStatus # toStatus
_, toAddressVersionNumber, toStreamNumber, toRipe = \ _, toAddressVersionNumber, toStreamNumber, toRipe = \
decodeAddress(toaddress) decodeAddress(toaddress)
@ -756,7 +766,7 @@ class singleWorker(StoppableThread):
if not sqlExecute( if not sqlExecute(
'''UPDATE sent SET status='doingmsgpow' ''' '''UPDATE sent SET status='doingmsgpow' '''
''' WHERE toaddress=? AND status='msgqueued' AND folder='sent' ''', ''' WHERE toaddress=? AND status='msgqueued' AND folder='sent' ''',
toaddress dbstr(toaddress)
): ):
continue continue
status = 'doingmsgpow' status = 'doingmsgpow'
@ -764,7 +774,7 @@ class singleWorker(StoppableThread):
# Let's see if we already have the pubkey in our pubkeys table # Let's see if we already have the pubkey in our pubkeys table
queryreturn = sqlQuery( queryreturn = sqlQuery(
'''SELECT address FROM pubkeys WHERE address=?''', '''SELECT address FROM pubkeys WHERE address=?''',
toaddress dbstr(toaddress)
) )
# If we have the needed pubkey in the pubkey table already, # If we have the needed pubkey in the pubkey table already,
if queryreturn != []: if queryreturn != []:
@ -772,7 +782,7 @@ class singleWorker(StoppableThread):
if not sqlExecute( if not sqlExecute(
'''UPDATE sent SET status='doingmsgpow' ''' '''UPDATE sent SET status='doingmsgpow' '''
''' WHERE toaddress=? AND status='msgqueued' AND folder='sent' ''', ''' WHERE toaddress=? AND status='msgqueued' AND folder='sent' ''',
toaddress dbstr(toaddress)
): ):
continue continue
status = 'doingmsgpow' status = 'doingmsgpow'
@ -784,7 +794,7 @@ class singleWorker(StoppableThread):
sqlExecute( sqlExecute(
'''UPDATE pubkeys SET usedpersonally='yes' ''' '''UPDATE pubkeys SET usedpersonally='yes' '''
''' WHERE address=?''', ''' WHERE address=?''',
toaddress dbstr(toaddress)
) )
# We don't have the needed pubkey in the pubkeys table already. # We don't have the needed pubkey in the pubkeys table already.
else: else:
@ -804,7 +814,7 @@ class singleWorker(StoppableThread):
''' sleeptill=? WHERE toaddress=? ''' ''' sleeptill=? WHERE toaddress=? '''
''' AND status='msgqueued' ''', ''' AND status='msgqueued' ''',
int(time.time()) + 2.5 * 24 * 60 * 60, int(time.time()) + 2.5 * 24 * 60 * 60,
toaddress dbstr(toaddress)
) )
queues.UISignalQueue.put(( queues.UISignalQueue.put((
'updateSentItemStatusByToAddress', ( 'updateSentItemStatusByToAddress', (
@ -861,7 +871,7 @@ class singleWorker(StoppableThread):
''' status='awaitingpubkey' or ''' ''' status='awaitingpubkey' or '''
''' status='doingpubkeypow') AND ''' ''' status='doingpubkeypow') AND '''
''' folder='sent' ''', ''' folder='sent' ''',
toaddress) dbstr(toaddress))
del state.neededPubkeys[tag_bytes] del state.neededPubkeys[tag_bytes]
break break
# else: # else:
@ -878,7 +888,7 @@ class singleWorker(StoppableThread):
'''UPDATE sent SET ''' '''UPDATE sent SET '''
''' status='doingpubkeypow' WHERE ''' ''' status='doingpubkeypow' WHERE '''
''' toaddress=? AND status='msgqueued' AND folder='sent' ''', ''' toaddress=? AND status='msgqueued' AND folder='sent' ''',
toaddress dbstr(toaddress)
) )
queues.UISignalQueue.put(( queues.UISignalQueue.put((
'updateSentItemStatusByToAddress', ( 'updateSentItemStatusByToAddress', (
@ -923,7 +933,7 @@ class singleWorker(StoppableThread):
# is too hard then we'll abort. # is too hard then we'll abort.
queryreturn = sqlQuery( queryreturn = sqlQuery(
'SELECT transmitdata FROM pubkeys WHERE address=?', 'SELECT transmitdata FROM pubkeys WHERE address=?',
toaddress) dbstr(toaddress))
for row in queryreturn: # pylint: disable=redefined-outer-name for row in queryreturn: # pylint: disable=redefined-outer-name
pubkeyPayload, = row pubkeyPayload, = row
@ -1342,7 +1352,7 @@ class singleWorker(StoppableThread):
sqlExecute( sqlExecute(
'''UPDATE sent SET msgid=?, status=?, retrynumber=?, ''' '''UPDATE sent SET msgid=?, status=?, retrynumber=?, '''
''' sleeptill=?, lastactiontime=? WHERE ackdata=? AND folder='sent' ''', ''' sleeptill=?, lastactiontime=? WHERE ackdata=? AND folder='sent' ''',
inventoryHash, newStatus, retryNumber + 1, inventoryHash, dbstr(newStatus), retryNumber + 1,
sleepTill, int(time.time()), ackdata sleepTill, int(time.time()), ackdata
) )
@ -1388,7 +1398,7 @@ class singleWorker(StoppableThread):
'''SELECT retrynumber FROM sent WHERE toaddress=? ''' '''SELECT retrynumber FROM sent WHERE toaddress=? '''
''' AND (status='doingpubkeypow' OR status='awaitingpubkey') ''' ''' AND (status='doingpubkeypow' OR status='awaitingpubkey') '''
''' AND folder='sent' LIMIT 1''', ''' AND folder='sent' LIMIT 1''',
toAddress dbstr(toAddress)
) )
if not queryReturn: if not queryReturn:
self.logger.critical( self.logger.critical(
@ -1471,7 +1481,7 @@ class singleWorker(StoppableThread):
''' status='awaitingpubkey', retrynumber=?, sleeptill=? ''' ''' status='awaitingpubkey', retrynumber=?, sleeptill=? '''
''' WHERE toaddress=? AND (status='doingpubkeypow' OR ''' ''' WHERE toaddress=? AND (status='doingpubkeypow' OR '''
''' status='awaitingpubkey') AND folder='sent' ''', ''' status='awaitingpubkey') AND folder='sent' ''',
int(time.time()), retryNumber + 1, sleeptill, toAddress) int(time.time()), retryNumber + 1, sleeptill, dbstr(toAddress))
queues.UISignalQueue.put(( queues.UISignalQueue.put((
'updateStatusBar', 'updateStatusBar',

13
src/class_smtpServer.py
View File

@ -20,6 +20,7 @@ from helper_ackPayload import genAckPayload
from helper_sql import sqlExecute from helper_sql import sqlExecute
from network.threads import StoppableThread from network.threads import StoppableThread
from version import softwareVersion from version import softwareVersion
from dbcompat import dbstr
SMTPDOMAIN = "bmaddr.lan" SMTPDOMAIN = "bmaddr.lan"
LISTENPORT = 8425 LISTENPORT = 8425
@ -89,18 +90,18 @@ class smtpServerPyBitmessage(smtpd.SMTPServer):
sqlExecute( sqlExecute(
'''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)''', '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)''',
'', '',
toAddress, dbstr(toAddress),
ripe, ripe,
fromAddress, dbstr(fromAddress),
subject, dbstr(subject),
message, dbstr(message),
ackdata, ackdata,
int(time.time()), # sentTime (this will never change) int(time.time()), # sentTime (this will never change)
int(time.time()), # lastActionTime int(time.time()), # lastActionTime
0, # sleepTill time. This will get set when the POW gets done. 0, # sleepTill time. This will get set when the POW gets done.
'msgqueued', dbstr('msgqueued'),
0, # retryNumber 0, # retryNumber
'sent', # folder dbstr('sent'), # folder
2, # encodingtype 2, # encodingtype
# not necessary to have a TTL higher than 2 days # not necessary to have a TTL higher than 2 days
min(config.getint('bitmessagesettings', 'ttl'), 86400 * 2) min(config.getint('bitmessagesettings', 'ttl'), 86400 * 2)

6
src/class_sqlThread.py
View File

@ -39,7 +39,7 @@ class sqlThread(threading.Thread):
helper_sql.sql_available = True helper_sql.sql_available = True
config_ready.wait() config_ready.wait()
self.conn = sqlite3.connect(state.appdata + 'messages.dat') self.conn = sqlite3.connect(state.appdata + 'messages.dat')
self.conn.text_factory = str self.conn.text_factory = bytes
self.cur = self.conn.cursor() self.cur = self.conn.cursor()
self.cur.execute('PRAGMA secure_delete = true') self.cur.execute('PRAGMA secure_delete = true')
@ -543,7 +543,7 @@ class sqlThread(threading.Thread):
shutil.move( shutil.move(
paths.lookupAppdataFolder() + 'messages.dat', paths.lookupExeFolder() + 'messages.dat') paths.lookupAppdataFolder() + 'messages.dat', paths.lookupExeFolder() + 'messages.dat')
self.conn = sqlite3.connect(paths.lookupExeFolder() + 'messages.dat') self.conn = sqlite3.connect(paths.lookupExeFolder() + 'messages.dat')
self.conn.text_factory = str self.conn.text_factory = bytes
self.cur = self.conn.cursor() self.cur = self.conn.cursor()
elif item == 'movemessagstoappdata': elif item == 'movemessagstoappdata':
logger.debug('the sqlThread is moving the messages.dat file to the Appdata folder.') logger.debug('the sqlThread is moving the messages.dat file to the Appdata folder.')
@ -569,7 +569,7 @@ class sqlThread(threading.Thread):
shutil.move( shutil.move(
paths.lookupExeFolder() + 'messages.dat', paths.lookupAppdataFolder() + 'messages.dat') paths.lookupExeFolder() + 'messages.dat', paths.lookupAppdataFolder() + 'messages.dat')
self.conn = sqlite3.connect(paths.lookupAppdataFolder() + 'messages.dat') self.conn = sqlite3.connect(paths.lookupAppdataFolder() + 'messages.dat')
self.conn.text_factory = str self.conn.text_factory = bytes
self.cur = self.conn.cursor() self.cur = self.conn.cursor()
elif item == 'deleteandvacuume': elif item == 'deleteandvacuume':
self.cur.execute('''delete from inbox where folder='trash' ''') self.cur.execute('''delete from inbox where folder='trash' ''')

22
src/dbcompat.py Normal file
View File

@ -0,0 +1,22 @@
import logging
import six
logger = logging.getLogger("default")
def dbstr(v):
if six.PY3:
if isinstance(v, str):
return v
elif isinstance(v, bytes):
return v.decode("utf-8", "replace")
logger.debug("unexpected type in dbstr(): {}".format(type(v)))
return v # hope this never happens..
else: # assume six.PY2
if isinstance(v, unicode):
return v.encode("utf-8", "replace")
elif isinstance(v, str):
return v
elif isinstance(v, bytes):
return str(v)
logger.debug("unexpected type in dbstr(): {}".format(type(v)))
return v # hope this never happens..

3
src/helper_addressbook.py
View File

@ -4,11 +4,12 @@ Insert value into addressbook
from bmconfigparser import config from bmconfigparser import config
from helper_sql import sqlExecute from helper_sql import sqlExecute
from dbcompat import dbstr
def insert(address, label): def insert(address, label):
"""perform insert into addressbook""" """perform insert into addressbook"""
if address not in config.addresses(): if address not in config.addresses():
return sqlExecute('''INSERT INTO addressbook VALUES (?,?)''', label, address) == 1 return sqlExecute('''INSERT INTO addressbook VALUES (?,?)''', dbstr(label), dbstr(address)) == 1
return False return False

4
src/helper_inbox.py
View File

@ -2,11 +2,13 @@
import queues import queues
from helper_sql import sqlExecute, sqlQuery from helper_sql import sqlExecute, sqlQuery
from dbcompat import dbstr
def insert(t): def insert(t):
"""Perform an insert into the "inbox" table""" """Perform an insert into the "inbox" table"""
sqlExecute('''INSERT INTO inbox VALUES (?,?,?,?,?,?,?,?,?,?)''', *t) u = [t[0], dbstr(t[1]), dbstr(t[2]), dbstr(t[3]), dbstr(t[4]), dbstr(t[5]), dbstr(t[6]), t[7], t[8], t[9]]
sqlExecute('''INSERT INTO inbox VALUES (?,?,?,?,?,?,?,?,?,?)''', *u)
# shouldn't emit changedInboxUnread and displayNewInboxMessage # shouldn't emit changedInboxUnread and displayNewInboxMessage
# at the same time # at the same time
# queues.UISignalQueue.put(('changedInboxUnread', None)) # queues.UISignalQueue.put(('changedInboxUnread', None))

3
src/helper_msgcoding.py
View File

@ -71,7 +71,8 @@ class MsgEncode(object):
def encodeSimple(self, message): def encodeSimple(self, message):
"""Handle simple encoding""" """Handle simple encoding"""
self.data = 'Subject:%(subject)s\nBody:%(body)s' % message data = 'Subject:%(subject)s\nBody:%(body)s' % message
self.data = data.encode("utf-8", "replace")
self.length = len(self.data) self.length = len(self.data)
def encodeTrivial(self, message): def encodeTrivial(self, message):

13
src/helper_search.py
View File

@ -5,6 +5,7 @@ Used by :mod:`.bitmessageqt`.
from helper_sql import sqlQuery from helper_sql import sqlQuery
from tr import _translate from tr import _translate
from dbcompat import dbstr
def search_sql( def search_sql(
@ -52,23 +53,23 @@ def search_sql(
if account is not None: if account is not None:
if xAddress == 'both': if xAddress == 'both':
sqlStatementParts.append('(fromaddress = ? OR toaddress = ?)') sqlStatementParts.append('(fromaddress = ? OR toaddress = ?)')
sqlArguments.append(account) sqlArguments.append(dbstr(account))
sqlArguments.append(account) sqlArguments.append(dbstr(account))
else: else:
sqlStatementParts.append(xAddress + ' = ? ') sqlStatementParts.append(xAddress + ' = ? ')
sqlArguments.append(account) sqlArguments.append(dbstr(account))
if folder is not None: if folder is not None:
if folder == 'new': if folder == 'new':
folder = 'inbox' folder = 'inbox'
unreadOnly = True unreadOnly = True
sqlStatementParts.append('folder = ? ') sqlStatementParts.append('folder = ? ')
sqlArguments.append(folder) sqlArguments.append(dbstr(folder))
else: else:
sqlStatementParts.append('folder != ?') sqlStatementParts.append('folder != ?')
sqlArguments.append('trash') sqlArguments.append(dbstr('trash'))
if what: if what:
sqlStatementParts.append('%s LIKE ?' % (where)) sqlStatementParts.append('%s LIKE ?' % (where))
sqlArguments.append(what) sqlArguments.append(dbstr(what))
if unreadOnly: if unreadOnly:
sqlStatementParts.append('read = 0') sqlStatementParts.append('read = 0')
if sqlStatementParts: if sqlStatementParts:

5
src/helper_sent.py
View File

@ -8,6 +8,7 @@ from addresses import decodeAddress
from bmconfigparser import config from bmconfigparser import config
from helper_ackPayload import genAckPayload from helper_ackPayload import genAckPayload
from helper_sql import sqlExecute, sqlQuery from helper_sql import sqlExecute, sqlQuery
from dbcompat import dbstr
# pylint: disable=too-many-arguments # pylint: disable=too-many-arguments
@ -38,8 +39,8 @@ def insert(msgid=None, toAddress='[Broadcast subscribers]', fromAddress=None, su
ttl = ttl if ttl else config.getint('bitmessagesettings', 'ttl') ttl = ttl if ttl else config.getint('bitmessagesettings', 'ttl')
t = (msgid, toAddress, ripe, fromAddress, subject, message, ackdata, t = (msgid, dbstr(toAddress), ripe, dbstr(fromAddress), dbstr(subject), dbstr(message), ackdata,
sentTime, lastActionTime, sleeptill, status, retryNumber, folder, sentTime, lastActionTime, sleeptill, dbstr(status), retryNumber, dbstr(folder),
encoding, ttl) encoding, ttl)
sqlExecute('''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)''', *t) sqlExecute('''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)''', *t)

3
src/protocol.py
View File

@ -24,6 +24,7 @@ from debug import logger
from helper_sql import sqlExecute from helper_sql import sqlExecute
from network.node import Peer from network.node import Peer
from version import softwareVersion from version import softwareVersion
from dbcompat import dbstr
# Network constants # Network constants
magic = 0xE9BEB4D9 magic = 0xE9BEB4D9
@ -559,7 +560,7 @@ def decryptAndCheckPubkeyPayload(data, address):
hexlify(pubSigningKey), hexlify(pubEncryptionKey) hexlify(pubSigningKey), hexlify(pubEncryptionKey)
) )
t = (address, addressVersion, storedData, int(time.time()), 'yes') t = (dbstr(address), addressVersion, storedData, int(time.time()), dbstr('yes'))
sqlExecute('''INSERT INTO pubkeys VALUES (?,?,?,?,?)''', *t) sqlExecute('''INSERT INTO pubkeys VALUES (?,?,?,?,?)''', *t)
return 'successful' return 'successful'
except varintDecodeError: except varintDecodeError:

12
src/shared.py
View File

@ -23,6 +23,7 @@ from addresses import decodeAddress, encodeVarint
from bmconfigparser import config from bmconfigparser import config
from debug import logger from debug import logger
from helper_sql import sqlQuery from helper_sql import sqlQuery
from dbcompat import dbstr
myECCryptorObjects = {} myECCryptorObjects = {}
@ -39,7 +40,7 @@ def isAddressInMyAddressBook(address):
"""Is address in my addressbook?""" """Is address in my addressbook?"""
queryreturn = sqlQuery( queryreturn = sqlQuery(
'''select address from addressbook where address=?''', '''select address from addressbook where address=?''',
address) dbstr(address))
return queryreturn != [] return queryreturn != []
@ -48,7 +49,7 @@ def isAddressInMySubscriptionsList(address):
"""Am I subscribed to this address?""" """Am I subscribed to this address?"""
queryreturn = sqlQuery( queryreturn = sqlQuery(
'''select * from subscriptions where address=?''', '''select * from subscriptions where address=?''',
str(address)) dbstr(address))
return queryreturn != [] return queryreturn != []
@ -62,14 +63,14 @@ def isAddressInMyAddressBookSubscriptionsListOrWhitelist(address):
queryreturn = sqlQuery( queryreturn = sqlQuery(
'''SELECT address FROM whitelist where address=?''' '''SELECT address FROM whitelist where address=?'''
''' and enabled = '1' ''', ''' and enabled = '1' ''',
address) dbstr(address))
if queryreturn != []: if queryreturn != []:
return True return True
queryreturn = sqlQuery( queryreturn = sqlQuery(
'''select address from subscriptions where address=?''' '''select address from subscriptions where address=?'''
''' and enabled = '1' ''', ''' and enabled = '1' ''',
address) dbstr(address))
if queryreturn != []: if queryreturn != []:
return True return True
return False return False
@ -137,6 +138,7 @@ def reloadBroadcastSendersForWhichImWatching():
logger.debug('reloading subscriptions...') logger.debug('reloading subscriptions...')
for row in queryreturn: for row in queryreturn:
address, = row address, = row
address = address.decode("utf-8", "replace")
# status # status
addressVersionNumber, streamNumber, hashobj = decodeAddress(address)[1:] addressVersionNumber, streamNumber, hashobj = decodeAddress(address)[1:]
if addressVersionNumber == 2: if addressVersionNumber == 2:
@ -170,7 +172,7 @@ def fixPotentiallyInvalidUTF8Data(text):
return text return text
except UnicodeDecodeError: except UnicodeDecodeError:
return 'Part of the message is corrupt. The message cannot be' \ return 'Part of the message is corrupt. The message cannot be' \
' displayed the normal way.\n\n' + repr(text) ' displayed the normal way.\n\n' + text.decode("utf-8", "replace")
def checkSensitiveFilePermissions(filename): def checkSensitiveFilePermissions(filename):

2
src/storage/sqlite.py
View File

@ -98,7 +98,7 @@ class SqliteInventory(InventoryStorage):
t = int(time.time()) t = int(time.time())
hashes = [x for x, value in self._inventory.items() hashes = [x for x, value in self._inventory.items()
if value.stream == stream and value.expires > t] if value.stream == stream and value.expires > t]
hashes += (str(payload) for payload, in sqlQuery( hashes += (bytes(payload) for payload, in sqlQuery(
'SELECT hash FROM inventory WHERE streamnumber=?' 'SELECT hash FROM inventory WHERE streamnumber=?'
' AND expirestime>?', stream, t)) ' AND expirestime>?', stream, t))
return hashes return hashes

9
src/tests/core.py
View File

@ -32,6 +32,7 @@ from network.node import Node, Peer
from network.tcp import Socks4aBMConnection, Socks5BMConnection, TCPConnection from network.tcp import Socks4aBMConnection, Socks5BMConnection, TCPConnection
from queues import excQueue from queues import excQueue
from version import softwareVersion from version import softwareVersion
from dbcompat import dbstr
from common import cleanup from common import cleanup
@ -347,11 +348,11 @@ class TestCore(unittest.TestCase):
) )
queryreturn = sqlQuery( queryreturn = sqlQuery(
'''select msgid from sent where ackdata=?''', result) '''select msgid from sent where ackdata=?''', result)
self.assertNotEqual(queryreturn[0][0] if queryreturn else '', '') self.assertNotEqual(queryreturn[0][0] if queryreturn else b'', b'')
column_type = sqlQuery( column_type = sqlQuery(
'''select typeof(msgid) from sent where ackdata=?''', result) '''select typeof(msgid) from sent where ackdata=?''', result)
self.assertEqual(column_type[0][0] if column_type else '', 'text') self.assertEqual(column_type[0][0] if column_type else '', 'blob')
@unittest.skipIf(frozen, 'not packed test_pattern into the bundle') @unittest.skipIf(frozen, 'not packed test_pattern into the bundle')
def test_old_knownnodes_pickle(self): def test_old_knownnodes_pickle(self):
@ -369,7 +370,7 @@ class TestCore(unittest.TestCase):
@staticmethod @staticmethod
def delete_address_from_addressbook(address): def delete_address_from_addressbook(address):
"""Clean up addressbook""" """Clean up addressbook"""
sqlQuery('''delete from addressbook where address=?''', address) sqlQuery('''delete from addressbook where address=?''', dbstr(address))
def test_add_same_address_twice_in_addressbook(self): def test_add_same_address_twice_in_addressbook(self):
"""checking same address is added twice in addressbook""" """checking same address is added twice in addressbook"""
@ -383,7 +384,7 @@ class TestCore(unittest.TestCase):
"""checking is address added in addressbook or not""" """checking is address added in addressbook or not"""
helper_addressbook.insert(label='test1', address=self.addr) helper_addressbook.insert(label='test1', address=self.addr)
queryreturn = sqlQuery( queryreturn = sqlQuery(
'select count(*) from addressbook where address=?', self.addr) 'select count(*) from addressbook where address=?', dbstr(self.addr))
self.assertEqual(queryreturn[0][0], 1) self.assertEqual(queryreturn[0][0], 1)
self.delete_address_from_addressbook(self.addr) self.delete_address_from_addressbook(self.addr)

8
src/tests/test_helper_inbox.py
View File

@ -26,7 +26,7 @@ class TestHelperInbox(unittest.TestCase):
def test_insert(self, mock_sql_execute): # pylint: disable=no-self-use def test_insert(self, mock_sql_execute): # pylint: disable=no-self-use
"""Test to perform an insert into the "inbox" table""" """Test to perform an insert into the "inbox" table"""
mock_message_data = ( mock_message_data = (
"ruyv87bv", b"ruyv87bv",
"BM-2cUGaEcGz9Zft1SPAo8FJtfzyADTpEgU9U", "BM-2cUGaEcGz9Zft1SPAo8FJtfzyADTpEgU9U",
"BM-2cUGaEcGz9Zft1SPAo8FJtfzyADTp5g99U", "BM-2cUGaEcGz9Zft1SPAo8FJtfzyADTp5g99U",
"Test subject", "Test subject",
@ -35,7 +35,7 @@ class TestHelperInbox(unittest.TestCase):
"inbox", "inbox",
2, 2,
0, 0,
"658gvjhtghv", b"658gvjhtghv",
) )
insert(t=mock_message_data) insert(t=mock_message_data)
mock_sql_execute.assert_called_once() mock_sql_execute.assert_called_once()
@ -43,7 +43,7 @@ class TestHelperInbox(unittest.TestCase):
@patch("pybitmessage.helper_inbox.sqlExecute") @patch("pybitmessage.helper_inbox.sqlExecute")
def test_trash(self, mock_sql_execute): # pylint: disable=no-self-use def test_trash(self, mock_sql_execute): # pylint: disable=no-self-use
"""Test marking a message in the `inbox` as `trash`""" """Test marking a message in the `inbox` as `trash`"""
mock_msg_id = "fefkosghsbse92" mock_msg_id = b"fefkosghsbse92"
trash(msgid=mock_msg_id) trash(msgid=mock_msg_id)
mock_sql_execute.assert_called_once() mock_sql_execute.assert_called_once()
@ -57,7 +57,7 @@ class TestHelperInbox(unittest.TestCase):
@patch("pybitmessage.helper_inbox.sqlExecute") @patch("pybitmessage.helper_inbox.sqlExecute")
def test_undeleteMessage(self, mock_sql_execute): # pylint: disable=no-self-use def test_undeleteMessage(self, mock_sql_execute): # pylint: disable=no-self-use
"""Test for Undelete the message""" """Test for Undelete the message"""
mock_msg_id = "fefkosghsbse92" mock_msg_id = b"fefkosghsbse92"
undeleteMessage(msgid=mock_msg_id) undeleteMessage(msgid=mock_msg_id)
mock_sql_execute.assert_called_once() mock_sql_execute.assert_called_once()

18
src/tests/test_helper_sent.py
View File

@ -19,7 +19,7 @@ class TestHelperSent(unittest.TestCase):
"""Test insert with valid address""" """Test insert with valid address"""
VALID_ADDRESS = "BM-2cUGaEcGz9Zft1SPAo8FJtfzyADTpEgU9U" VALID_ADDRESS = "BM-2cUGaEcGz9Zft1SPAo8FJtfzyADTpEgU9U"
ackdata = insert( ackdata = insert(
msgid="123456", msgid=b"123456",
toAddress="[Broadcast subscribers]", toAddress="[Broadcast subscribers]",
fromAddress=VALID_ADDRESS, fromAddress=VALID_ADDRESS,
subject="Test Subject", subject="Test Subject",
@ -45,10 +45,10 @@ class TestHelperSent(unittest.TestCase):
@patch("pybitmessage.helper_sent.sqlExecute") @patch("pybitmessage.helper_sent.sqlExecute")
def test_delete(self, mock_sql_execute): def test_delete(self, mock_sql_execute):
"""Test delete function""" """Test delete function"""
delete("ack_data") delete(b"ack_data")
self.assertTrue(mock_sql_execute.called) self.assertTrue(mock_sql_execute.called)
mock_sql_execute.assert_called_once_with( mock_sql_execute.assert_called_once_with(
"DELETE FROM sent WHERE ackdata = ?", "ack_data" "DELETE FROM sent WHERE ackdata = ?", b"ack_data"
) )
@patch("pybitmessage.helper_sent.sqlQuery") @patch("pybitmessage.helper_sent.sqlQuery")
@ -56,11 +56,11 @@ class TestHelperSent(unittest.TestCase):
"""Test retrieving valid message details""" """Test retrieving valid message details"""
return_data = [ return_data = [
( (
"to@example.com", b"to@example.com",
"from@example.com", b"from@example.com",
"Test Subject", b"Test Subject",
"Test Message", b"Test Message",
"2022-01-01", b"2022-01-01",
) )
] ]
mock_sql_query.return_value = return_data mock_sql_query.return_value = return_data
@ -70,7 +70,7 @@ class TestHelperSent(unittest.TestCase):
@patch("pybitmessage.helper_sent.sqlExecute") @patch("pybitmessage.helper_sent.sqlExecute")
def test_trash(self, mock_sql_execute): def test_trash(self, mock_sql_execute):
"""Test marking a message as 'trash'""" """Test marking a message as 'trash'"""
ackdata = "ack_data" ackdata = b"ack_data"
mock_sql_execute.return_value = 1 mock_sql_execute.return_value = 1
rowcount = trash(ackdata) rowcount = trash(ackdata)
self.assertEqual(rowcount, 1) self.assertEqual(rowcount, 1)

10
src/tests/test_helper_sql.py
View File

@ -23,23 +23,23 @@ class TestHelperSql(unittest.TestCase):
@patch("pybitmessage.helper_sql.sqlReturnQueue.get") @patch("pybitmessage.helper_sql.sqlReturnQueue.get")
def test_sqlquery_no_args(self, mock_sqlreturnqueue_get, mock_sqlsubmitqueue_put): def test_sqlquery_no_args(self, mock_sqlreturnqueue_get, mock_sqlsubmitqueue_put):
"""Test sqlQuery with no additional arguments""" """Test sqlQuery with no additional arguments"""
mock_sqlreturnqueue_get.return_value = ("dummy_result", None) mock_sqlreturnqueue_get.return_value = (b"dummy_result", None)
result = helper_sql.sqlQuery( result = helper_sql.sqlQuery(
"SELECT msgid FROM inbox where folder='inbox' ORDER BY received" "SELECT msgid FROM inbox where folder='inbox' ORDER BY received"
) )
self.assertEqual(mock_sqlsubmitqueue_put.call_count, 2) self.assertEqual(mock_sqlsubmitqueue_put.call_count, 2)
self.assertEqual(result, "dummy_result") self.assertEqual(result.decode("utf-8", "replace"), "dummy_result")
@patch("pybitmessage.helper_sql.sqlSubmitQueue.put") @patch("pybitmessage.helper_sql.sqlSubmitQueue.put")
@patch("pybitmessage.helper_sql.sqlReturnQueue.get") @patch("pybitmessage.helper_sql.sqlReturnQueue.get")
def test_sqlquery_with_args(self, mock_sqlreturnqueue_get, mock_sqlsubmitqueue_put): def test_sqlquery_with_args(self, mock_sqlreturnqueue_get, mock_sqlsubmitqueue_put):
"""Test sqlQuery with additional arguments""" """Test sqlQuery with additional arguments"""
mock_sqlreturnqueue_get.return_value = ("dummy_result", None) mock_sqlreturnqueue_get.return_value = (b"dummy_result", None)
result = helper_sql.sqlQuery( result = helper_sql.sqlQuery(
"SELECT address FROM addressbook WHERE address=?", "PB-5yfds868gbkj" "SELECT address FROM addressbook WHERE address=?", "PB-5yfds868gbkj"
) )
self.assertEqual(mock_sqlsubmitqueue_put.call_count, 2) self.assertEqual(mock_sqlsubmitqueue_put.call_count, 2)
self.assertEqual(result, "dummy_result") self.assertEqual(result.decode("utf-8", "replace"), "dummy_result")
@patch("pybitmessage.helper_sql.sqlSubmitQueue.put") @patch("pybitmessage.helper_sql.sqlSubmitQueue.put")
@patch("pybitmessage.helper_sql.sqlReturnQueue.get") @patch("pybitmessage.helper_sql.sqlReturnQueue.get")
@ -49,7 +49,7 @@ class TestHelperSql(unittest.TestCase):
rowcount = helper_sql.sqlExecute( rowcount = helper_sql.sqlExecute(
"UPDATE sent SET status = 'msgqueued'" "UPDATE sent SET status = 'msgqueued'"
"WHERE ackdata = ? AND folder = 'sent'", "WHERE ackdata = ? AND folder = 'sent'",
"1710652313", b"1710652313",
) )
self.assertEqual(mock_sqlsubmitqueue_put.call_count, 3) self.assertEqual(mock_sqlsubmitqueue_put.call_count, 3)
self.assertEqual(rowcount, 1) self.assertEqual(rowcount, 1)

6
src/tests/test_shared.py
View File

@ -46,7 +46,7 @@ class TestShared(unittest.TestCase):
address = sample_address address = sample_address
# if address is in MyAddressbook # if address is in MyAddressbook
mock_sql_query.return_value = [address] mock_sql_query.return_value = [bytes(address)]
return_val = isAddressInMyAddressBook(address) return_val = isAddressInMyAddressBook(address)
mock_sql_query.assert_called_once() mock_sql_query.assert_called_once()
self.assertTrue(return_val) self.assertTrue(return_val)
@ -64,7 +64,7 @@ class TestShared(unittest.TestCase):
address = sample_address address = sample_address
# if address is in MySubscriptionsList # if address is in MySubscriptionsList
mock_sql_query.return_value = [address] mock_sql_query.return_value = [bytes(address)]
return_val = isAddressInMySubscriptionsList(address) return_val = isAddressInMySubscriptionsList(address)
self.assertTrue(return_val) self.assertTrue(return_val)
@ -78,7 +78,7 @@ class TestShared(unittest.TestCase):
def test_reloadBroadcastSendersForWhichImWatching(self, mock_sql_query): def test_reloadBroadcastSendersForWhichImWatching(self, mock_sql_query):
"""Test for reload Broadcast Senders For Which Im Watching""" """Test for reload Broadcast Senders For Which Im Watching"""
mock_sql_query.return_value = [ mock_sql_query.return_value = [
(sample_address,), (bytes(sample_address),),
] ]
# before reload # before reload
self.assertEqual(len(MyECSubscriptionCryptorObjects), 0) self.assertEqual(len(MyECSubscriptionCryptorObjects), 0)

2
src/tests/test_sqlthread.py
View File

@ -41,4 +41,4 @@ class TestSqlThread(unittest.TestCase):
query = sqlQuery('SELECT enaddr(4, 1, "21122112211221122112")') query = sqlQuery('SELECT enaddr(4, 1, "21122112211221122112")')
self.assertEqual( self.assertEqual(
query[0][-1], encoded_str, "test case fail for create_function") query[0][-1].decode("utf-8", "replace"), encoded_str, "test case fail for create_function")