Skip to content

Commit 65ac4d4

Browse files
authored
Fix issues with IDN (hestiacp#1640)
Added test script for bats special focused on IDN
1 parent fc41210 commit 65ac4d4

File tree

134 files changed

+769
-253
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+769
-253
lines changed

bin/v-add-dns-domain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
# Argument definition
2020
user=$1
21-
domain=$2
21+
domain=$(idn -t --quiet -a "$2" )
2222
ip=$3
2323
ns1=$4
2424
ns2=$5

bin/v-add-dns-on-web-alias

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
# Argument definition
1616
user=$1
17-
alias=$2
17+
alias=$(idn -t --quiet -a "$2" )
1818
ip=$3
1919
restart=$4
2020

bin/v-add-dns-record

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@
1717

1818
# Argument definition
1919
user=$1
20-
domain=$2
21-
domain_idn=$2
22-
record=$(idn -t --quiet -u "$3" )
20+
domain=$(idn -t --quiet -a "$2" )
21+
record=$(idn -t --quiet -a "$3" )
2322
record=$(echo "$record" | tr '[:upper:]' '[:lower:]')
2423
rtype=$(echo "$4"| tr '[:lower:]' '[:upper:]')
25-
dvalue=$(idn -t --quiet -u "$5" )
24+
dvalue=$(idn -t --quiet -a "$5" )
2625
priority=$6
2726
id=$7
2827
restart=$8
@@ -67,8 +66,6 @@ fi
6766
# Additional argument formatting
6867
format_domain
6968
format_domain_idn
70-
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
71-
7269

7370
#----------------------------------------------------------#
7471
# Verifications #

bin/v-add-domain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
# Argument definition
1616
user=$1
17-
domain=$2
17+
domain=$(idn -t --quiet -a "$2" )
1818
ip=$3
1919
restart="${4-yes}"
2020

bin/v-add-letsencrypt-domain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
# Argument definition
1616
user=$1
17-
domain=$2
17+
domain=$(idn -t --quiet -a "$2" )
1818
aliases=$3
1919
mail=${4// }
2020

bin/v-add-mail-account

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
# Argument definition
1616
user=$1
17-
domain=$2
17+
domain=$(idn -t --quiet -a "$2" )
1818
account=$3
1919
password=$4; HIDE=4
2020
quota=${5-unlimited}

bin/v-add-mail-account-alias

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414

1515
# Argument definition
1616
user=$1
17-
domain=$2
18-
domain_idn=$2
17+
domain=$(idn -t --quiet -a "$2" )
1918
account=$3
2019
malias=$4
2120

@@ -27,8 +26,6 @@ source $HESTIA/conf/hestia.conf
2726
# Additional argument formatting
2827
format_domain
2928
format_domain_idn
30-
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
31-
3229

3330
#----------------------------------------------------------#
3431
# Verifications #

bin/v-add-mail-account-autoreply

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414

1515
# Argument definition
1616
user=$1
17-
domain=$2
18-
domain_idn=$2
17+
domain=$(idn -t --quiet -a "$2" )
1918
account=$3
2019
autoreply=$4
2120

@@ -34,8 +33,6 @@ fi
3433
# Additional argument formatting
3534
format_domain
3635
format_domain_idn
37-
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
38-
3936

4037
#----------------------------------------------------------#
4138
# Verifications #

bin/v-add-mail-account-forward

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# Argument definition
1616
user=$1
1717
domain=$2
18-
domain_idn=$2
18+
domain_idn=$(idn -t --quiet -a "$2" )
1919
account=$3
2020
email_forward=$4
2121

bin/v-add-mail-account-fwd-only

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# Argument definition
1616
user=$1
1717
domain=$2
18-
domain_idn=$2
18+
domain_idn=$(idn -t --quiet -a "$2" )
1919
account=$3
2020

2121
# Includes
@@ -33,8 +33,6 @@ fi
3333
# Additional argument formatting
3434
format_domain
3535
format_domain_idn
36-
# TODO: $domain_idn not used in this script - maybe $domain should be converted to $doman_idn ?
37-
3836

3937
#----------------------------------------------------------#
4038
# Verifications #

0 commit comments

Comments
 (0)