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

Fix bug that someomes blocked plugins accessing connectionserver sitelist

Browse source
This commit is contained in:
shortcutme 2019-11-25 14:34:46 +01:00
parent 07633ba79d
commit c14e722303
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
5 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/File/FileServer.py
View file

@ -65,7 +65,7 @@ class FileServer(ConnectionServer):
self.port_opened = {}
self.sites = {}
self.sites = self.site_manager.sites
self.last_request = time.time()
self.files_parsing = {}
self.ui_server = None

2
src/Test/TestFileRequest.py
View file

@ -91,7 +91,7 @@ class TestFileRequest:
def testPex(self, file_server, site, site_temp):
file_server.sites[site.address] = site
client = FileServer(file_server.ip, 1545)
client.sites[site_temp.address] = site_temp
client.sites = {site_temp.address: site_temp}
site_temp.connection_server = client
connection = client.getConnection(file_server.ip, 1544)

6
src/Test/TestPeer.py
View file

@ -15,7 +15,7 @@ class TestPeer:
def testPing(self, file_server, site, site_temp):
file_server.sites[site.address] = site
client = FileServer(file_server.ip, 1545)
client.sites[site_temp.address] = site_temp
client.sites = {site_temp.address: site_temp}
site_temp.connection_server = client
connection = client.getConnection(file_server.ip, 1544)
@ -34,7 +34,7 @@ class TestPeer:
def testDownloadFile(self, file_server, site, site_temp):
file_server.sites[site.address] = site
client = FileServer(file_server.ip, 1545)
client.sites[site_temp.address] = site_temp
client.sites = {site_temp.address: site_temp}
site_temp.connection_server = client
connection = client.getConnection(file_server.ip, 1544)
@ -129,7 +129,7 @@ class TestPeer:
def testFindHash(self, file_server, site, site_temp):
file_server.sites[site.address] = site
client = FileServer(file_server.ip, 1545)
client.sites[site_temp.address] = site_temp
client.sites = {site_temp.address: site_temp}
site_temp.connection_server = client
# Add file_server as peer to client

18
src/Test/TestSiteDownload.py
View file

@ -26,7 +26,7 @@ class TestSiteDownload:
# Init client server
client = FileServer(file_server.ip, 1545)
client.sites[site_temp.address] = site_temp
client.sites = {site_temp.address: site_temp}
site_temp.connection_server = client
site_temp.announce = mock.MagicMock(return_value=True) # Don't try to find peers from the net
@ -35,6 +35,8 @@ class TestSiteDownload:
site_temp.download(blind_includes=True).join(timeout=5)
assert site_temp.storage.isFile("content.json")
# Rename non-optional file
os.rename(site.storage.getPath("data/img/domain.png"), site.storage.getPath("data/img/domain-new.png"))
@ -75,7 +77,7 @@ class TestSiteDownload:
# Init client server
client = FileServer(file_server.ip, 1545)
client.sites[site_temp.address] = site_temp
client.sites = {site_temp.address: site_temp}
site_temp.connection_server = client
site_temp.announce = mock.MagicMock(return_value=True) # Don't try to find peers from the net
@ -131,7 +133,7 @@ class TestSiteDownload:
# Init client server
client = FileServer(file_server.ip, 1545)
client.sites[site_temp.address] = site_temp
client.sites = {site_temp.address: site_temp}
site_temp.connection_server = client
# Download normally
@ -179,7 +181,7 @@ class TestSiteDownload:
# Init client server
client = FileServer(file_server.ip, 1545)
client.sites[site_temp.address] = site_temp
client.sites = {site_temp.address: site_temp}
site_temp.connection_server = client
# Download normally
@ -343,7 +345,7 @@ class TestSiteDownload:
# Init client server
client = FileServer(file_server.ip, 1545)
client.sites[site_temp.address] = site_temp
client.sites = {site_temp.address: site_temp}
site_temp.connection_server = client
# Don't try to find peers from the net
@ -419,7 +421,7 @@ class TestSiteDownload:
# Init client server
client = FileServer(file_server.ip, 1545)
client.sites[site_temp.address] = site_temp
client.sites = {site_temp.address: site_temp}
site_temp.connection_server = client
# Connect peers
@ -470,7 +472,7 @@ class TestSiteDownload:
# Init client server
client = FileServer(file_server.ip, 1545)
client.sites[site_temp.address] = site_temp
client.sites = {site_temp.address: site_temp}
site_temp.connection_server = client
# Connect peers
@ -517,7 +519,7 @@ class TestSiteDownload:
# Init client server
client = FileServer(file_server.ip, 1545)
client.sites[site_temp.address] = site_temp
client.sites = {site_temp.address: site_temp}
site_temp.connection_server = client
site_temp.announce = mock.MagicMock(return_value=True) # Don't try to find peers from the net

2
src/Test/TestTor.py
View file

@ -117,7 +117,7 @@ class TestTor:
file_server.tor_manager = tor_manager
client = FileServer(file_server.ip, 1545)
client.sites[site_temp.address] = site_temp
client.sites = {site_temp.address: site_temp}
site_temp.connection_server = client
# Add file_server as peer to client