Morevna Changeset - cd2ba192bf12

Changeset - cd2ba192bf12

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Laman - 8 years ago 2017-10-02 19:53:54

ssl connection

3 files changed with 32 insertions and 10 deletions:

src/client.py

src/config.py

src/server.py

0 comments (0 inline, 0 general)

src/client.py

➞

Show inline comments

 import collections
 import socket
 import ssl
 import logging as log
 from datetime import datetime
 import config as conf
 import stats
 from util import Progress
 from hashtree import HashTree
 from networkers import NetworkReader,NetworkWriter
 class Connection:
 	def __init__(self):
 		self._socket=socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 	def __init__(self,sslContext):
 		sock=socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 		self._socket=sslContext.wrap_socket(sock)
 		self._socket.connect((conf.hosts[0], conf.port))
 		fr=self._socket.makefile(mode="rb")
 		fw=self._socket.makefile(mode="wb")
 		self.incoming=NetworkReader(fr)
 		self.outcoming=NetworkWriter(fw)
 	def __enter__(self):
 		return self.incoming,self.outcoming
 	def __exit__(self, exc_type, exc_val, exc_tb):
 		self._socket.shutdown(socket.SHUT_RDWR)
 		self._socket.close()
 class Client:
 	def __init__(self,filename):
 		self._filename=filename
 		self._ssl=ssl.create_default_context(cafile=conf.peers)
 		self._ssl.check_hostname=False
 		self._ssl.load_cert_chain(conf.certfile,conf.keyfile)
 	def negotiate(self):
 		print(datetime.now(), "initializing...")
 		localTree=HashTree.fromFile(self._filename)
 		blocksToTransfer=[]
 		nodeStack=collections.deque([0]) # root
 		# initialize session
 		with Connection() as (incoming,outcoming):
+		with Connection(self._ssl) as (incoming,outcoming):
 			jsonData={"command":"init", "blockSize":localTree.BLOCK_SIZE, "blockCount":localTree.leafCount, "version":conf.version}
 			outcoming.writeMsg(jsonData)
 			jsonData,binData=incoming.readMsg()
 			assert jsonData["command"]=="ack"
 			# determine which blocks to send
 			print(datetime.now(), "negotiating:")
 			progress=Progress(localTree.leafCount)
 			while len(nodeStack)>0:
 				i=nodeStack.pop()
 				outcoming.writeMsg({"command":"req", "index":i})
+				outcoming.writeMsg({"command":"req", "index":i, "dataType":"hash"})
 				jsonData,binData=incoming.readMsg()
 				assert jsonData["index"]==i
 				assert jsonData["dataType"]=="hash"
 				stats.logExchangedNode()
 				if localTree.store[i]!=binData:
 					if 2*i+3<len(localTree.store): # inner node
 						nodeStack.append(2*i+2)
 						nodeStack.append(2*i+1)
 					else:
 						blocksToTransfer.append(i-localTree.leafStart) # leaf
 						progress.p(i-localTree.leafStart)
 		progress.done()
 		return blocksToTransfer
 	def sendData(self,blocksToTransfer):
 		log.info(blocksToTransfer)
 		dataFile=open(self._filename, mode="rb")
 		i1=-1
 		print(datetime.now(), "sending data:")
 		with Connection() as (incoming,outcoming):
+		with Connection(self._ssl) as (incoming,outcoming):
 			progress=Progress(len(blocksToTransfer))
 			for (k,i2) in enumerate(blocksToTransfer):
 				jsonData={"command":"send", "index":i2, "dataType":"data"}
 				if i1+1!=i2:
 					dataFile.seek(i2*HashTree.BLOCK_SIZE)
 				binData=dataFile.read(HashTree.BLOCK_SIZE)
 				log.info("block #{0}: {1}...{2}".format(i2,binData[:5],binData[-5:]))
 				outcoming.writeMsg(jsonData,binData)
 				stats.logTransferredBlock()
 				jsonData,binData=incoming.readMsg()
 				assert jsonData["command"]=="ack" and jsonData["index"]==i2, jsonData
 				i1=i2
 				progress.p(k)
 		progress.done()
 		with Connection() as (incoming,outcoming):
+		with Connection(self._ssl) as (incoming,outcoming):
 			outcoming.writeMsg({"command":"end"})
 		log.info("closing session...")
 		dataFile.close()

src/config.py

➞

Show inline comments

 import os
 import datetime
 import logging as log
 logName="/tmp/mor{0}.log".format(datetime.datetime.now().timestamp())
 log.basicConfig(
 	level=log.INFO,format="%(asctime)s %(levelname)s: %(message)s",datefmt="%Y-%m-%d %H:%M:%S",
 	filename=logName
+)
 version=0
 hosts=["127.0.0.1"]
 port=50009
 port=9001
 directory=os.path.join(os.path.dirname(__file__),"..")
 certfile=os.path.join(directory,"cert.pem")
 keyfile=os.path.join(directory,"key.pem")
 peers=os.path.join(directory,"peers.pem")

src/server.py

➞

Show inline comments

 import hashlib
 import socket
 import ssl
 import logging as log
 from hashtree import HashTree
 from networkers import NetworkReader,NetworkWriter
 import config as conf
 class Connection:
 	def __init__(self,serverSocket):
 		self._socket, address = serverSocket.accept()
 	def __init__(self,serverSocket,sslContext):
 		sock, address = serverSocket.accept()
 		self._socket=sslContext.wrap_socket(sock,server_side=True)
 		log.info('Connected by {0}'.format(address))
 		fr=self._socket.makefile(mode="rb")
 		fw=self._socket.makefile(mode="wb")
 		self.incoming=NetworkReader(fr)
 		self.outcoming=NetworkWriter(fw)
 	def __enter__(self):
 		return self.incoming,self.outcoming
 	def __exit__(self, exc_type, exc_val, exc_tb):
 		self._socket.shutdown(socket.SHUT_RDWR)
 		self._socket.close()
 class Server:
 	def __init__(self,filename,treeFile=""):
 		self._filename=filename
 		self._treeFile=treeFile
 		if treeFile:
 			self._tree=HashTree.load(treeFile)
 		else:
 			self._tree=HashTree.fromFile(filename)
 		self._newLeaves=dict()
 		self.BLOCK_SIZE=self._tree.BLOCK_SIZE
 		self._ssl=ssl.create_default_context(ssl.Purpose.CLIENT_AUTH,cafile=conf.peers)
 		self._ssl.verify_mode=ssl.CERT_REQUIRED
 		self._ssl.load_cert_chain(conf.certfile,conf.keyfile)
 		self._ss = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 		self._ss.bind(("", conf.port))
 		self._ss.listen(1)
 		self._lastIndex=-1
 		self._dataFile=None
 	def serve(self):
 		while True:
 			with Connection(self._ss) as (incoming, outcoming):
+			with Connection(self._ss,self._ssl) as (incoming, outcoming):
 				try:
 					while True:
 						if not self._serveOne(incoming,outcoming): return
 				except AssertionError:
 					continue
 	def _serveOne(self,incoming,outcoming):
 		jsonData,binData=incoming.readMsg()
 		if jsonData["command"]=="init":
 			assert jsonData["blockSize"]==self.BLOCK_SIZE
 			assert jsonData["blockCount"]==self._tree.leafCount

0 comments (0 inline, 0 general)