Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feature: add an option to output secrets in armor #276

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
+43 −8
Open

feature: add an option to output secrets in armor #276

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c1b9550
Try adding an option to output with armor
dlubawy Jul 24, 2024
c14be72
Add armored example
dlubawy Jul 29, 2024
af95431
Add integration test for armored secret
dlubawy Jul 29, 2024
7133e54
Update docs to include example of armored output
dlubawy Jul 29, 2024
f6288a8
Run nix fmt on secrets.nix
dlubawy Jul 30, 2024
acbc2e5
Remove path config to use default secret path in test
dlubawy Jul 30, 2024
a5725ba
Add wait for file write before assertion
dlubawy Jul 30, 2024
0c9ed95
Add more description on why armor may be useful
dlubawy Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions pkgs/agenix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@ function keys {
(@nixInstantiate@ --json --eval --strict -E "(let rules = import $RULES; in rules.\"$1\".publicKeys)" | @jqBin@ -r .[]) || exit 1
}

function armor {
(@nixInstantiate@ --json --eval --strict -E "(let rules = import $RULES; in (builtins.hasAttr \"armor\" rules.\"$1\" && rules.\"$1\".armor))") || exit 1
}

function decrypt {
FILE=$1
KEYS=$2
Expand Down Expand Up @@ -148,6 +152,7 @@ function decrypt {
function edit {
FILE=$1
KEYS=$(keys "$FILE") || exit 1
ARMOR=$(armor "$FILE") || exit 1

CLEARTEXT_DIR=$(@mktempBin@ -d)
CLEARTEXT_FILE="$CLEARTEXT_DIR/$(basename "$FILE")"
Expand All @@ -169,6 +174,9 @@ function edit {
[ -f "$FILE" ] && [ "$EDITOR" != ":" ] && @diffBin@ -q "$CLEARTEXT_FILE.before" "$CLEARTEXT_FILE" && warn "$FILE wasn't changed, skipping re-encryption." && return

ENCRYPT=()
if [[ "$ARMOR" == "true" ]]; then
ENCRYPT+=(--armor)
fi
while IFS= read -r key
do
if [ -n "$key" ]; then
Expand Down
Loading