From 82a383f0f0c277f8635cbb5cc942157d7ae9179f Mon Sep 17 00:00:00 2001
From: Jaap Marcus <9754650+jaapmarcus@users.noreply.github.com>
Date: Mon, 12 Jun 2023 14:20:13 +0200
Subject: [PATCH] Improve DNS SEC Public key information display
https://forum.hestiacp.com/t/dnssec-show-key-tag-field/9805
---
bin/v-list-dnssec-public-key | 17 ++++++++++-------
web/templates/pages/list_dns_public.php | 14 +++++++++++++-
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/bin/v-list-dnssec-public-key b/bin/v-list-dnssec-public-key
index a1534ac6fe..54eb5c2d1e 100755
--- a/bin/v-list-dnssec-public-key
+++ b/bin/v-list-dnssec-public-key
@@ -42,11 +42,12 @@ is_object_valid 'dns' 'DOMAIN' "$domain"
json_list() {
echo '{'
echo ' "'$DOMAIN'": {
- "RECORD": "'$record'",
- "FLAG": "'$flag'",
- "ALGORITHM": "'$algorithm'",
- "KEY": "'$key'",
- "DS":"'$ds'"
+ "RECORD": "'$record'",
+ "KEYTAG": "'$keytag'",
+ "FLAG": "'$flag'",
+ "ALGORITHM": "'$algorithm'",
+ "KEY": "'$key'",
+ "DS":"'$ds'"
}'
echo '}'
}
@@ -54,7 +55,8 @@ json_list() {
# SHELL list function
shell_list() {
echo "RECORD: $record"
- echo "DS: $DS"
+ echo "DS: $ds"
+ echo "KEYTAG: $keytag"
echo "FLAG: $flag"
echo "ALGORITHM: $algorithm"
echo "KEY: $key"
@@ -77,10 +79,11 @@ parse_object_kv_list $(grep "DOMAIN='$domain'" $USER_DATA/dns.conf)
if [ -n "$KEY" ]; then
record=$(cat "/var/cache/bind/K$domain_idn.+013+$KEY.key" | grep DNSKEY)
+ ds=$(dnssec-dsfromkey "/var/cache/bind/K$domain_idn.+013+$KEY.key")
+ keytag=$(echo "$ds" | cut -d' ' -f4)
flag=$(echo "$record" | cut -d' ' -f5)
algorithm=$(echo "$record" | cut -d' ' -f7)
key="$(echo "$record" | cut -d' ' -f8) $(echo "$record" | cut -d' ' -f9)"
- ds=$(dnssec-dsfromkey "/var/cache/bind/K$domain_idn.+013+$KEY.key")
fi
case $format in
diff --git a/web/templates/pages/list_dns_public.php b/web/templates/pages/list_dns_public.php
index fbb51fe6bd..399d85bdfc 100644
--- a/web/templates/pages/list_dns_public.php
+++ b/web/templates/pages/list_dns_public.php
@@ -89,10 +89,22 @@
+
+