From c9bf443c6aaa8ea684d459e83cfd9a7af9b58828 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Wed, 31 Jul 2019 00:46:04 +0300
Subject: [PATCH] added user format valdation

---
 bin/v-delete-user-favourites    | 2 ++
 bin/v-list-dns-domain           | 1 +
 bin/v-list-letsencrypt-user     | 1 +
 bin/v-list-mail-domain-dkim-dns | 1 +
 bin/v-list-user                 | 1 +
 bin/v-list-user-backup          | 1 +
 bin/v-list-user-stats           | 1 +
 bin/v-list-web-domain           | 1 +
 bin/v-list-web-domain-ssl       | 1 +
 bin/v-list-web-domains          | 1 +
 10 files changed, 11 insertions(+)

diff --git a/bin/v-delete-user-favourites b/bin/v-delete-user-favourites
index 374fa4308..28a8dd971 100755
--- a/bin/v-delete-user-favourites
+++ b/bin/v-delete-user-favourites
@@ -32,6 +32,8 @@ case $system in
     DNS_REC)    is_format_valid 'id' ;;
     *)          is_format_valid 'object'
 esac
+
+is_format_valid 'user'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 
diff --git a/bin/v-list-dns-domain b/bin/v-list-dns-domain
index f72943f9a..c9c3f1ea6 100755
--- a/bin/v-list-dns-domain
+++ b/bin/v-list-dns-domain
@@ -71,6 +71,7 @@ csv_list() {
 #----------------------------------------------------------#
 
 check_args '2' "$#" 'USER DOMAIN [FORMAT]'
+is_format_valid 'user' 'domain'
 is_object_valid 'user' 'USER' "$user"
 is_object_valid 'dns' 'DOMAIN' "$domain"
 
diff --git a/bin/v-list-letsencrypt-user b/bin/v-list-letsencrypt-user
index 6289ecba2..f6e2c774d 100755
--- a/bin/v-list-letsencrypt-user
+++ b/bin/v-list-letsencrypt-user
@@ -56,6 +56,7 @@ csv_list() {
 #----------------------------------------------------------#
 
 check_args '1' "$#" 'USER [FORMAT]'
+is_format_valid 'user'
 is_object_valid 'user' 'USER' "$user"
 if [ ! -e "$USER_DATA/ssl/le.conf" ]; then
     check_result $E_NOTEXIST "LetsEncrypt user account doesn't exist"
diff --git a/bin/v-list-mail-domain-dkim-dns b/bin/v-list-mail-domain-dkim-dns
index 8623089ec..d9f9d5bac 100755
--- a/bin/v-list-mail-domain-dkim-dns
+++ b/bin/v-list-mail-domain-dkim-dns
@@ -57,6 +57,7 @@ csv_list() {
 #----------------------------------------------------------#
 
 check_args '2' "$#" 'USER DOMAIN [FORMAT]'
+is_format_valid 'user' 'domain'
 is_object_valid 'user' 'USER' "$user"
 is_object_valid 'mail' 'DOMAIN' "$domain"
 
diff --git a/bin/v-list-user b/bin/v-list-user
index 05649f915..57b48bb3a 100755
--- a/bin/v-list-user
+++ b/bin/v-list-user
@@ -154,6 +154,7 @@ csv_list() {
 #----------------------------------------------------------#
 
 check_args '1' "$#" 'USER [FORMAT]'
+is_format_valid 'user'
 is_object_valid 'user' 'USER' "$user"
 
 
diff --git a/bin/v-list-user-backup b/bin/v-list-user-backup
index 2e0a98d0d..8ee8a41b5 100755
--- a/bin/v-list-user-backup
+++ b/bin/v-list-user-backup
@@ -75,6 +75,7 @@ csv_list() {
 #----------------------------------------------------------#
 
 check_args '2' "$#" 'USER BACKUP [FORMAT]'
+is_format_valid 'user'
 is_object_valid 'user' 'USER' "$user"
 is_object_valid 'backup' 'BACKUP' "$backup"
 
diff --git a/bin/v-list-user-stats b/bin/v-list-user-stats
index 11b867afd..0fa7dc900 100755
--- a/bin/v-list-user-stats
+++ b/bin/v-list-user-stats
@@ -115,6 +115,7 @@ csv_list() {
 #----------------------------------------------------------#
 
 check_args '1' "$#" 'USER [FORMAT]'
+is_format_valid 'user'
 is_object_valid 'user' 'USER' "$user"
 
 
diff --git a/bin/v-list-web-domain b/bin/v-list-web-domain
index e0f9492cb..7e33a4ab0 100755
--- a/bin/v-list-web-domain
+++ b/bin/v-list-web-domain
@@ -110,6 +110,7 @@ csv_list() {
 #----------------------------------------------------------#
 
 check_args '2' "$#" 'USER DOMAIN [FORMAT]'
+is_format_valid 'user' 'domain'
 is_object_valid 'user' 'USER' "$user"
 is_object_valid 'web' 'DOMAIN' "$domain"
 
diff --git a/bin/v-list-web-domain-ssl b/bin/v-list-web-domain-ssl
index 99fd5cf8b..d637cf894 100755
--- a/bin/v-list-web-domain-ssl
+++ b/bin/v-list-web-domain-ssl
@@ -98,6 +98,7 @@ csv_list() {
 #----------------------------------------------------------#
 
 check_args '2' "$#" 'USER DOMAIN [FORMAT]'
+is_format_valid 'user' 'domain'
 is_object_valid 'user' 'USER' "$user"
 is_object_valid 'web' 'DOMAIN' "$domain"
 
diff --git a/bin/v-list-web-domains b/bin/v-list-web-domains
index a31199fa4..23de5fb4f 100755
--- a/bin/v-list-web-domains
+++ b/bin/v-list-web-domains
@@ -100,6 +100,7 @@ csv_list() {
 #----------------------------------------------------------#
 
 check_args '1' "$#" 'USER [FORMAT]'
+is_format_valid 'user'
 is_object_valid 'user' 'USER' "$user"