ソースを参照

Added reset key support

Serghey Rodin 14 年 前
コミット
2545b45e47
5 ファイル変更21 行追加6 行削除
  1. 1 0
      bin/v_add_sys_user
  2. 3 0
      bin/v_change_sys_user_password
  3. 3 3
      bin/v_list_sys_user
  4. 4 3
      bin/v_list_sys_users
  5. 10 0
      func/shared.func

+ 1 - 0
bin/v_add_sys_user

@@ -134,6 +134,7 @@ $package_data
 SUSPENDED='no'
 CONTACT='$email'
 REPORTS='yes'
+RKEY='$(gen_password)'
 IP_OWNED='0'
 U_DIR_DISK='0'
 U_DISK='0'

+ 3 - 0
bin/v_change_sys_user_password

@@ -44,6 +44,9 @@ echo "$password" | /usr/bin/passwd "$user" --stdin >/dev/null 2>&1
 #                       Vesta                              #
 #----------------------------------------------------------#
 
+# Changing RKEY value
+update_user_value "$user" '$RKEY' "$(gen_password)"
+
 # Hiding password
 V_EVENT="$V_DATE $V_SCRIPT $user *****"
 

+ 3 - 3
bin/v_list_sys_user

@@ -96,9 +96,9 @@ conf=$V_USERS/$user/user.conf
 # Defining fileds to select
 fields='$USER $FNAME $LNAME $PACKAGE $WEB_DOMAINS $WEB_SSL $WEB_ALIASES
     $DATABASES $MAIL_DOMAINS $MAIL_BOXES $MAIL_FORWARDERS $DNS_DOMAINS
-    $DISK_QUOTA $BANDWIDTH $NS $SHELL $BACKUPS $WEB_TPL $SUSPENDED $IP_OWNED
-    $U_DISK $U_BANDWIDTH $U_WEB_DOMAINS $U_WEB_SSL $U_DNS_DOMAINS $U_DATABASES
-    $U_MAIL_DOMAINS $CONTACT $DATE'
+    $DISK_QUOTA $BANDWIDTH $NS $SHELL $BACKUPS $WEB_TPL $SUSPENDED $CONTACT
+    $RKEY $REPORTS $IP_OWNED $U_DIR_DISK $U_DISK $U_BANDWIDTH $U_WEB_DOMAINS
+    $U_WEB_SSL $U_DNS_DOMAINS $U_DATABASES $U_MAIL_DOMAINS $DATE'
 
 # Listing user
 case $format in 

+ 4 - 3
bin/v_list_sys_users

@@ -93,9 +93,10 @@ shell_list_users() {
 fields="\$USER \$FNAME \$LNAME \$PACKAGE \$WEB_DOMAINS \$WEB_SSL \$WEB_ALIASES"
 fields="$fields \$DATABASES \$MAIL_DOMAINS \$MAIL_BOXES \$MAIL_FORWARDERS"
 fields="$fields \$DNS_DOMAINS \$DISK_QUOTA \$BANDWIDTH \$NS \$SHELL \$BACKUPS"
-fields="$fields \$WEB_TPL \$SUSPENDED \$IP_OWNED \$U_DISK \$U_BANDWIDTH"
-fields="$fields \$U_WEB_DOMAINS \$U_WEB_SSL \$U_DNS_DOMAINS \$U_DATABASES"
-fields="$fields \$U_MAIL_DOMAINS \$CONTACT \$DATE"
+fields="$fields \$WEB_TPL \$SUSPENDED \$CONTACT \$RKEY \$REPORTS \$IP_OWNED"
+fields="$fields \$U_DIR_DISK \$U_DISK \$U_BANDWIDTH \$U_WEB_DOMAINS"
+fields="$fields \$U_WEB_SSL \$U_DNS_DOMAINS \$U_DATABASES \$U_MAIL_DOMAINS"
+fields="$fields \$DATE"
 
 # Listing domains
 case $format in 

+ 10 - 0
func/shared.func

@@ -1053,3 +1053,13 @@ is_backup_enabled() {
         exit $E_BACKUP_DISABLED
     fi
 }
+
+gen_password() {
+    MATRIX='0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
+    LENGTH=10
+    while [ ${n:=1} -le $LENGTH ]; do
+        PASS="$PASS${MATRIX:$(($RANDOM%${#MATRIX})):1}"
+        let n+=1
+    done
+    echo "$PASS"
+}