scifijunkie/pwnagotchi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: prevent user contributed plugins to crash the main process while loading

Browse Source
This commit is contained in:
Simone Margaritelli
2019-10-24 17:23:33 +02:00
parent 30e3898f3c
commit 61b957ac77
1 changed files with 12 additions and 8 deletions

4
pwnagotchi/plugins/__init__.py

@ -35,6 +35,7 @@ def load_from_file(filename):
def load_from_path(path, enabled=()): def load_from_path(path, enabled=()):
global loaded global loaded
for filename in glob.glob(os.path.join(path, "*.py")): for filename in glob.glob(os.path.join(path, "*.py")):
try:
name, plugin = load_from_file(filename) name, plugin = load_from_file(filename)
if name in loaded: if name in loaded:
raise Exception("plugin %s already loaded from %s" % (name, plugin.__file__)) raise Exception("plugin %s already loaded from %s" % (name, plugin.__file__))
@ -43,6 +44,9 @@ def load_from_path(path, enabled=()):
pass pass
else: else:
loaded[name] = plugin loaded[name] = plugin
except Exception as e:
logging.warning("error while loading %s: %s" % (filename, e))
logging.debug(e, exc_info=True)
return loaded return loaded