Compare commits

..

4 commits

Author SHA1 Message Date
19b60de3f2
escape json 2025-08-24 11:36:00 +02:00
3410c97729
use more common naming scheme 2025-08-24 11:36:00 +02:00
aa58480b33
add shorthands 2025-08-24 11:36:00 +02:00
959d3911a5
add json templating 2025-08-24 11:36:00 +02:00
5 changed files with 74 additions and 12 deletions

View file

@ -1,6 +1,6 @@
{ {
inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
outputs = { nixpkgs, ... }@self: let outputs = { nixpkgs, ... }: let
supportedArchitectures = [ supportedArchitectures = [
"aarch64-darwin" "aarch64-darwin"
"aarch64-linux" "aarch64-linux"
@ -11,12 +11,16 @@
packages = nixpkgs.lib.genAttrs supportedArchitectures (system: { packages = nixpkgs.lib.genAttrs supportedArchitectures (system: {
nix_templater = nixpkgs.legacyPackages.${system}.callPackage ./pkgs/nix_templater {}; nix_templater = nixpkgs.legacyPackages.${system}.callPackage ./pkgs/nix_templater {};
}); });
legacyPackages = nixpkgs.lib.genAttrs supportedArchitectures (system: import ./lib.nix { legacyPackages = nixpkgs.lib.genAttrs supportedArchitectures (system: let
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
in import ./lib.nix {
inherit pkgs;
inherit (pkgs) lib;
nix_templater = packages.${system}.nix_templater; nix_templater = packages.${system}.nix_templater;
}); });
checks = nixpkgs.lib.genAttrs supportedArchitectures (system: { checks = nixpkgs.lib.genAttrs supportedArchitectures (system: {
template = import ./tests/template.nix { inherit legacyPackages system nixpkgs; }; template = import ./tests/template.nix { inherit legacyPackages system nixpkgs; };
json = import ./tests/json.nix { inherit legacyPackages system nixpkgs; };
}); });
}; };
} }

29
lib.nix
View file

@ -1,8 +1,11 @@
{ { pkgs, lib, nix_templater }:
pkgs, let
nix_templater ? pkgs.callPackage ./pkgs/nix_templater { }, escapeJson = {
}: "\"" = ''\"'';
{ "\\" = ''\\'';
};
in
rec {
# placeholder to be substituted with the content of a secret file # placeholder to be substituted with the content of a secret file
fileContents = file: { fileContents = file: {
outPath = "<${builtins.placeholder "nix_template"}${toString file}${builtins.placeholder "nix_template"}>"; outPath = "<${builtins.placeholder "nix_template"}${toString file}${builtins.placeholder "nix_template"}>";
@ -10,12 +13,12 @@
}; };
# make a template with placeholders # make a template with placeholders
template_text = { name, text, outPath }: templateText = { name, text, outPath, translations ? {} }:
pkgs.runCommand name { pkgs.runCommand name {
textBeforeTemplate = text; textBeforeTemplate = text;
script = '' script = ''
#!/bin/sh #!/bin/sh
${nix_templater}/bin/nix_templater ${builtins.placeholder "out"}/template ${builtins.placeholder "nix_template"} "${outPath}" ${nix_templater}/bin/nix_templater ${builtins.placeholder "out"}/template ${builtins.placeholder "nix_template"} "${outPath}" '${lib.strings.toJSON translations}'
''; '';
passAsFile = [ "script" "textBeforeTemplate" ]; passAsFile = [ "script" "textBeforeTemplate" ];
} '' } ''
@ -24,4 +27,16 @@
cp $scriptPath $out/bin/${name} cp $scriptPath $out/bin/${name}
chmod +x $out/bin/${name} chmod +x $out/bin/${name}
''; '';
templateGenerator = translations: generator: { name, value, outPath }: templateText {
inherit name outPath translations;
text = generator value;
};
templateJsonWith = options: templateGenerator escapeJson (lib.generators.toJSON options);
templateYamlWith = options: templateGenerator escapeJson (lib.generators.toYAML options); # just json
templateIniWith = options: templateGenerator escapeJson (lib.generators.toINI options);
templateJson = templateJsonWith { };
templateYaml = templateYamlWith { };
templateIni = templateIniWith { };
} }

View file

@ -1,10 +1,12 @@
# replace occurrences of a magic string in a template file # replace occurrences of a magic string in a template file
from json import loads
import sys import sys
from pathlib import Path from pathlib import Path
template_file = sys.argv[1] template_file = sys.argv[1]
magic_string = sys.argv[2] magic_string = sys.argv[2]
outfile = sys.argv[3] outfile = sys.argv[3]
translations = loads(sys.argv[4]) if len(sys.argv) >= 4 else {}
if Path(outfile).exists(): if Path(outfile).exists():
print(f"{outfile} already exists, aborting") print(f"{outfile} already exists, aborting")
@ -26,7 +28,7 @@ while True:
] ]
output += template_bytes[loc : loc + magic_start] output += template_bytes[loc : loc + magic_start]
# TODO handle errors better here # TODO handle errors better here
output += Path(magic_file.decode()).read_bytes() output += Path(magic_file.decode()).read_bytes().decode().translate(str.maketrans(translations)).encode()
loc = loc + magic_start + magic_end + len(magic_string) + 1 loc = loc + magic_start + magic_end + len(magic_string) + 1
Path(outfile).write_bytes(output) Path(outfile).write_bytes(output)

41
tests/json.nix Normal file
View file

@ -0,0 +1,41 @@
# test injecting a secret into a json template
{ legacyPackages, system, nixpkgs }:
let
hostPkgs = nixpkgs.legacyPackages.${system};
secret_file = hostPkgs.writeText "secret" "secret\\needing\"escaping";
in (nixpkgs.lib.nixos.runTest {
inherit hostPkgs;
name = "nix_templates";
nodes.machine = {pkgs, ...}: {
config = {
systemd.services.testservice = {
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Type = "oneshot";
ExecStartPre = "${legacyPackages.${system}.templateJson {
name = "test";
value = {
foo = "text";
bar = legacyPackages.${system}.fileContents secret_file;
};
outPath = "./test";
}}/bin/test";
ExecStart = pkgs.writeScript "test_file_got_templates" ''
#!/bin/sh
cat ./test | grep -q 'secret'
'';
};
};
};
};
testScript = ''
start_all()
print(machine.execute("uname -a"))
machine.wait_for_unit("multi-user.target")
print(machine.succeed("cat /test"))
print(machine.succeed("cat /test | grep -q secret"))
print(machine.succeed("cat /test | ${hostPkgs.jq}/bin/jq"))
'';
})

View file

@ -1,4 +1,4 @@
# test injecting a secret into a template # test injecting a secret into a text template
{ legacyPackages, system, nixpkgs }: { legacyPackages, system, nixpkgs }:
let let
# this file would usually be outside of the store # this file would usually be outside of the store
@ -14,7 +14,7 @@ in (nixpkgs.lib.nixos.runTest {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
ExecStartPre = "${legacyPackages.${system}.template_text { ExecStartPre = "${legacyPackages.${system}.templateText {
name = "test"; name = "test";
text = '' text = ''
public text public text