JohnHammond
/
CTFd
mirror of https://github.com/JohnHammond/CTFd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Made get_configurable_plugins work nicely with config.jsons that include multiple plugin entries as a list

master
John Hammond 2020-05-06 20:28:00 -04:00
parent d29f5aaf44
commit c47d6161be
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CTFd/utils/plugins/__init__.py
View File

@ -54,11 +54,19 @@ def get_configurable_plugins():
path = os.path.join(plugins_path, dir, "config.json") path = os.path.join(plugins_path, dir, "config.json")
with open(path) as f: with open(path) as f:
plugin_json_data = json.loads(f.read()) plugin_json_data = json.loads(f.read())
p = Plugin( if type(plugin_json_data) is list:
name=plugin_json_data.get("name"), for plugin_json in plugin_json_data:
route=plugin_json_data.get("route"), p = Plugin(
) name=plugin_json.get("name"),
plugins.append(p) route=plugin_json.get("route"),
)
plugins.append(p)
else:
p = Plugin(
name=plugin_json_data.get("name"),
route=plugin_json_data.get("route"),
)
plugins.append(p)
elif os.path.isfile(os.path.join(plugins_path, dir, "config.html")): elif os.path.isfile(os.path.join(plugins_path, dir, "config.html")):
p = Plugin(name=dir, route="/admin/plugins/{}".format(dir)) p = Plugin(name=dir, route="/admin/plugins/{}".format(dir))
plugins.append(p) plugins.append(p)