Merge branch 'fix/jammy-idn-extra' into main

Author: jaapmarcus

bin/v-add-dns-record

@@ -55,8 +55,8 @@ if [[ $rtype =~ NS|CNAME|MX|PTR|SRV ]]; then
 fi
 
 if [[ $rtype =~ NS|CNAME|MX|PTR|SRV ]]; then
-    dvalue=$(idn -t --quiet -a "$dvalue" )
-    record=$(idn -t --quiet -a "$record" )
+    dvalue=$(idn2 --quiet  "$dvalue" )
+    record=$(idn2 --quiet  "$record" )
 fi
 
 # Cleanup quotes on dvalue

bin/v-add-web-domain-redirect

@@ -18,7 +18,7 @@
 # Argument definition
 user=$1
 domain=$2
-redirect=$(echo $3 | idn);
+redirect=$(echo $3 | idn2);
 code=${4-301}
 restart=${5-no}
 

bin/v-add-web-domain-ssl

@@ -34,7 +34,7 @@ if [[ "$domain" =~ .*\.$ ]]; then
 fi
 
 domain=$domain
-domain_idn=$(idn -t --quiet -a "$domain")
+domain_idn=$(idn2 --quiet "$domain")
 
 # Includes
 # shellcheck source=/etc/hestiacp/hestia.conf

bin/v-change-dns-record

@@ -17,7 +17,7 @@ domain_idn=$2
 id=$3
 record=$4
 rtype=$5
-dvalue=$(idn -t --quiet -u "$6" )
+dvalue=$6
 priority=$7
 restart=$8
 ttl=$9
@@ -87,6 +87,11 @@ if [[ $rtype =~ NS|CNAME|MX|PTR|SRV ]]; then
     fi
 fi
 
+if [[ $rtype =~ NS|CNAME|MX|PTR|SRV ]]; then
+    dvalue=$(idn2  --quiet  "$dvalue" )
+    record=$(idn2  --quiet  "$record" )
+fi
+
 if [ "$rtype" != "CAA" ]; then
     dvalue=${dvalue//\"/}
 

test/test.bats

@@ -70,7 +70,7 @@ function validate_web_domain() {
 
     # Test HTTP
     # Curl hates UTF domains so convert them to ascci. 
-    domain_idn=$(idn -a $domain)
+    domain_idn=$(idn2 $domain)
     run curl --location --silent --show-error --insecure --resolve "${domain_idn}:80:${domain_ip}" "http://${domain_idn}/${webpath}"
     assert_success
     assert_output --partial "$webproof"