From bba4578f2a9de3211d467d2767eb59039afa18bd Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@jerkface.net>
Date: Sat, 9 Oct 2021 06:18:18 -0400
Subject: commit what we've been running

---
 bin/cryptonomic-dyndns-command | 29 ++++++++++++++++++++++++++---
 bin/samizdat-ssh-uid           |  7 +++++--
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/bin/cryptonomic-dyndns-command b/bin/cryptonomic-dyndns-command
index c191066..3e69f56 100755
--- a/bin/cryptonomic-dyndns-command
+++ b/bin/cryptonomic-dyndns-command
@@ -14,11 +14,12 @@ powerdns_sqlite_add_replace_record()
 	local sql_record_type="$(sql_string "$2")"
 	local sql_ip_address="$(sql_string "$3")"
 
-	zone=${1#*.}
+	zone=cryptonomic.net
 	new_name=${label:+$label.}${1: -64 : 64}
 
 	local sql_new_name="$(sql_string "$new_name")"
 	local sql_zone="$(sql_string "$zone")"
+	local sql_sshfp="$(sql_string "$SSH_CLIENT_SSHFP_DATA")"
 
 	if false
 	then
@@ -37,7 +38,7 @@ powerdns_sqlite_add_replace_record()
 	sqlite3 $DB <<END
 ${SQL_ECHO:+.echo on}
 BEGIN;
-	DELETE FROM records WHERE type=$sql_record_type AND name=$sql_new_name;
+	DELETE FROM records WHERE name=$sql_new_name;
 
 	INSERT INTO records
 
@@ -53,10 +54,30 @@ BEGIN;
 			$sql_new_name,
 			$sql_record_type,
 			$sql_ip_address,
-			3600,
+			600,
 			0
 		FROM domains
 		WHERE name=$sql_zone;
+
+	INSERT INTO records
+
+		(domain_id,
+		name,
+		type,
+		content,
+		ttl,
+		prio)
+
+		SELECT
+			id,
+			$sql_new_name,
+			'SSHFP',
+			$sql_sshfp,
+			600,
+			0
+		FROM domains
+		WHERE name=$sql_zone;
+
 COMMIT;
 END
 	r=$?
@@ -133,6 +154,8 @@ PEM_DEST=$HOME/public_rsync
 
 eval "$(samizdat-ssh-uid --copy-pem "$PEM_DEST")"
 
+[ "$SSH_CLIENT_SSHFP_DATA" ] || die wtf
+
 domain=${SSH_CLIENT_DOMAIN}
 ip_address=${SSH_CLIENT%% *}
 
diff --git a/bin/samizdat-ssh-uid b/bin/samizdat-ssh-uid
index 2612bdc..2180cd5 100755
--- a/bin/samizdat-ssh-uid
+++ b/bin/samizdat-ssh-uid
@@ -21,8 +21,10 @@ get_domain()
 get_sshfp()
 {
     [ -f "$1" ] || return
-    sshfp_b16=$(ssh-keygen -r . -f "$1" | sed -ne 's/^. IN SSHFP [0-9]* 2 //p') &&
-        [ "$sshfp_b16" ] || die "could not determine ssh client fingerprint"
+    sshfp_raw=$(ssh-keygen -r . -f "$1" | sed -ne 's/^. IN SSHFP \([0-9]* 2 \)/\1/p' | head -n1) || die 'ssh-keygen'
+
+    sshfp_b16=$(echo "$sshfp_raw" | sed -ne 's/^[0-9]* 2 //p') &&
+    [ "$sshfp_b16" ] || die "could not determine ssh client fingerprint"
     sshfp_b32=$(b16_to_b32 "$sshfp_b16")
 }
 
@@ -82,6 +84,7 @@ dispose_of_temp_pem_files "$@"
 
 env -i \
     SSH_CLIENT_DOMAIN="$domain" \
+    SSH_CLIENT_SSHFP_DATA="'$sshfp_raw'" \
     SSH_CLIENT_FINGERPRINT="$sshfp_b32" \
     SSH_CLIENT_KEYTYPE="$keytype" \
     SSH_CLIENT_KEYDATA="$keydata"
-- 
cgit v1.2.3