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

add git diff filter support #14

Closed
wants to merge 2 commits into from
Closed

add git diff filter support #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8528caa
add git filter support
Dec 29, 2020
42d3bd2
remove git filter, keep differ
Dec 29, 2020
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
68 changes: 50 additions & 18 deletions pkgs/agenix.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ function show_help () {
test $# -eq 0 && (show_help && exit 1)

REKEY=0
GIT_DIFF_TEXTCONV=0
DEFAULT_DECRYPT=(--decrypt)

while test $# -gt 0; do
Expand All @@ -55,6 +56,17 @@ while test $# -gt 0; do
fi
shift
;;
--git-diff-textconv)
shift
if test $# -gt 0; then
export FILE=$1
else
echo "no FILE specified"
exit 1
fi
shift
GIT_DIFF_TEXTCONV=1
;;
-i|--identity)
shift
if test $# -gt 0; then
Expand Down Expand Up @@ -94,32 +106,55 @@ function cleanup {
}
trap "cleanup" 0 2 3 15

function edit {
FILE=$1
function _keys {
KEYS=$((nix-instantiate --eval -E "(let rules = import $RULES; in builtins.concatStringsSep \"\n\" rules.\"$FILE\".publicKeys)" | sed 's/"//g' | sed 's/\\n/\n/g') || exit 1)

if [ -z "$KEYS" ]
then
>&2 echo "There is no rule for $FILE in $RULES."
exit 1
fi
}

function _decrypt_args {
DECRYPT=("''${DEFAULT_DECRYPT[@]}")
if [ -f "$HOME/.ssh/id_rsa" ]; then
DECRYPT+=(--identity "$HOME/.ssh/id_rsa")
fi
if [ -f "$HOME/.ssh/id_ed25519" ]; then
DECRYPT+=(--identity "$HOME/.ssh/id_ed25519")
fi
if [[ "''${DECRYPT[*]}" != *"--identity"* ]]; then
echo "No identity found to decrypt $FILE. Try adding an SSH key at $HOME/.ssh/id_rsa or $HOME/.ssh/id_ed25519 or using the --identity flag to specify a file."
exit 1
fi
}

function _encrypt_args {
ENCRYPT=()
while IFS= read -r key
do
ENCRYPT+=(--recipient "$key")
done <<< "$KEYS"
}

function git_diff_textconv {
FILE=$1
_decrypt_args
DECRYPT+=("$FILE")
Copy link
Contributor Author

@blaggacao blaggacao Dec 29, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

still have to check this at occasion

${ageBin} "''${DECRYPT[@]}" || exit 1
}

function edit {
FILE=$1
_keys

CLEARTEXT_DIR=$(mktemp -d)
CLEARTEXT_FILE="$CLEARTEXT_DIR/$(basename "$FILE")"

if [ -f "$FILE" ]
then
DECRYPT=("''${DEFAULT_DECRYPT[@]}")
if [ -f "$HOME/.ssh/id_rsa" ]; then
DECRYPT+=(--identity "$HOME/.ssh/id_rsa")
fi
if [ -f "$HOME/.ssh/id_ed25519" ]; then
DECRYPT+=(--identity "$HOME/.ssh/id_ed25519")
fi
if [[ "''${DECRYPT[*]}" != *"--identity"* ]]; then
echo "No identity found to decrypt $FILE. Try adding an SSH key at $HOME/.ssh/id_rsa or $HOME/.ssh/id_ed25519 or using the --identity flag to specify a file."
exit 1
fi
_decrypt_args
DECRYPT+=(-o "$CLEARTEXT_FILE" "$FILE")
${ageBin} "''${DECRYPT[@]}" || exit 1
cp "$CLEARTEXT_FILE" "$CLEARTEXT_FILE.before"
Expand All @@ -134,11 +169,7 @@ function edit {
fi
[ -f "$FILE" ] && [ "$EDITOR" != ":" ] && diff "$CLEARTEXT_FILE.before" "$CLEARTEXT_FILE" 1>/dev/null && echo "$FILE wasn't changed, skipping re-encryption." && return

ENCRYPT=()
while IFS= read -r key
do
ENCRYPT+=(--recipient "$key")
done <<< "$KEYS"
_encrypt_args

REENCRYPTED_DIR=$(mktemp -d)
REENCRYPTED_FILE="$REENCRYPTED_DIR/$(basename "$FILE")"
Expand All @@ -162,5 +193,6 @@ function rekey {
}

[ $REKEY -eq 1 ] && rekey && exit 0
[ $GIT_DIFF_TEXTCONV -eq 1 ] && git_diff_textconv && exit 0
edit "$FILE" && cleanup && exit 0
''