git.delta.rocks / jrsonnet / refs/commits / db326543f0fb

difftreelog

feat add node id to garbage secret generator

Yaroslav Bolyukin2024-07-02parent: #27d8bf1.patch.diff
in: trunk

1 file changed

modifiedlib/fleetLib.nixdiffbeforeafterboth
57 encoding ? null,57 encoding ? null,
58 }: {mkSecretGenerator, ...}:58 }: {mkSecretGenerator, ...}:
59 mkSecretGenerator {59 mkSecretGenerator {
60 script = ''60 script = ''
61 mkdir $out61 mkdir $out
62 gh generate ed25519 -p $out/public -s $out/secret \62 gh generate ed25519 -p $out/public -s $out/secret \
63 ${lib.optionalString noEmbedPublic "--no-embed-public"} \63 ${optionalString noEmbedPublic "--no-embed-public"} \
64 ${lib.optionalString (encoding != null) "--encoding=${encoding}"}64 ${optionalString (encoding != null) "--encoding=${encoding}"}
65 '';65 '';
66 };66 };
6767
68 mkGarage = {}: mkEd25519 {noEmbedPublic = true;};68 mkGarage = {}: {mkSecretGenerator, ...}: mkSecretGenerator {
69 script = ''
70 mkdir $out
71 gh generate ed25519 -p $out/public -s $out/secret
72 gh decode -i $out/public | gh public -e hex -o $out/node_id
73 '';
74 };
6975
70 mkX25519 = {encoding ? null}: {mkSecretGenerator, ...}:76 mkX25519 = {encoding ? null}: {mkSecretGenerator, ...}:
71 mkSecretGenerator {77 mkSecretGenerator {
72 script = ''78 script = ''
73 mkdir $out79 mkdir $out
74 gh generate x25519 -p $out/public -s $out/secret \80 gh generate x25519 -p $out/public -s $out/secret \
75 ${lib.optionalString (encoding != null) "--encoding=${encoding}"}81 ${optionalString (encoding != null) "--encoding=${encoding}"}
76 '';82 '';
77 };83 };
7884
79 mkWireguard = {}: mkX25519 {encoding = "base64";};85 mkWireguard = {}: mkX25519 {encoding = "base64";};