jab2870/PappyProxy
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Debugging Crypto config and temp directory creation

Browse source 
Attempting to get stub file creation and copying working. Fixed
syntax errors, and now attempting to get password reading working
in the test environment.
This commit is contained in:
onizenso 2016-03-25 19:43:43 +00:00
parent ad37727c6b
commit b56bb83558
5 changed files with 111 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pappyproxy/pappy.py
View file

@ -64,7 +64,7 @@ class PappySession(object):
self.dbpool = None
self.delete_data_on_quit = False
self.ports = None
self.crypto = Crypto(sessconfig)
self.crypto = crypto.Crypto(sessconfig)
self.password = None
@defer.inlineCallbacks
@ -145,16 +145,11 @@ class PappySession(object):
@defer.inlineCallbacks
def encrypt(self):
if self.password:
self.crypto.encrypt_project(self.password)
else:
self.password = self.crypto.get_password()
self.crypto.encrypt_project(self.password)
self.crypto.encrypt_project(self.password)
@defer.inlineCallbacks
def decrypt(self):
self.password = self.crypto.get_password()
self.crypto.decrypt_project(self.password)
self.crypto.decrypt_project()
@defer.inlineCallbacks
def cleanup(self, ignored=None):