A new implementation of the plugin installer that runs in the plugin …

…runner instead of the home-app

plugin_runner/plugin_installer.py

@@ -0,0 +1,201 @@
+import json
+import os
+import shutil
+import tarfile
+import tempfile
+import zipfile
+from pathlib import Path
+from typing import Any, Union
+from urllib import parse
+
+import boto3
+import psycopg
+
+import settings
+
+Archive = Union[zipfile.ZipFile, tarfile.TarFile]
+# Plugin "packages" include this prefix in the database record for the plugin and the S3 bucket key.
+UPLOAD_TO_PREFIX = "plugins"
+
+
+class PluginError(Exception):
+    """An exception raised for plugin-related errors."""
+
+
+class PluginValidationError(PluginError):
+    """An exception raised when a plugin package is not valid."""
+
+
+class InvalidPluginFormat(PluginValidationError):
+    """An exception raised when the plugin file format is not supported."""
+
+
+class PluginInstallationError(PluginError):
+    """An exception raised when a plugin fails to install."""
+
+
+def get_database_dict_from_url() -> dict[str, Any]:
+    parsed_url = parse.urlparse(os.getenv("DATABASE_URL"))
+    db_name = parsed_url.path[1:]
+    return {
+        "dbname": db_name,
+        "user": parsed_url.username,
+        "password": parsed_url.password,
+        "host": parsed_url.hostname,
+        "port": parsed_url.port,
+    }
+
+
+def get_database_dict_from_env() -> dict[str, Any]:
+    return {
+        "dbname": "home-app",
+        "user": os.getenv("DB_USERNAME", "app"),
+        "password": os.getenv("DB_PASSWORD", "app"),
+        "host": os.getenv("DB_HOST", "home-app-db"),
+        "port": os.getenv("DB_PORT", "5432"),
+    }
+
+
+def open_database_connection():
+    # When running within Aptible, use the database URL, otherwise pull from the environment variables.
+    if os.getenv("DATABASE_URL"):
+        database_dict = get_database_dict_from_url()
+    else:
+        database_dict = get_database_dict_from_env()
+    conn = psycopg.connect(**database_dict)
+    return conn
+
+
+def enabled_plugins() -> dict[str, dict[str, str | dict[str, str]]]:
+    conn = open_database_connection()
+
+    plugins = {}
+
+    with conn.cursor() as cursor:
+        cursor.execute(
+            "select name, package, version, key, value from plugin_io_plugin p "
+            "join plugin_io_pluginsecret s on p.id = s.plugin_id where is_enabled"
+        )
+        rows = cursor.fetchall()
+        for row in rows:
+            if row["name"] not in plugins:
+                plugins[row["name"]] = {
+                    "version": row["version"],
+                    "package": row["package"],
+                    "secrets": {row["key"]: row["value"]},
+                }
+            else:
+                plugins[row["name"]]["secrets"][row["key"]] = row["value"]
+
+    return plugins
+
+
+def download_plugin(plugin_package: str) -> Path:
+    """Download the plugin package from the S3 bucket."""
+    s3 = boto3.client("s3")
+    temp_dir = tempfile.TemporaryDirectory()
+    prefix_dir = os.path.join(temp_dir.name, UPLOAD_TO_PREFIX)
+    os.mkdir(prefix_dir)  # create an intermediate directory reflecting the prefix
+    with open(os.path.join(temp_dir.name, plugin_package), "wb") as download_file:
+        s3.download_fileobj(
+            "canvas-client-media", f"{settings.CUSTOMER_IDENTIFIER}/{plugin_package}", download_file
+        )
+    return Path(os.path.join(temp_dir.name, plugin_package))
+
+
+def install_plugin(plugin_name: str, attributes: dict[str, str | dict[str, str]]) -> None:
+    """Install the given Plugin's package into the runtime."""
+    try:
+        print(f"Installing plugin '{plugin_name}'")
+
+        plugin_installation_path = Path(os.path.join(settings.PLUGIN_DIRECTORY, plugin_name))
+
+        # if plugin exists, first uninstall it
+        if plugin_installation_path.exists():
+            uninstall_plugin(plugin_name)
+
+        plugin_file_path = download_plugin(attributes["package"])
+        extract_plugin(plugin_file_path, plugin_installation_path)
+
+        install_plugin_secrets(plugin_name=plugin_name, secrets=attributes["secrets"])
+    except Exception as ex:
+        print(f"Failed to install plugin '{plugin_name}', version {attributes["version"]}")
+        raise PluginInstallationError() from ex
+
+
+def extract_plugin(plugin_file_path: Path, plugin_installation_path: Path) -> None:
+    """Extract plugin in `file` to the given `path`."""
+    archive: Archive | None = None
+
+    try:
+        if zipfile.is_zipfile(plugin_file_path):
+            archive = zipfile.ZipFile(plugin_file_path)
+            archive.extractall(plugin_installation_path)
+        elif tarfile.is_tarfile(plugin_file_path):
+            try:
+                archive = tarfile.TarFile.open(fileobj=open(plugin_file_path, "rb"))
+                archive.extractall(plugin_installation_path, filter="data")
+            except tarfile.ReadError as ex:
+                print(f"Unreadable tar archive: '{plugin_file_path}'")
+                raise InvalidPluginFormat from ex
+        else:
+            print(f"Unsupported file format: '{plugin_file_path}'")
+            raise InvalidPluginFormat
+    finally:
+        if archive:
+            archive.close()
+
+
+def install_plugin_secrets(plugin_name: str, secrets: dict[str, str]) -> None:
+    """Write the plugin's secrets to disk in the package's directory"""
+    print(f"Writing plugin secrets for '{plugin_name}'")
+
+    secrets_path = os.path.join(settings.PLUGIN_DIRECTORY, plugin_name, settings.SECRETS_FILE_NAME)
+
+    # Did the plugin ship a secrets.json? TOO BAD, IT'S GONE NOW.
+    try:
+        os.remove(secrets_path)
+    except OSError:
+        pass
+
+    with open(str(secrets_path), "w") as f:
+        json.dump(secrets, f)
+
+
+def disable_plugin(plugin_name: str) -> None:
+    """Disable the given plugin."""
+    conn = open_database_connection()
+    conn.cursor().execute(
+        "update plugin_io_plugin set is_enabled = false where name = %s", (plugin_name,)
+    )
+
+    uninstall_plugin(plugin_name)
+
+
+def uninstall_plugin(plugin_name: str) -> None:
+    """Remove the plugin from the filesystem"""
+    plugin_path = Path(os.path.join(settings.PLUGIN_DIRECTORY, plugin_name))
+
+    if plugin_path.exists():
+        shutil.rmtree(plugin_path)
+
+
+def install_plugins():
+    try:
+        shutil.rmtree(settings.PLUGIN_DIRECTORY)
+    except FileNotFoundError:
+        pass
+    os.mkdir(settings.PLUGIN_DIRECTORY)
+
+    for plugin_name, attributes in enabled_plugins().items():
+        try:
+            print(f"Installing plugin '{plugin_name}', version {attributes["version"]}")
+            install_plugin(plugin_name, attributes)
+        except PluginInstallationError:
+            disable_plugin(plugin_name)
+            print(
+                f"Installation failed for plugin '{plugin_name}', version {attributes["version"]}. The plugin has been disabled"
+            )
+            continue
+
+    return None

plugin_runner/plugin_synchronizer.py

@@ -7,6 +7,8 @@
 
 import redis
 
+from plugin_runner.plugin_installer import install_plugins
+
 APP_NAME = os.getenv("APP_NAME")
 
 CUSTOMER_IDENTIFIER = os.getenv("CUSTOMER_IDENTIFIER")
@@ -62,17 +64,13 @@ def main() -> None:
         if "action" not in data or "client_id" not in data:
             return
 
-        # Don't respond to our own messages
-        if data["client_id"] == CLIENT_ID:
-            return
-
         if data["action"] == "restart":
             # Run the plugin installer process
             try:
                 print("plugin-synchronizer: installing plugins")
-                check_output(["./manage.py", "install_plugins_v2"], cwd="/app", stderr=STDOUT)
+                install_plugins()
             except CalledProcessError as e:
-                print("plugin-synchronizer: `./manage.py install_plugins_v2` failed:", e)
+                print("plugin-synchronizer: `install_plugins` failed:", e)
 
             try:
                 print("plugin-synchronizer: sending SIGHUP to plugin-runner")

plugin_runner/tests/test_plugin_installer.py

@@ -0,0 +1,121 @@
+import json
+import tarfile
+import tempfile
+import zipfile
+from pathlib import Path
+
+from plugin_runner.plugin_installer import install_plugins, uninstall_plugin
+
+
+def create_tarball(name: str) -> Path:
+    # Create a temporary tarball file
+    temp_dir = tempfile.TemporaryDirectory(delete=False)
+    tarball_path = Path(f"{temp_dir.name}/{name}.tar.gz")
+
+    # Add some files to the tarball
+    with tarfile.open(tarball_path, "w:gz") as tar:
+        for i in range(3):
+            file_path = Path(temp_dir.name) / f"file{i}.txt"
+            file_path.write_text(f"Content of file {i}")
+            tar.add(file_path, arcname=f"file{i}.txt")
+
+    # Return a Path handle to the tarball
+    return tarball_path
+
+
+def create_zip_archive(name: str) -> Path:
+    # Create a temporary zip file
+    temp_dir = tempfile.TemporaryDirectory(delete=False)
+    zip_path = Path(f"{temp_dir.name}/{name}.zip")
+
+    # Add some files to the zip archive
+    with zipfile.ZipFile(zip_path, "w") as zipf:
+        for i in range(3):
+            file_path = Path(temp_dir.name) / f"file{i}.txt"
+            file_path.write_text(f"Content of file {i}")
+            zipf.write(file_path, arcname=f"file{i}.txt")
+
+    # Return a Path handle to the zip archive
+    return zip_path
+
+
+def test_plugin_installation_from_tarball(mocker) -> None:
+    mock_plugins = {
+        "plugin1": {
+            "version": "1.0",
+            "package": "plugins/plugin1.tar.gz",
+            "secrets": {"key1": "value1"},
+        },
+        "plugin2": {
+            "version": "2.0",
+            "package": "plugins/plugin2.tar.gz",
+            "secrets": {"key2": "value2"},
+        },
+    }
+
+    tarball_1 = create_tarball("plugin1")
+    tarball_2 = create_tarball("plugin2")
+
+    mocker.patch("plugin_runner.plugin_installer.enabled_plugins", return_value=mock_plugins)
+    mocker.patch(
+        "plugin_runner.plugin_installer.download_plugin", side_effect=[tarball_1, tarball_2]
+    )
+
+    install_plugins()
+    assert Path("plugin_runner/tests/data/plugins/plugin1").exists()
+    assert Path("plugin_runner/tests/data/plugins/plugin1/SECRETS.json").exists()
+    assert (
+        json.load(open("plugin_runner/tests/data/plugins/plugin1/SECRETS.json"))
+        == mock_plugins["plugin1"]["secrets"]
+    )
+    assert Path("plugin_runner/tests/data/plugins/plugin2").exists()
+    assert Path("plugin_runner/tests/data/plugins/plugin2/SECRETS.json").exists()
+    assert (
+        json.load(open("plugin_runner/tests/data/plugins/plugin2/SECRETS.json"))
+        == mock_plugins["plugin2"]["secrets"]
+    )
+
+    uninstall_plugin("plugin1")
+    uninstall_plugin("plugin2")
+    assert not Path("plugin_runner/tests/data/plugins/plugin1").exists()
+    assert not Path("plugin_runner/tests/data/plugins/plugin2").exists()
+
+
+def test_plugin_installation_from_zip_archive(mocker) -> None:
+    mock_plugins = {
+        "plugin1": {
+            "version": "1.0",
+            "package": "plugins/plugin1.zip",
+            "secrets": {"key1": "value1"},
+        },
+        "plugin2": {
+            "version": "2.0",
+            "package": "plugins/plugin2.zip",
+            "secrets": {"key2": "value2"},
+        },
+    }
+
+    zip_1 = create_zip_archive("plugin1")
+    zip_2 = create_zip_archive("plugin2")
+
+    mocker.patch("plugin_runner.plugin_installer.enabled_plugins", return_value=mock_plugins)
+    mocker.patch("plugin_runner.plugin_installer.download_plugin", side_effect=[zip_1, zip_2])
+
+    install_plugins()
+    assert Path("plugin_runner/tests/data/plugins/plugin1").exists()
+    assert Path("plugin_runner/tests/data/plugins/plugin1/SECRETS.json").exists()
+    assert (
+        json.load(open("plugin_runner/tests/data/plugins/plugin1/SECRETS.json"))
+        == mock_plugins["plugin1"]["secrets"]
+    )
+    assert Path("plugin_runner/tests/data/plugins/plugin2").exists()
+    assert Path("plugin_runner/tests/data/plugins/plugin2/SECRETS.json").exists()
+    assert (
+        json.load(open("plugin_runner/tests/data/plugins/plugin2/SECRETS.json"))
+        == mock_plugins["plugin2"]["secrets"]
+    )
+
+    uninstall_plugin("plugin1")
+    uninstall_plugin("plugin2")
+    assert not Path("plugin_runner/tests/data/plugins/plugin1").exists()
+    assert not Path("plugin_runner/tests/data/plugins/plugin2").exists()