oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Bootstrapper plugin py3 compatibility

Browse source
This commit is contained in:
shortcutme 2019-04-15 22:15:42 +02:00
parent 446641c31c
commit 54ff940c2b
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/disabled-Bootstrapper/BootstrapperDb.py
View file

@ -8,7 +8,7 @@ from Db import Db
from util import helper from util import helper
class BootstrapperDb(Db): class BootstrapperDb(Db.Db):
def __init__(self): def __init__(self):
self.version = 7 self.version = 7
self.hash_ids = {} # hash -> id cache self.hash_ids = {} # hash -> id cache
@ -79,7 +79,7 @@ class BootstrapperDb(Db):
def getHashId(self, hash): def getHashId(self, hash):
if hash not in self.hash_ids: if hash not in self.hash_ids:
self.log.debug("New hash: %s" % repr(hash)) self.log.debug("New hash: %s" % repr(hash))
self.execute("INSERT OR IGNORE INTO hash ?", {"hash": buffer(hash)}) self.execute("INSERT OR IGNORE INTO hash ?", {"hash": hash})
self.hash_ids[hash] = self.cur.cursor.lastrowid self.hash_ids[hash] = self.cur.cursor.lastrowid
return self.hash_ids[hash] return self.hash_ids[hash]

2
plugins/disabled-Bootstrapper/BootstrapperPlugin.py
View file

@ -23,7 +23,7 @@ class FileRequestPlugin(object):
onions_signed = [] onions_signed = []
# Check onion signs # Check onion signs
for onion_publickey, onion_sign in onion_signs.items(): for onion_publickey, onion_sign in onion_signs.items():
if CryptRsa.verify(onion_sign_this, onion_publickey, onion_sign): if CryptRsa.verify(onion_sign_this.encode(), onion_publickey, onion_sign):
onions_signed.append(CryptRsa.publickeyToOnion(onion_publickey)) onions_signed.append(CryptRsa.publickeyToOnion(onion_publickey))
else: else:
break break

26
plugins/disabled-Bootstrapper/Test/TestBootstrapper.py
View file

@ -30,9 +30,9 @@ class TestBootstrapper:
def testBootstrapperDb(self, file_server, bootstrapper_db): def testBootstrapperDb(self, file_server, bootstrapper_db):
ip_type = helper.getIpType(file_server.ip) ip_type = helper.getIpType(file_server.ip)
peer = Peer(file_server.ip, 1544, connection_server=file_server) peer = Peer(file_server.ip, 1544, connection_server=file_server)
hash1 = hashlib.sha256("site1").digest() hash1 = hashlib.sha256(b"site1").digest()
hash2 = hashlib.sha256("site2").digest() hash2 = hashlib.sha256(b"site2").digest()
hash3 = hashlib.sha256("site3").digest() hash3 = hashlib.sha256(b"site3").digest()
# Verify empty result # Verify empty result
res = peer.request("announce", { res = peer.request("announce", {
@ -90,7 +90,7 @@ class TestBootstrapper:
def testPassive(self, file_server, bootstrapper_db): def testPassive(self, file_server, bootstrapper_db):
peer = Peer(file_server.ip, 1544, connection_server=file_server) peer = Peer(file_server.ip, 1544, connection_server=file_server)
ip_type = helper.getIpType(file_server.ip) ip_type = helper.getIpType(file_server.ip)
hash1 = hashlib.sha256("hash1").digest() hash1 = hashlib.sha256(b"hash1").digest()
bootstrapper_db.peerAnnounce(ip_type, address=None, port=15441, hashes=[hash1]) bootstrapper_db.peerAnnounce(ip_type, address=None, port=15441, hashes=[hash1])
res = peer.request("announce", { res = peer.request("announce", {
@ -103,9 +103,9 @@ class TestBootstrapper:
onion1 = tor_manager.addOnion() onion1 = tor_manager.addOnion()
onion2 = tor_manager.addOnion() onion2 = tor_manager.addOnion()
peer = Peer(file_server.ip, 1544, connection_server=file_server) peer = Peer(file_server.ip, 1544, connection_server=file_server)
hash1 = hashlib.sha256("site1").digest() hash1 = hashlib.sha256(b"site1").digest()
hash2 = hashlib.sha256("site2").digest() hash2 = hashlib.sha256(b"site2").digest()
hash3 = hashlib.sha256("site3").digest() hash3 = hashlib.sha256(b"site3").digest()
bootstrapper_db.peerAnnounce(ip_type="ipv4", address="1.2.3.4", port=1234, hashes=[hash1, hash2, hash3]) bootstrapper_db.peerAnnounce(ip_type="ipv4", address="1.2.3.4", port=1234, hashes=[hash1, hash2, hash3])
res = peer.request("announce", { res = peer.request("announce", {
@ -120,8 +120,8 @@ class TestBootstrapper:
assert "onion_sign_this" in res assert "onion_sign_this" in res
# Sign the nonces # Sign the nonces
sign1 = CryptRsa.sign(res["onion_sign_this"], tor_manager.getPrivatekey(onion1)) sign1 = CryptRsa.sign(res["onion_sign_this"].encode(), tor_manager.getPrivatekey(onion1))
sign2 = CryptRsa.sign(res["onion_sign_this"], tor_manager.getPrivatekey(onion2)) sign2 = CryptRsa.sign(res["onion_sign_this"].encode(), tor_manager.getPrivatekey(onion2))
# Bad sign (different address) # Bad sign (different address)
res = peer.request("announce", { res = peer.request("announce", {
@ -171,7 +171,7 @@ class TestBootstrapper:
def testRequestPeers(self, file_server, site, bootstrapper_db, tor_manager): def testRequestPeers(self, file_server, site, bootstrapper_db, tor_manager):
site.connection_server = file_server site.connection_server = file_server
file_server.tor_manager = tor_manager file_server.tor_manager = tor_manager
hash = hashlib.sha256(site.address).digest() hash = hashlib.sha256(site.address.encode()).digest()
# Request peers from tracker # Request peers from tracker
assert len(site.peers) == 0 assert len(site.peers) == 0
@ -188,8 +188,8 @@ class TestBootstrapper:
@pytest.mark.slow @pytest.mark.slow
def testAnnounce(self, file_server, tor_manager): def testAnnounce(self, file_server, tor_manager):
file_server.tor_manager = tor_manager file_server.tor_manager = tor_manager
hash1 = hashlib.sha256("1Nekos4fiBqfcazyG1bAxdBT5oBvA76Z").digest() hash1 = hashlib.sha256(b"1Nekos4fiBqfcazyG1bAxdBT5oBvA76Z").digest()
hash2 = hashlib.sha256("1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr").digest() hash2 = hashlib.sha256(b"1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr").digest()
peer = Peer("zero.booth.moe", 443, connection_server=file_server) peer = Peer("zero.booth.moe", 443, connection_server=file_server)
assert peer.request("ping") assert peer.request("ping")
peer = Peer("boot3rdez4rzn36x.onion", 15441, connection_server=file_server) peer = Peer("boot3rdez4rzn36x.onion", 15441, connection_server=file_server)
@ -203,7 +203,7 @@ class TestBootstrapper:
def testBackwardCompatibility(self, file_server, bootstrapper_db): def testBackwardCompatibility(self, file_server, bootstrapper_db):
peer = Peer(file_server.ip, 1544, connection_server=file_server) peer = Peer(file_server.ip, 1544, connection_server=file_server)
hash1 = hashlib.sha256("site1").digest() hash1 = hashlib.sha256(b"site1").digest()
bootstrapper_db.peerAnnounce("ipv4", file_server.ip_external, port=15441, hashes=[hash1], delete_missing_hashes=True) bootstrapper_db.peerAnnounce("ipv4", file_server.ip_external, port=15441, hashes=[hash1], delete_missing_hashes=True)