From fa776f0d0b7b4ca7071f0aa912be84e81caf6b61 Mon Sep 17 00:00:00 2001 From: marios Date: Mon, 18 Apr 2022 15:57:51 +0300 Subject: Callsigns (#37) * Plugin callsigns, filechangehandler thread bug fix, plugin file perms - Plugins are now assigned a callsign (a random string), which they use for all internal identification, like resource fetching and method calls. This is to ensure that plugins only access their own resources and methods. - Made FileChangeHandler send off events to a queue, that is then consumed by the Loader, instead of calling import_plugin on its own, since that caused weird issues with the event loop and the thread watchdog is using. - Plugins are now owned by root and have read-only permissions. This is handled automatically. * Improved general look and feel of plugin tab * Make all plugin entries have the same padding between them * Make "No plugins installed" text look the same as "No new notifications" Co-authored-by: WerWolv --- plugin_loader/main.py | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) (limited to 'plugin_loader/main.py') diff --git a/plugin_loader/main.py b/plugin_loader/main.py index 37a4ad1d..638457a4 100644 --- a/plugin_loader/main.py +++ b/plugin_loader/main.py @@ -18,15 +18,19 @@ from jinja2 import FileSystemLoader from os import path from asyncio import get_event_loop, sleep from json import loads, dumps +from subprocess import Popen from loader import Loader from injector import inject_to_tab, get_tab, tab_has_element from utilities import Utilities from browser import PluginBrowser - logger = getLogger("Main") +async def chown_plugin_dir(_): + Popen(["chown", "-R", "deck:deck", CONFIG["plugin_path"]]) + Popen(["chmod", "-R", "555", CONFIG["plugin_path"]]) + class PluginManager: def __init__(self) -> None: self.loop = get_event_loop() @@ -37,6 +41,7 @@ class PluginManager: jinja_setup(self.web_app, loader=FileSystemLoader(path.join(path.dirname(__file__), 'templates'))) self.web_app.on_startup.append(self.inject_javascript) + self.web_app.on_startup.append(chown_plugin_dir) self.web_app.add_routes([static("/static", path.join(path.dirname(__file__), 'static'))]) self.loop.create_task(self.method_call_listener()) self.loop.create_task(self.loader_reinjector()) @@ -47,6 +52,21 @@ class PluginManager: if context["message"] == "Unclosed connection": return loop.default_exception_handler(context) + + async def loader_reinjector(self): + while True: + await sleep(1) + if not await tab_has_element("QuickAccess", "plugin_iframe"): + logger.info("Plugin loader isn't present in Steam anymore, reinjecting...") + await self.inject_javascript() + + async def inject_javascript(self, request=None): + try: + await inject_to_tab("QuickAccess", open(path.join(path.dirname(__file__), "static/library.js"), "r").read()) + await inject_to_tab("QuickAccess", open(path.join(path.dirname(__file__), "static/plugin_page.js"), "r").read()) + except: + logger.info("Failed to inject JavaScript into tab") + pass async def resolve_method_call(self, tab, call_id, response): await tab._send_devtools_cmd({ @@ -88,20 +108,6 @@ class PluginManager: if not "id" in data and data["method"] == "Runtime.consoleAPICalled" and data["params"]["type"] == "debug": method = loads(data["params"]["args"][0]["value"]) self.loop.create_task(self.handle_method_call(method, tab)) - - async def loader_reinjector(self): - while True: - await sleep(1) - if not await tab_has_element("QuickAccess", "plugin_iframe"): - logger.info("Plugin loader isn't present in Steam anymore, reinjecting...") - await self.inject_javascript() - - async def inject_javascript(self, request=None): - try: - await inject_to_tab("QuickAccess", open(path.join(path.dirname(__file__), "static/plugin_page.js"), "r").read()) - except: - logger.info("Failed to inject JavaScript into tab") - pass def run(self): return run_app(self.web_app, host=CONFIG["server_host"], port=CONFIG["server_port"], loop=self.loop, access_log=None) -- cgit v1.2.3