From 6a02ec3617ec30c7b9e60f073df7af9432e38a0b Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@jerkface.net>
Date: Tue, 13 Oct 2020 14:54:18 -0400
Subject: fix the subdomains

---
 bin/cryptonomic-dyndns-command | 73 +++++++++++++++++++++++++++++-------------
 1 file changed, 51 insertions(+), 22 deletions(-)

diff --git a/bin/cryptonomic-dyndns-command b/bin/cryptonomic-dyndns-command
index 8e97de7..348ed74 100755
--- a/bin/cryptonomic-dyndns-command
+++ b/bin/cryptonomic-dyndns-command
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-die() { printf '%s\n' "$*" >&2; exit 1; }
+die() { printf 'Error: %s\n' "$*" >&2; exit 1; }
+
+warn() { printf 'Warning: %s\n' "$*" >&2; }
 
 sql_string()
 {
@@ -9,13 +11,21 @@ sql_string()
 
 powerdns_sqlite_add_replace_record()
 {
-	local fqdn="$1"
-	local record_type="$(sql_string "$2")"
+	local sql_record_type="$(sql_string "$2")"
 	local sql_ip_address="$(sql_string "$3")"
 
-	fqdn=${fqdn: -64 : 64}
-	local sql_new_domain="$(sql_string "$fqdn")"
-	local sql_domain="$(sql_string "${fqdn#*.}")"
+	zone=${1#*.}
+	new_name=${label:+$label.}${1: -64 : 64}
+
+	local sql_new_name="$(sql_string "$new_name")"
+	local sql_zone="$(sql_string "$zone")"
+
+	if false
+	then
+		pdnsutil create-zone "$zone"
+		pdnsutil add-record "$zone" "$new_name" "$2" "$3"
+		return
+	fi
 
 	DBDIR=/etc/powerdns
 	DBNAME=powerdns.sqlite3
@@ -27,7 +37,7 @@ powerdns_sqlite_add_replace_record()
 	sqlite3 $DB <<END
 ${SQL_ECHO:+.echo on}
 BEGIN;
-	DELETE FROM records WHERE type=$record_type AND name=$sql_new_domain;
+	DELETE FROM records WHERE type=$sql_record_type AND name=$sql_new_name;
 
 	INSERT INTO records
 
@@ -40,23 +50,29 @@ BEGIN;
 
 		SELECT
 			id,
-			$sql_new_domain,
-			$record_type,
+			$sql_new_name,
+			$sql_record_type,
 			$sql_ip_address,
 			3600,
 			0
 		FROM domains
-		WHERE name=$sql_domain;
+		WHERE name=$sql_zone;
 COMMIT;
 END
 	r=$?
 	[ $r = 0 ] || return $r
 
-	printf '%s %s\n' "$fqdn" "$3"
+	printf '%s %s\n' "$new_name" "$3"
 }
 
 add()
 {
+        local label=
+        if [ $# = 3 ]
+        then
+                label=$1
+                shift
+        fi
 	local record_type ip="$2"
 	case "$ip" in
 		*.*.*.*) record_type=A ;;
@@ -67,20 +83,33 @@ add()
 	powerdns_sqlite_add_replace_record "$domain" "$record_type" "$ip"
 }
 
+validate_dns_label()
+{
+	if [ $#1 -gt 64 ]
+	then
+		warn "ignored DNS label: too long"
+		return 1
+	fi
+	case "$1" in
+	-*|*--*|*-)
+		warn 'ignored DNS label: invalid use of hyphens'
+		return 2
+		;;
+	*[^-A-Za-z0-9]*)
+		warn 'ignored DNS label: invalid character'
+		return 3
+		;;
+	esac
+	true
+}
+
 main()
 {
 	add "$domain" "$ip_address"
-
-	set -- $SSH_ORIGINAL_COMMAND
-	while [ $# -ge 1 ]; do
-		d=$1
-		shift
-
-		case "$d" in
-			*.*) continue;;
-		esac
-
-		add "$d.$domain" "$ip_address"
+	for label in $SSH_ORIGINAL_COMMAND
+	do
+		validate_dns_label "$label" || continue
+		add "$label" "$domain" "$ip_address"
 	done
 }
 
-- 
cgit v1.2.3