Morevna Changeset - b022997ba96d

Changeset - b022997ba96d

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Laman - 7 years ago 2017-11-02 21:49:54

more on server denying connection

2 files changed with 42 insertions and 9 deletions:

src/server.py

src/tests/test_overall.py

0 comments (0 inline, 0 general)

src/server.py

➞

Show inline comments

@@ @@ -30,17 +30,23 @@ class Miniserver: @@
 		self._ss = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 		self._ss.bind(("", conf.port))
 		self._ss.listen(1)
 	def serve(self):
 		while True:
 			with Connection(self._ss,self._ssl) as c:
 				p=multiprocessing.Process(target=Server.run,args=(c,self._filename,self._treeFile))
 		p=None
 		with self._ss:
 			while True:
 				connection=Connection(self._ss,self._ssl)
 				if p and p.is_alive():
 					with connection as c:
 						c[0].readMsg()
 						c[1].writeMsg({"command":"deny"})
 					continue
 				p=multiprocessing.Process(target=Server.run,args=(connection,self._filename,self._treeFile))
 				p.start()
 				p.join()
 class Server(NetNode):
 	def __init__(self,connection,filename,treeFile=""):
 		super().__init__(filename,treeFile)
 		(self._incoming,self._outcoming)=connection
@@ @@ -48,15 +54,16 @@ class Server(NetNode): @@
 		self.BLOCK_SIZE=self._tree.BLOCK_SIZE
 		self._lastIndex=-1
 		self._dataFileHandle=None
 	@staticmethod
 	def run(*args):
 		s=Server(*args)
 		s.serve()
 	def run(connection,*args):
 		with connection as c:
 			s=Server(c,*args)
 			s.serve()
 	@property
 	def _dataFile(self):
 		if not self._dataFileHandle:
 			self._dataFileHandle=open(self._filename, mode="rb+")
 		return self._dataFileHandle
@@ @@ -72,12 +79,14 @@ class Server(NetNode): @@
 		if jsonData["command"]=="init":
 			if jsonData["blockSize"]!=self.BLOCK_SIZE or jsonData["blockCount"]!=self._tree.leafCount:
 				self._outcoming.writeMsg({"command":"deny"})
 			if jsonData["action"]=="pull" and self.isLocked():
 				self._outcoming.writeMsg({"command":"deny"})
 			if jsonData["action"]=="push" and not self.isLocked():
 				self._lock()
 			self._outcoming.writeMsg({"command":"init", "version":conf.version})
 		elif jsonData["command"]=="req":
 			if jsonData["dataType"]=="data":
 				self._outcoming.writeMsg(*self._requestData(jsonData["index"]))

src/tests/test_overall.py

➞

Show inline comments

 import os
 import sys
 import shutil
 import hashlib
 import multiprocessing
 from logging import FileHandler
 from unittest import TestCase
 import config
 from hashtree import HashTree
 from client import Client, Connection as ClientConnection
+from client import Client, Connection as ClientConnection, DeniedConnection
 from server import Miniserver
 from . import RedirectedOutput
 config.logger.removeHandler(config.handler)
 handler=FileHandler("/tmp/morevna.log")
@@ @@ -53,39 +52,64 @@ class TestMorevna(RedirectedOutput,TestC @@
 		self.assertEqual(*compareFiles(refFile,treeFile))
 		os.remove(treeFile)
 	def test_push(self):
 		config.port+=1
 		ms=Miniserver(filename)
 		p=multiprocessing.Process(target=ms.serve)
 		p.start()
 		for clientFile in ("test2.img","test3.img","test4.img"):
 			clientFile=os.path.join(dataDir,clientFile)
 			c=Client(clientFile)
 			with ClientConnection("127.0.0.1",config.port) as con:
 				c.setConnection(con)
 				c.init("push")
 				blocksToTransfer=c.negotiate()
 				c.sendData(blocksToTransfer)
 			self.assertEqual(*compareFiles(clientFile,filename))
 		p.terminate()
 		p.join()
 	def test_pull(self):
 		config.port+=1
 		serverFile=os.path.join(dataDir,"test3.img")
 		ms=Miniserver(serverFile)
 		p=multiprocessing.Process(target=ms.serve)
 		p.start()
 		c=Client(filename)
 		with ClientConnection("127.0.0.1",config.port) as con:
 			c.setConnection(con)
 			c.init("pull")
 			blocksToTransfer=c.negotiate()
 			c.pullData(blocksToTransfer)
 		self.assertEqual(*compareFiles(serverFile,filename))
 		p.terminate()
 		p.join()
 	def test_deny(self):
 		config.port+=1
 		ms=Miniserver(filename)
 		p=multiprocessing.Process(target=ms.serve)
 		p.start()
 		c1=Client(os.path.join(dataDir,"test2.img"))
 		with ClientConnection("127.0.0.1",config.port) as con1:
 			c1.setConnection(con1)
 			c1.init("push")
 			c2=Client(os.path.join(dataDir,"test3.img"))
 			with ClientConnection("127.0.0.1",config.port) as con2:
 				c2.setConnection(con2)
 				with self.assertRaises(DeniedConnection):
 					c2.init("push")
 			c1.sendData([]) # to unlock the server
 		p.terminate()
 		p.join()

0 comments (0 inline, 0 general)