diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..5311da51 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.idea +*.pyc +venv diff --git a/Linux/laZagne.py b/Linux/laZagne.py index 901edbf4..e19e4dfc 100755 --- a/Linux/laZagne.py +++ b/Linux/laZagne.py @@ -72,7 +72,7 @@ def verbosity(): elif args['verbose'] >= 2: level = logging.DEBUG formatter = logging.Formatter(fmt='%(message)s') - stream = logging.StreamHandler() + stream = logging.StreamHandler(sys.stdout) stream.setFormatter(formatter) root = logging.getLogger() root.setLevel(level) diff --git a/Linux/lazagne/softwares/chats/pidgin.py b/Linux/lazagne/softwares/chats/pidgin.py index 2cb2d93e..fe8d894c 100755 --- a/Linux/lazagne/softwares/chats/pidgin.py +++ b/Linux/lazagne/softwares/chats/pidgin.py @@ -5,15 +5,22 @@ from lazagne.config.constant import * import xml.etree.cElementTree as ET from lazagne.config import homes -import dbus import os +try: + import dbus +except ImportError as e: + dbus = None + + class Pidgin(ModuleInfo): def __init__(self): ModuleInfo.__init__(self, 'pidgin', 'chats') # If pidgin is started, use the api to retrieve all passwords def check_if_pidgin_started(self): + if not dbus: + return False try: pwdFound = [] bus = dbus.SessionBus() @@ -38,7 +45,7 @@ def run(self, software_name=None): pwdFound = [] try: pwdTab = self.check_if_pidgin_started() - if pwdTab != False: + if pwdTab: pwdFound = pwdTab except: pass diff --git a/Linux/requirement.txt b/Linux/requirement.txt index 4d6ab88e..846b3a06 100644 --- a/Linux/requirement.txt +++ b/Linux/requirement.txt @@ -1,3 +1,4 @@ pycrypto pyasn1 https://github.com/n1nj4sec/memorpy/archive/master.zip +psutil diff --git a/Mac/laZagne.py b/Mac/laZagne.py index 1579f05a..7035f2d9 100755 --- a/Mac/laZagne.py +++ b/Mac/laZagne.py @@ -71,7 +71,7 @@ def verbosity(): FORMAT = "%(message)s" formatter = logging.Formatter(fmt=FORMAT) - stream = logging.StreamHandler() + stream = logging.StreamHandler(sys.stdout) stream.setFormatter(formatter) root = logging.getLogger() diff --git a/Windows/laZagne.py b/Windows/laZagne.py index 488baf30..33870b4a 100644 --- a/Windows/laZagne.py +++ b/Windows/laZagne.py @@ -83,7 +83,7 @@ def verbosity(): elif args['verbose'] >= 2: level = logging.DEBUG formatter = logging.Formatter(fmt='%(message)s') - stream = logging.StreamHandler() + stream = logging.StreamHandler(sys.stdout) stream.setFormatter(formatter) root = logging.getLogger() root.setLevel(level)