WIP: clan-cli secrets: add secret_store as python class

pkgs/clan-cli/clan_cli/machines/machines.py

@@ -49,6 +49,10 @@ class Machine:
         self.deployment_address = self.machine_data["deploymentAddress"]
         self.upload_secrets = self.machine_data["uploadSecrets"]
         self.generate_secrets = self.machine_data["generateSecrets"]
+        self.secrets_module = self.machine_data["secretsModule"]
+        self.secrets_data = json.loads(
+            Path(self.machine_data["secretsData"]).read_text()
+        )
         self.secrets_upload_directory = self.machine_data["secretsUploadDirectory"]
         self.eval_cache: dict[str, str] = {}
         self.build_cache: dict[str, Path] = {}

pkgs/clan-cli/clan_cli/secrets/generate.py

@@ -1,27 +1,78 @@
 import argparse
 import logging
 import os
-import sys
+import shutil
+import types
+from importlib.machinery import SourceFileLoader
+from pathlib import Path
+from tempfile import TemporaryDirectory
 
-from clan_cli.cmd import Log, run
+from clan_cli.cmd import run
 
+from ..errors import ClanError
 from ..machines.machines import Machine
+from ..nix import nix_shell
 
 log = logging.getLogger(__name__)
 
 
 def generate_secrets(machine: Machine) -> None:
-    env = os.environ.copy()
-    env["CLAN_DIR"] = str(machine.flake_dir)
-    env["PYTHONPATH"] = ":".join(sys.path)  # TODO do this in the clanCore module
+    # load secrets module from file
+    loader = SourceFileLoader("secret_module", machine.secrets_module)
+    secrets_module = types.ModuleType(loader.name)
+    loader.exec_module(secrets_module)
+    secret_store = secrets_module.SecretStore(machine=machine)
 
-    print(f"generating secrets... {machine.generate_secrets}")
-    run(
-        [machine.generate_secrets],
-        env=env,
-        error_msg="failed to generate secrets",
-        log=Log.BOTH,
-    )
+    with TemporaryDirectory() as d:
+        for service in machine.secrets_data:
+            print(service)
+            tmpdir = Path(d) / service
+            # check if all secrets exist and generate them if at least one is missing
+            needs_regeneration = any(
+                not secret_store.exists(service, secret)
+                for secret in machine.secrets_data[service]["secrets"]
+            ) or any(
+                not (machine.flake_dir / fact).exists()
+                for fact in machine.secrets_data[service]["facts"].values()
+            )
+            for fact in machine.secrets_data[service]["facts"].values():
+                if not (machine.flake_dir / fact).exists():
+                    print(f"fact {fact} is missing")
+            if needs_regeneration:
+                env = os.environ.copy()
+                facts_dir = tmpdir / "facts"
+                facts_dir.mkdir(parents=True)
+                env["facts"] = str(facts_dir)
+                secrets_dir = tmpdir / "secrets"
+                secrets_dir.mkdir(parents=True)
+                env["secrets"] = str(secrets_dir)
+                # TODO use bubblewrap here
+                cmd = nix_shell(
+                    ["nixpkgs#bash"],
+                    ["bash", "-c", machine.secrets_data[service]["generator"]],
+                )
+                run(
+                    cmd,
+                    env=env,
+                )
+                # store secrets
+                for secret in machine.secrets_data[service]["secrets"]:
+                    secret_file = secrets_dir / secret
+                    if not secret_file.is_file():
+                        msg = f"did not generate a file for '{secret}' when running the following command:\n"
+                        msg += machine.secrets_data[service]["generator"]
+                        raise ClanError(msg)
+                    secret_store.set(service, secret, secret_file.read_text())
+                # store facts
+                for name, fact_path in machine.secrets_data[service]["facts"].items():
+                    fact_file = facts_dir / name
+                    if not fact_file.is_file():
+                        msg = f"did not generate a file for '{name}' when running the following command:\n"
+                        msg += machine.secrets_data[service]["generator"]
+                        raise ClanError(msg)
+                    fact_path = machine.flake_dir / fact_path
+                    fact_path.parent.mkdir(parents=True, exist_ok=True)
+                    shutil.copyfile(fact_file, fact_path)
 
     print("successfully generated secrets")
 

pkgs/clan-cli/clan_cli/secrets/sops_generate.py

@@ -1,128 +0,0 @@
-import logging
-import os
-import shlex
-import shutil
-import sys
-from pathlib import Path
-from tempfile import TemporaryDirectory
-from typing import Any
-
-from clan_cli.cmd import Log, run
-from clan_cli.nix import nix_shell
-
-from ..errors import ClanError
-from .folders import sops_secrets_folder
-from .machines import add_machine, has_machine
-from .secrets import decrypt_secret, encrypt_secret, has_secret
-from .sops import generate_private_key
-
-log = logging.getLogger(__name__)
-
-
-def generate_host_key(flake_dir: Path, machine_name: str) -> None:
-    if has_machine(flake_dir, machine_name):
-        return
-    priv_key, pub_key = generate_private_key()
-    encrypt_secret(
-        flake_dir,
-        sops_secrets_folder(flake_dir) / f"{machine_name}-age.key",
-        priv_key,
-    )
-    add_machine(flake_dir, machine_name, pub_key, False)
-
-
-def generate_secrets_group(
-    flake_dir: Path,
-    secret_group: str,
-    machine_name: str,
-    tempdir: Path,
-    secret_options: dict[str, Any],
-) -> None:
-    clan_dir = flake_dir
-    secrets = secret_options["secrets"]
-    needs_regeneration = any(
-        not has_secret(flake_dir, f"{machine_name}-{name}") for name in secrets
-    ) or any(
-        not (flake_dir / fact).exists() for fact in secret_options["facts"].values()
-    )
-
-    generator = secret_options["generator"]
-    subdir = tempdir / secret_group
-    if needs_regeneration:
-        facts_dir = subdir / "facts"
-        facts_dir.mkdir(parents=True)
-        secrets_dir = subdir / "secrets"
-        secrets_dir.mkdir(parents=True)
-
-        text = f"""
-set -euo pipefail
-export facts={shlex.quote(str(facts_dir))}
-export secrets={shlex.quote(str(secrets_dir))}
-{generator}
-        """
-        cmd = nix_shell(["nixpkgs#bash"], ["bash", "-c", text])
-        run(cmd, log=Log.BOTH)
-
-        for name in secrets:
-            secret_file = secrets_dir / name
-            if not secret_file.is_file():
-                msg = f"did not generate a file for '{name}' when running the following command:\n"
-                msg += text
-                raise ClanError(msg)
-            encrypt_secret(
-                flake_dir,
-                sops_secrets_folder(flake_dir) / f"{machine_name}-{name}",
-                secret_file.read_text(),
-                add_machines=[machine_name],
-            )
-        for name, fact_path in secret_options["facts"].items():
-            fact_file = facts_dir / name
-            if not fact_file.is_file():
-                msg = f"did not generate a file for '{name}' when running the following command:\n"
-                msg += text
-                raise ClanError(msg)
-            fact_path = clan_dir / fact_path
-            fact_path.parent.mkdir(parents=True, exist_ok=True)
-            shutil.copyfile(fact_file, fact_path)
-
-
-# this is called by the sops.nix clan core module
-def generate_secrets_from_nix(
-    machine_name: str,
-    secret_submodules: dict[str, Any],
-) -> None:
-    flake_dir = Path(os.environ["CLAN_DIR"])
-    generate_host_key(flake_dir, machine_name)
-    errors = {}
-    log.debug("Generating secrets for machine %s and flake %s", machine_name, flake_dir)
-    with TemporaryDirectory() as d:
-        # if any of the secrets are missing, we regenerate all connected facts/secrets
-        for secret_group, secret_options in secret_submodules.items():
-            try:
-                generate_secrets_group(
-                    flake_dir, secret_group, machine_name, Path(d), secret_options
-                )
-            except ClanError as e:
-                errors[secret_group] = e
-    for secret_group, error in errors.items():
-        print(f"failed to generate secrets for {machine_name}/{secret_group}:")
-        print(error, file=sys.stderr)
-    if len(errors) > 0:
-        sys.exit(1)
-
-
-# this is called by the sops.nix clan core module
-def upload_age_key_from_nix(
-    machine_name: str,
-) -> None:
-    flake_dir = Path(os.environ["CLAN_DIR"])
-    log.debug("Uploading secrets for machine %s and flake %s", machine_name, flake_dir)
-    secret_name = f"{machine_name}-age.key"
-    if not has_secret(
-        flake_dir, secret_name
-    ):  # skip uploading the secret, not managed by us
-        return
-    secret = decrypt_secret(flake_dir, secret_name)
-
-    secrets_dir = Path(os.environ["SECRETS_DIR"])
-    (secrets_dir / "key.txt").write_text(secret)

pkgs/clan-cli/clan_cli/secrets/upload.py

@@ -1,5 +1,7 @@
 import argparse
 import logging
+import types
+from importlib.machinery import SourceFileLoader
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
@@ -11,29 +13,41 @@ log = logging.getLogger(__name__)
 
 
 def upload_secrets(machine: Machine) -> None:
-    with TemporaryDirectory() as tempdir_:
-        tempdir = Path(tempdir_)
-        should_upload = machine.run_upload_secrets(tempdir)
+    # load secrets module from file
+    loader = SourceFileLoader("secret_module", machine.secrets_module)
+    secrets_module = types.ModuleType(loader.name)
+    loader.exec_module(secrets_module)
+    secret_store = secrets_module.SecretStore(machine=machine)
 
-        if should_upload:
-            host = machine.host
+    update_check = getattr(secret_store, "update_check", None)
+    if callable(update_check):
+        if update_check():
+            log.info("Secrets already up to date")
+            return
+    with TemporaryDirectory() as tempdir:
+        secrets = []
+        for service in machine.secrets_data:
+            for secret in machine.secrets_data[service]["secrets"]:
+                secrets.append((service, secret))
+        secret_store.upload(Path(tempdir), secrets)
+        host = machine.host
 
-            ssh_cmd = host.ssh_cmd()
-            run(
-                nix_shell(
-                    ["nixpkgs#rsync"],
-                    [
-                        "rsync",
-                        "-e",
-                        " ".join(["ssh"] + ssh_cmd[2:]),
-                        "-az",
-                        "--delete",
-                        f"{tempdir!s}/",
-                        f"{host.user}@{host.host}:{machine.secrets_upload_directory}/",
-                    ],
-                ),
-                log=Log.BOTH,
-            )
+        ssh_cmd = host.ssh_cmd()
+        run(
+            nix_shell(
+                ["nixpkgs#rsync"],
+                [
+                    "rsync",
+                    "-e",
+                    " ".join(["ssh"] + ssh_cmd[2:]),
+                    "-az",
+                    "--delete",
+                    f"{tempdir!s}/",
+                    f"{host.user}@{host.host}:{machine.secrets_upload_directory}/",
+                ],
+            ),
+            log=Log.BOTH,
+        )
 
 
 def upload_command(args: argparse.Namespace) -> None: