Skip to content

Commit d294015

Browse files
committed
fix incomplete validation on some cli scripts
(cherry picked from commit a59cd76)
1 parent 80faa92 commit d294015

13 files changed

+13
-2
lines changed

bin/v-add-web-domain-backend

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ source $HESTIA/conf/hestia.conf
2626
#----------------------------------------------------------#
2727

2828
check_args '2' "$#" 'USER DOMAIN [TEMPLATE] [RESTART]'
29+
is_format_valid 'user' 'domain'
2930
is_system_enabled "$WEB_BACKEND" 'WEB_BACKEND'
3031
is_object_valid 'user' 'USER' "$user"
3132
is_object_unsuspended 'user' 'USER' "$user"

bin/v-delete-user-favourites

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ case $system in
3232
DNS_REC) is_format_valid 'id' ;;
3333
*) is_format_valid 'object'
3434
esac
35+
is_format_valid 'user'
3536
is_object_valid 'user' 'USER' "$user"
3637
is_object_unsuspended 'user' 'USER' "$user"
3738

bin/v-list-dns-domain

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ csv_list() {
7171
#----------------------------------------------------------#
7272

7373
check_args '2' "$#" 'USER DOMAIN [FORMAT]'
74+
is_format_valid 'user' 'domain'
7475
is_object_valid 'user' 'USER' "$user"
7576
is_object_valid 'dns' 'DOMAIN' "$domain"
7677

bin/v-list-letsencrypt-user

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ csv_list() {
5656
#----------------------------------------------------------#
5757

5858
check_args '1' "$#" 'USER [FORMAT]'
59+
is_format_valid 'user'
5960
is_object_valid 'user' 'USER' "$user"
6061
if [ ! -e "$USER_DATA/ssl/le.conf" ]; then
6162
check_result $E_NOTEXIST "LetsEncrypt user account doesn't exist"

bin/v-list-mail-domain-dkim-dns

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ csv_list() {
5757
#----------------------------------------------------------#
5858

5959
check_args '2' "$#" 'USER DOMAIN [FORMAT]'
60+
is_format_valid 'user' 'domain'
6061
is_object_valid 'user' 'USER' "$user"
6162
is_object_valid 'mail' 'DOMAIN' "$domain"
6263

bin/v-list-mail-domain-ssl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ csv_list() {
101101
#----------------------------------------------------------#
102102

103103
check_args '2' "$#" 'USER DOMAIN [FORMAT]'
104+
is_format_valid 'user' 'domain'
104105
is_object_valid 'user' 'USER' "$user"
105106
is_object_valid 'mail' 'DOMAIN' "$domain_idn"
106107

bin/v-list-user-backup

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ csv_list() {
7575
#----------------------------------------------------------#
7676

7777
check_args '2' "$#" 'USER BACKUP [FORMAT]'
78+
is_format_valid 'user' 'backup'
7879
is_object_valid 'user' 'USER' "$user"
7980
is_object_valid 'backup' 'BACKUP' "$backup"
8081

bin/v-list-user-stats

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ csv_list() {
115115
#----------------------------------------------------------#
116116

117117
check_args '1' "$#" 'USER [FORMAT]'
118+
is_format_valid 'user'
118119
is_object_valid 'user' 'USER' "$user"
119120

120121

bin/v-list-web-domain

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ csv_list() {
118118
#----------------------------------------------------------#
119119

120120
check_args '2' "$#" 'USER DOMAIN [FORMAT]'
121+
is_format_valid 'user' 'domain'
121122
is_object_valid 'user' 'USER' "$user"
122123
is_object_valid 'web' 'DOMAIN' "$domain"
123124

bin/v-list-web-domain-ssl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ csv_list() {
101101
#----------------------------------------------------------#
102102

103103
check_args '2' "$#" 'USER DOMAIN [FORMAT]'
104+
is_format_valid 'user' 'domain'
104105
is_object_valid 'user' 'USER' "$user"
105106
is_object_valid 'web' 'DOMAIN' "$domain"
106107

0 commit comments

Comments
 (0)