Fix hestiacp#1018 Allow deleting suspended users, doamins, db, mail, cronjobs current limited by is_unsuspeded check

jaapmarcus · jaapmarcus · commit 860285f45a89 · 2021-01-21T10:27:29.000Z
diff --git a/bin/v-delete-cron-job b/bin/v-delete-cron-job
@@ -29,9 +29,7 @@ check_args '2' "$#" 'USER JOB'
 is_format_valid 'user' 'job'
 is_system_enabled "$CRON_SYSTEM" 'CRON_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'cron' 'JOB' "$job"
-is_object_unsuspended 'cron' 'JOB' "$job"
 
 # Perform verification if read-only mode is enabled
 check_hestia_demo_mode
@@ -41,6 +39,7 @@ check_hestia_demo_mode
 #                       Action                             #
 #----------------------------------------------------------#
 
+suspended=$(grep "JOB='$job'" $USER_DATA/cron.conf |grep "SUSPENDED='yes'")
 # Deleting job
 sed -i "/JOB='$job' /d" $USER_DATA/cron.conf
 
@@ -58,6 +57,11 @@ sync_cron_jobs
 # Decreasing cron value
 decrease_user_value "$user" '$U_CRON_JOBS'
 
+# Check if is suspended to decrease the suspended value
+if [ ! -z "$suspended" ]; then
+    decrease_user_value "$user" '$SUSPENDED_CRON'
+fi
+
 # Restarting crond
 $BIN/v-restart-cron
 check_result $? "Restart restart failed" >/dev/null
diff --git a/bin/v-delete-database b/bin/v-delete-database
@@ -31,9 +31,7 @@ check_args '2' "$#" 'USER DATABASE'
 is_format_valid 'user' 'database'
 is_system_enabled "$DB_SYSTEM" 'DB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'db' 'DB' "$database"
-is_object_unsuspended 'db' 'DB' "$database"
 
 # Perform verification if read-only mode is enabled
 check_hestia_demo_mode
@@ -45,6 +43,8 @@ check_hestia_demo_mode
 
 # Get database values
 get_database_values
+# Issues with $SUSPENDED overwritten when delete_mysql_database is called
+suspended=$SUSPENDED
 
 # Switching on db type
 case $TYPE in
@@ -64,6 +64,13 @@ sed -i "/DB='$database' /d" $USER_DATA/db.conf
 decrease_dbhost_values
 decrease_user_value "$user" '$U_DATABASES'
 
+# Check if is suspended to decrease the suspended value
+if [ ! -z "$suspended" ]; then
+    if [ "$suspended" == "yes" ]; then
+        decrease_user_value "$user" '$SUSPENDED_DB'
+    fi
+fi
+
 # Logging
 log_history "deleted $database database"
 log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-delete-databases b/bin/v-delete-databases
@@ -28,7 +28,6 @@ check_args '1' "$#" 'USER'
 is_format_valid 'user'
 is_system_enabled "$DB_SYSTEM" 'DB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 
 # Perform verification if read-only mode is enabled
 check_hestia_demo_mode
diff --git a/bin/v-delete-dns-domain b/bin/v-delete-dns-domain
@@ -32,9 +32,7 @@ check_args '2' "$#" 'USER DOMAIN'
 is_format_valid 'user' 'domain'
 is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'dns' 'DOMAIN' "$domain"
-is_object_unsuspended 'dns' 'DOMAIN' "$domain"
 
 # Perform verification if read-only mode is enabled
 check_hestia_demo_mode
@@ -44,6 +42,8 @@ check_hestia_demo_mode
 #                       Action                             #
 #----------------------------------------------------------#
 
+suspended=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf |grep "SUSPENDED='yes'")
+
 records=$(wc -l $USER_DATA/dns/$domain.conf | cut -f 1 -d ' ')
 
 # Deleting system configs
@@ -81,6 +81,12 @@ decrease_user_value "$user" '$U_DNS_RECORDS' "$records"
 $BIN/v-restart-dns $restart
 check_result $? "Bind restart failed" >/dev/null
 
+# Check if is suspended to decrease the suspended value
+if [ ! -z "$suspended" ]; then
+    decrease_user_value "$user" '$SUSPENDED_DNS'
+fi
+
+
 # Logging
 log_history "deleted dns domain $domain"
 log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-delete-dns-on-web-alias b/bin/v-delete-dns-on-web-alias
@@ -44,9 +44,7 @@ is_format_valid 'user' 'domain'
 is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'web' 'DOMAIN' "$domain"
-is_object_unsuspended 'web' 'DOMAIN' "$domain"
 
 # Perform verification if read-only mode is enabled
 check_hestia_demo_mode
diff --git a/bin/v-delete-dns-record b/bin/v-delete-dns-record
@@ -37,9 +37,7 @@ format_domain_idn
 check_args '3' "$#" 'USER DOMAIN ID [RESTART]'
 is_format_valid 'user' 'domain' 'id'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'dns' 'DOMAIN' "$domain"
-is_object_unsuspended 'dns' 'DOMAIN' "$domain"
 is_object_valid "dns/$domain" 'ID' "$id"
 is_dns_record_critical
 
diff --git a/bin/v-delete-domain b/bin/v-delete-domain
@@ -29,7 +29,6 @@ source $HESTIA/conf/hestia.conf
 check_args '2' "$#" 'USER DOMAIN'
 is_format_valid 'user' 'domain'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 
 # Perform verification if read-only mode is enabled
 check_hestia_demo_mode
diff --git a/bin/v-delete-letsencrypt-domain b/bin/v-delete-letsencrypt-domain
@@ -33,7 +33,6 @@ is_format_valid 'user' 'domain'
 is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_system_enabled "$WEB_SSL" 'SSL_SUPPORT'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 if [ -z "$mail" ]; then
     is_object_valid 'web' 'DOMAIN' "$domain"
     is_object_unsuspended 'web' 'DOMAIN' "$domain"
diff --git a/bin/v-delete-mail-account b/bin/v-delete-mail-account
@@ -36,11 +36,8 @@ check_args '3' "$#" 'USER DOMAIN ACCOUNT'
 is_format_valid 'user' 'domain' 'account'
 is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'mail' 'DOMAIN' "$domain"
-is_object_unsuspended 'mail' 'DOMAIN' "$domain"
 is_object_valid "mail/$domain" 'ACCOUNT' "$account"
-is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account"
 
 # Perform verification if read-only mode is enabled
 check_hestia_demo_mode
diff --git a/bin/v-delete-mail-account-alias b/bin/v-delete-mail-account-alias
@@ -37,11 +37,8 @@ check_args '4' "$#" 'USER DOMAIN ACCOUNT ALIAS'
 is_format_valid 'user' 'domain' 'account' 'malias'
 is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'mail' 'DOMAIN' "$domain"
-is_object_unsuspended 'mail' 'DOMAIN' "$domain"
 is_object_valid "mail/$domain" 'ACCOUNT' "$account"
-is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account"
 aliases=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$ALIAS')
 if [ -z "$(echo $aliases | grep -w $malias)" ]; then
     echo "Error: alias $malias doesn't exist"
diff --git a/bin/v-delete-mail-account-autoreply b/bin/v-delete-mail-account-autoreply
@@ -38,11 +38,8 @@ check_args '3' "$#" 'USER DOMAIN ACCOUNT'
 is_format_valid 'user' 'domain' 'account'
 is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'mail' 'DOMAIN' "$domain"
-is_object_unsuspended 'mail' 'DOMAIN' "$domain"
 is_object_valid "mail/$domain" 'ACCOUNT' "$account"
-is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account"
 is_object_value_exist "mail/$domain" 'ACCOUNT' "$account" '$AUTOREPLY'
 
 # Perform verification if read-only mode is enabled
diff --git a/bin/v-delete-mail-account-forward b/bin/v-delete-mail-account-forward
@@ -39,11 +39,8 @@ if [ "$forward"  != ':blackhole:' ]; then
 fi
 is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'mail' 'DOMAIN' "$domain"
-is_object_unsuspended 'mail' 'DOMAIN' "$domain"
 is_object_valid "mail/$domain" 'ACCOUNT' "$account"
-is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account"
 fwd=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$FWD')
 if [ -z "$(echo $fwd | grep -w $forward)" ]; then
     check_result $E_NOTEXIST "forward $forward doesn't exist"
diff --git a/bin/v-delete-mail-account-fwd-only b/bin/v-delete-mail-account-fwd-only
@@ -37,11 +37,8 @@ check_args '3' "$#" 'USER DOMAIN ACCOUNT'
 is_format_valid 'user' 'domain' 'account'
 is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'mail' 'DOMAIN' "$domain"
-is_object_unsuspended 'mail' 'DOMAIN' "$domain"
 is_object_valid "mail/$domain" 'ACCOUNT' "$account"
-is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account"
 
 # Perform verification if read-only mode is enabled
 check_hestia_demo_mode
diff --git a/bin/v-delete-mail-domain b/bin/v-delete-mail-domain
@@ -36,9 +36,7 @@ check_args '2' "$#" 'USER DOMAIN'
 is_format_valid 'user' 'domain'
 is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'mail' 'DOMAIN' "$domain"
-is_object_unsuspended 'mail' 'DOMAIN' "$domain"
 
 # Perform verification if read-only mode is enabled
 check_hestia_demo_mode
@@ -99,6 +97,13 @@ fi
 
 decrease_user_value "$user" '$U_MAIL_ACCOUNTS' "$accounts"
 
+# Check if is suspended to decrease the suspended value
+if [ ! -z "$SUSPENDED" ]; then
+    if [ "$SUSPENDED" == "yes" ]; then
+        decrease_user_value "$user" '$SUSPENDED_MAIL'
+    fi
+fi
+
 # Logging
 log_history "deleted mail domain $domain"
 log_event "$OK" "$ARGUMENTS"
diff --git a/bin/v-delete-mail-domain-catchall b/bin/v-delete-mail-domain-catchall
@@ -35,9 +35,7 @@ check_args '2' "$#" 'USER DOMAIN'
 is_format_valid 'user' 'domain'
 is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'mail' 'DOMAIN' "$domain"
-is_object_unsuspended 'mail' 'DOMAIN' "$domain"
 is_object_value_exist 'mail' 'DOMAIN' "$domain" '$CATCHALL'
 
 # Perform verification if read-only mode is enabled
diff --git a/bin/v-delete-mail-domain-dkim b/bin/v-delete-mail-domain-dkim
@@ -31,9 +31,7 @@ check_args '2' "$#" 'USER DOMAIN'
 is_format_valid 'user' 'domain'
 is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'mail' 'DOMAIN' "$domain"
-is_object_unsuspended 'mail' 'DOMAIN' "$domain"
 is_object_value_exist 'mail' 'DOMAIN' "$domain" '$DKIM'
 
 # Perform verification if read-only mode is enabled
diff --git a/bin/v-delete-mail-domain-ssl b/bin/v-delete-mail-domain-ssl
@@ -32,9 +32,7 @@ check_args '2' "$#" 'USER DOMAIN'
 is_format_valid 'user' 'domain'
 is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'mail' 'DOMAIN' "$domain"
-is_object_unsuspended 'mail' 'DOMAIN' "$domain"
 is_object_value_exist 'mail' 'DOMAIN' "$domain" '$SSL'
 
 # Perform verification if read-only mode is enabled
diff --git a/bin/v-delete-sys-webmail b/bin/v-delete-sys-webmail
@@ -37,9 +37,7 @@ is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
 is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_system_enabled "$IMAP_SYSTEM" 'IMAP_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'mail' 'DOMAIN' "$domain"
-is_object_unsuspended 'mail' 'DOMAIN' "$domain"
 
 # Perform verification if read-only mode is enabled
 check_hestia_demo_mode
diff --git a/bin/v-delete-user b/bin/v-delete-user
@@ -32,7 +32,6 @@ source $HESTIA/conf/hestia.conf
 check_args '1' "$#" 'USER [RESTART]'
 is_format_valid 'user'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 if [ "$user" = 'admin' ]; then
     exit
 fi
diff --git a/bin/v-delete-user-ips b/bin/v-delete-user-ips
@@ -28,7 +28,6 @@ source $HESTIA/conf/hestia.conf
 check_args '1' "$#" 'USER'
 is_format_valid 'user'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 if [ "$user" = 'admin' ]; then
     exit
 fi
diff --git a/bin/v-delete-user-ssh-key b/bin/v-delete-user-ssh-key
@@ -28,7 +28,6 @@ source $HESTIA/conf/hestia.conf
 check_args '2' "$#" 'USER KEYID'
 is_format_valid 'user'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 
 source $USER_DATA/user.conf
 
diff --git a/bin/v-delete-web-domain b/bin/v-delete-web-domain
@@ -41,9 +41,7 @@ check_args '2' "$#" 'USER DOMAIN [RESTART]'
 is_format_valid 'user' 'domain'
 is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'web' 'DOMAIN' "$domain"
-is_object_unsuspended 'web' 'DOMAIN' "$domain"
 
 # Perform verification if read-only mode is enabled
 check_hestia_demo_mode
@@ -126,6 +124,13 @@ if [ ! -z "$ALIAS" ]; then
     decrease_user_value "$user" '$U_WEB_ALIASES' "$aliases"
 fi
 
+# Check if is suspended to decrease the suspended value
+if [ ! -z "$SUSPENDED" ]; then
+    if [ "$SUSPENDED" == "yes" ]; then
+        decrease_user_value "$user" '$SUSPENDED_WEB'
+    fi
+fi
+
 # Restarting web server
 $BIN/v-restart-web $restart
 check_result $? "Web restart failed" >/dev/null
diff --git a/bin/v-delete-web-domain-alias b/bin/v-delete-web-domain-alias
@@ -34,9 +34,7 @@ check_args '3' "$#" 'USER DOMAIN DOM_ALIAS [RESTART]'
 is_format_valid 'user' 'domain' 'dom_alias'
 is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'web' 'DOMAIN' "$domain"
-is_object_unsuspended 'web' 'DOMAIN' "$domain"
 get_domain_values 'web'
 if [ -z "$(echo $ALIAS |tr ',' '\n' |grep ^$dom_alias$)" ]; then
     check_result $E_NOTEXIST "alias $dom_alias doesn't exist"
diff --git a/bin/v-delete-web-domain-backend b/bin/v-delete-web-domain-backend
@@ -37,9 +37,7 @@ check_args '2' "$#" 'USER DOMAIN [RESTART]'
 is_format_valid 'user' 'domain'
 is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'web' 'DOMAIN' "$domain"
-is_object_unsuspended 'web' 'DOMAIN' "$domain"
 
 # Perform verification if read-only mode is enabled
 check_hestia_demo_mode
diff --git a/bin/v-delete-web-domain-fast-cgi-cache b/bin/v-delete-web-domain-fast-cgi-cache
@@ -27,9 +27,7 @@ source $HESTIA/conf/hestia.conf
 check_args '2' "$#" 'USER DOMAIN'
 is_format_valid 'user' 'domain'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'web' 'DOMAIN' "$domain"
-is_object_unsuspended 'web' 'DOMAIN' "$domain"
 is_object_valid 'web' 'DOMAIN' "$domain" "$FASTCGI_CACHE"
 
 # Perform verification if read-only mode is enabled
diff --git a/bin/v-delete-web-domain-ftp b/bin/v-delete-web-domain-ftp
@@ -37,9 +37,7 @@ check_args '3' "$#" 'USER DOMAIN FTP_USER'
 is_format_valid 'user' 'domain' 'ftp_user'
 is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'web' 'DOMAIN' "$domain"
-is_object_unsuspended 'web' 'DOMAIN' "$domain"
 get_domain_values 'web'
 if [ -z "$(echo $FTP_USER | tr ':' '\n' | grep ^$ftp_user$)" ]; then
     echo "Error: account $ftp_user doesn't exist"
diff --git a/bin/v-delete-web-domain-httpauth b/bin/v-delete-web-domain-httpauth
@@ -35,9 +35,7 @@ check_args '3' "$#" 'USER DOMAIN AUTH_USER [RESTART]'
 is_format_valid 'user' 'domain'
 is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'web' 'DOMAIN' "$domain"
-is_object_unsuspended 'web' 'DOMAIN' "$domain"
 is_password_valid
 get_domain_values 'web'
 if [ -z "$(echo "$AUTH_USER" |tr : '\n' |grep ^$auth_user$)" ]; then
diff --git a/bin/v-delete-web-domain-proxy b/bin/v-delete-web-domain-proxy
@@ -37,9 +37,7 @@ check_args '2' "$#" 'USER DOMAIN [RESTART]'
 is_format_valid 'user' 'domain'
 is_system_enabled "$PROXY_SYSTEM" 'WEB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'web' 'DOMAIN' "$domain"
-is_object_unsuspended 'web' 'DOMAIN' "$domain"
 is_object_value_exist 'web' 'DOMAIN' "$domain" '$PROXY'
 
 # Perform verification if read-only mode is enabled
diff --git a/bin/v-delete-web-domain-ssl b/bin/v-delete-web-domain-ssl
@@ -37,9 +37,7 @@ check_args '2' "$#" 'USER DOMAIN [RESTART]'
 is_format_valid 'user' 'domain'
 is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'web' 'DOMAIN' "$domain"
-is_object_unsuspended 'web' 'DOMAIN' "$domain"
 is_object_value_exist 'web' 'DOMAIN' "$domain" '$SSL'
 
 # Perform verification if read-only mode is enabled
diff --git a/bin/v-delete-web-domain-ssl-force b/bin/v-delete-web-domain-ssl-force
@@ -28,9 +28,7 @@ source $HESTIA/conf/hestia.conf
 check_args '2' "$#" 'USER DOMAIN'
 is_format_valid 'user' 'domain'
 is_object_valid 'user' 'USER' "$user"
-is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'web' 'DOMAIN' "$domain"
-is_object_unsuspended 'web' 'DOMAIN' "$domain"
 is_object_valid 'web' 'DOMAIN' "$domain" "$SSL_FORCE"
 
 # Perform verification if read-only mode is enabled
diff --git a/bin/v-delete-web-domain-ssl-hsts b/bin/v-delete-web-domain-ssl-hsts
diff --git a/bin/v-delete-web-domain-stats b/bin/v-delete-web-domain-stats
diff --git a/bin/v-delete-web-domain-stats-user b/bin/v-delete-web-domain-stats-user
