clan/clan-core
11
2
Fork 13
Code Issues 90 Pull Requests 4 Actions Packages Projects 1 Releases Wiki Activity

secrets modules: pass secrets as bytes
All checks were successful
checks-impure / test (pull_request) Successful in 1m29s
Details
checks / test (pull_request) Successful in 2m17s
Details

Browse Source
This commit is contained in:
lassulus 2024-01-30 11:57:07 +01:00
parent 0dbfe52d62
commit 961eb26335
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/clan-cli/clan_cli/secrets/generate.py
View File

@ -74,7 +74,7 @@ def generate_secrets(machine: Machine) -> None:
msg = f"did not generate a file for '{secret}' when running the following command:\n" msg = f"did not generate a file for '{secret}' when running the following command:\n"
msg += machine.secrets_data[service]["generator"] msg += machine.secrets_data[service]["generator"]
raise ClanError(msg) raise ClanError(msg)
secret_store.set(service, secret, secret_file.read_text()) secret_store.set(service, secret, secret_file.read_bytes())
# store facts # store facts
for name, fact_path in machine.secrets_data[service]["facts"].items(): for name, fact_path in machine.secrets_data[service]["facts"].items():
fact_file = facts_dir / name fact_file = facts_dir / name

4
pkgs/clan-cli/clan_cli/secrets/modules/password_store.py
View File

@ -10,13 +10,13 @@ class SecretStore:
def __init__(self, machine: Machine) -> None: def __init__(self, machine: Machine) -> None:
self.machine = machine self.machine = machine
def set(self, service: str, name: str, value: str) -> None: def set(self, service: str, name: str, value: bytes) -> None:
subprocess.run( subprocess.run(
nix_shell( nix_shell(
["nixpkgs#pass"], ["nixpkgs#pass"],
["pass", "insert", "-m", f"machines/{self.machine.name}/{name}"], ["pass", "insert", "-m", f"machines/{self.machine.name}/{name}"],
), ),
input=value.encode("utf-8"), input=value,
check=True, check=True,
) )

4
pkgs/clan-cli/clan_cli/secrets/modules/sops.py
View File

@ -28,11 +28,11 @@ class SecretStore:
) )
add_machine(self.machine.flake_dir, self.machine.name, pub_key, False) add_machine(self.machine.flake_dir, self.machine.name, pub_key, False)
def set(self, _service: str, name: str, value: str) -> None: def set(self, _service: str, name: str, value: bytes) -> None:
encrypt_secret( encrypt_secret(
self.machine.flake_dir, self.machine.flake_dir,
sops_secrets_folder(self.machine.flake_dir) / f"{self.machine.name}-{name}", sops_secrets_folder(self.machine.flake_dir) / f"{self.machine.name}-{name}",
value, value.decode(),
add_machines=[self.machine.name], add_machines=[self.machine.name],
) )