diff --git a/pupy/modules/lazagne.py b/pupy/modules/lazagne.py index 25da909f..5a003b94 100644 --- a/pupy/modules/lazagne.py +++ b/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()) diff --git a/pupy/packages/linux/all/laZagne.py b/pupy/packages/linux/all/laZagne.py deleted file mode 120000 index 91fc0631..00000000 --- a/pupy/packages/linux/all/laZagne.py +++ /dev/null @@ -1 +0,0 @@ -../../../external/LaZagne/Linux/laZagne.py \ No newline at end of file diff --git a/pupy/packages/windows/all/laZagne.py b/pupy/packages/windows/all/laZagne.py deleted file mode 120000 index e1666676..00000000 --- a/pupy/packages/windows/all/laZagne.py +++ /dev/null @@ -1 +0,0 @@ -../../../external/LaZagne/Windows/laZagne.py \ No newline at end of file diff --git a/pupy/requirements.txt b/pupy/requirements.txt index d766b775..89f274fe 100644 --- a/pupy/requirements.txt +++ b/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 diff --git a/pupy/tox.ini b/pupy/tox.ini index ff9752f4..a0971ec3 100644 --- a/pupy/tox.ini +++ b/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