1 files changed, 57 insertions, 32 deletions

diff --git a/src/dyndns-command.sh b/src/dyndns-command.sh
index 1061b31..8530058 100755
--- a/src/dyndns-command.sh
+++ b/src/dyndns-command.sh
@@ -1,24 +1,24 @@
 #!/bin/bash
-subdomain=${SSH_REMOTE_FINGERPRINT//:/}
-ip_address=${SSH_CLIENT%% *}
-lan_address="$SSH_ORIGINAL_COMMAND"
 
-domain=ssh.cryptonomic.net 
+die() { printf '%s\n' "$*" >&2; exit 1; }
 
-sqlescape()
+sql_string()
 {
-        printf '%s' "'${1/\'/\'\'}'"
+        printf '%s' "'${1//\'/\'\'}'"
 }
 
-add()
+powerdns_sqlite_add_replace_record()
 {
-        local newdomain="$(sqlescape "$1.$domain")" ip_address="$(sqlescape "$2")" domain="$(sqlescape "$domain")"
+        local sql_new_domain="$(sql_string "$1.$3")"
+        local sql_ip_address="$(sql_string "$2")"
+        local sql_domain="$(sql_string "$3")"
+        local record_type="$(sql_string "$4")"
 
         sqlite3 /etc/powerdns/powerdns.sqlite3 <<END
 BEGIN;
-        delete from records where type='A' and name=$newdomain;
+        DELETE FROM records WHERE type=$record_type AND name=$sql_new_domain;
 
-        insert into records
+        INSERT INTO records
 
                 (domain_id,
                 name,
@@ -27,33 +27,58 @@ BEGIN;
                 ttl,
                 prio)
 
-                select
+                SELECT
                         id,
-                        $newdomain,
-                        'A',
-                        $ip_address,
+                        $sql_new_domain,
+                        $record_type,
+                        $sql_ip_address,
                         3600,
                         0
-                from domains
-                where name=$domain;
+                FROM domains
+                WHERE name=$sql_domain;
 COMMIT;
 END
-        if [ $? = 0 ]; then
-                printf '%s\n' "$1 $2"
-        fi
 }
 
-add "$subdomain" "$ip_address"
-
-set -- $lan_address
-while [ $# -ge 2 ]; do
-        d=$1
-        ip=$2
-        shift 2
-        
-        case "$d" in
-                *.*) continue;;
+add()
+{
+        local record_type
+        case "$2" in
+                *.*.*.*) record_type=A ;;
+                *:*) record_type=AAAA ;;
+                *) exit 1 ;;
         esac
-        
-        add "$d.$subdomain" "$ip"
-done
+
+        powerdns_sqlite_add_replace_record "$1" "$2" "$domain" "$record_type" \
+        && printf '%s %s\n' "$1.$domain $2"
+}
+
+main()
+{
+        add "$subdomain" "$ip_address"
+
+        set -- $SSH_ORIGINAL_COMMAND
+        while [ $# -ge 2 ]; do
+                d=$1
+                ip=$2
+                shift 2
+
+                case "$d" in
+                        *.*) continue;;
+                esac
+
+                add "$d.$subdomain" "$ip"
+        done
+}
+
+PEM_DEST=$HOME/public_rsync
+
+PATH=$HOME/bin:$PATH
+
+eval "$(samizdat-ssh-uid --copy-pem "$PEM_DEST")"
+
+domain=${SSH_CLIENT_DOMAIN}
+subdomain=${SSH_CLIENT_FINGERPRINT}
+ip_address=${SSH_CLIENT%% *}
+
+main "$@"