From ea1cbc2349240a3111f076a183152ffeae636a2e Mon Sep 17 00:00:00 2001
From: Kristaps Kaupe <kristaps@blogiem.lv>
Date: Sun, 20 Oct 2024 16:46:49 +0300
Subject: [PATCH] Trusted key adding / removal via updates

---
 apply.sh     |  5 +++++
 keys/keys.sh | 24 ++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100755 keys/keys.sh

diff --git a/apply.sh b/apply.sh
index 6a9facc..4c253a1 100755
--- a/apply.sh
+++ b/apply.sh
@@ -12,6 +12,11 @@ exit_code=0
 # defined in the caller script
 rootdir="$SYSUPDATES_ROOTDIR"
 
+# keys
+printf "######## keys\n" 1>&2
+cd "$rootdir"
+./keys/keys.sh || exit 1
+
 # base os
 printf "######## base os\n" 1>&2
 cd "$rootdir"
diff --git a/keys/keys.sh b/keys/keys.sh
new file mode 100755
index 0000000..7735df8
--- /dev/null
+++ b/keys/keys.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+current_keys="$(gpg --list-keys --with-colons | grep '^pub' | cut -d: -f5)"
+
+new_keylist="$(mktemp)"
+for keyfile in keys/*.asc; do gpg --with-colons "$keyfile" 2>/dev/null | grep '^pub' | cut -d: -f5; done > "$new_keylist"
+# Remove keys that are no longer present
+for key in $current_keys; do
+    if ! grep -qs "$key" "$new_keylist"; then
+        echo "Removing key $key..."
+        gpg --batch --yes --delete-keys "$key"
+    fi
+done
+rm "$new_keylist"
+
+# Import new keys
+for keyfile in keys/*.asc; do
+    keyid="$(gpg --with-colons "$keyfile" 2>/dev/null | grep '^pub' | cut -d: -f5)"
+    if ! grep -qs "$keyid" <<< "$current_keys"; then
+        echo "Importing key $keyid from $keyfile..."
+        gpg --import "$keyfile"
+        echo -e "trust\n5\ny\n" | gpg --batch --no-tty --command-fd 0 --expert --edit-key "$keyid"
+    fi
+done