Explorar el Código

Fix dovecot auth bug, enable special characters for password and fix a dns issue. Thanks to @HueyGeek!

Raphael Schneeberger hace 7 años
padre
commit
6d7634eb4b

+ 1 - 1
bin/v-rebuild-dns-domain

@@ -61,7 +61,7 @@ if [ -e '/etc/bind/named.conf' ]; then
 fi
 
 # Deleting old user's zone
-sed -i "/\/$user\/conf\/dns\/$domain/d" $dns_conf
+sed -i "/\/$user\/conf\/dns\/$domain.db\"/d" $dns_conf
 
 # Updating zone serial
 if [ "$update_serial" != 'no' ]; then

+ 1 - 0
install/debian/8/dovecot/conf.d/10-auth.conf

@@ -1,4 +1,5 @@
 disable_plaintext_auth = no
+auth_username_format = %u
 auth_verbose = yes
 auth_mechanisms = plain login
 !include auth-passwdfile.conf.ext

+ 1 - 0
install/debian/9/dovecot/conf.d/10-auth.conf

@@ -1,4 +1,5 @@
 disable_plaintext_auth = no
+auth_username_format = %u
 auth_verbose = yes
 auth_mechanisms = plain login
 !include auth-passwdfile.conf.ext

+ 1 - 0
install/ubuntu/14.04/dovecot/conf.d/10-auth.conf

@@ -1,4 +1,5 @@
 disable_plaintext_auth = no
+auth_username_format = %u
 auth_verbose = yes
 auth_mechanisms = plain login
 !include auth-passwdfile.conf.ext

+ 1 - 0
install/ubuntu/16.04/dovecot/conf.d/10-auth.conf

@@ -1,4 +1,5 @@
 disable_plaintext_auth = no
+auth_username_format = %u
 auth_verbose = yes
 auth_mechanisms = plain login
 !include auth-passwdfile.conf.ext

+ 1 - 0
install/ubuntu/18.04/dovecot/conf.d/10-auth.conf

@@ -1,4 +1,5 @@
 disable_plaintext_auth = no
+auth_username_format = %u
 auth_verbose = yes
 auth_mechanisms = plain login
 !include auth-passwdfile.conf.ext

+ 3 - 3
web/edit/server/index.php

@@ -273,7 +273,7 @@ if (!empty($_POST['save'])) {
             $v_backup_host = escapeshellarg($_POST['v_backup_host']);
             $v_backup_type = escapeshellarg($_POST['v_backup_type']);
             $v_backup_username = escapeshellarg($_POST['v_backup_username']);
-            $v_backup_password = escapeshellarg($_POST['v_backup_password']);
+            $v_backup_password = escapeshellcmd($_POST['v_backup_password']);
             $v_backup_bpath = escapeshellarg($_POST['v_backup_bpath']);
             exec (HESTIA_CMD."v-add-backup-host '". $v_backup_type ."' '". $v_backup_host ."' '". $v_backup_username ."' '". $v_backup_password ."' '". $v_backup_bpath ."'", $output, $return_var);
             check_return_code($return_var,$output);
@@ -298,7 +298,7 @@ if (!empty($_POST['save'])) {
             $v_backup_host = escapeshellarg($_POST['v_backup_host']);
             $v_backup_type = escapeshellarg($_POST['v_backup_type']);
             $v_backup_username = escapeshellarg($_POST['v_backup_username']);
-            $v_backup_password = escapeshellarg($_POST['v_backup_password']);
+            $v_backup_password = escapeshellcmd($_POST['v_backup_password']);
             $v_backup_bpath = escapeshellarg($_POST['v_backup_bpath']);
             exec (HESTIA_CMD."v-add-backup-host '". $v_backup_type ."' '". $v_backup_host ."' '". $v_backup_username ."' '". $v_backup_password ."' '". $v_backup_bpath ."'", $output, $return_var);
             check_return_code($return_var,$output);
@@ -320,7 +320,7 @@ if (!empty($_POST['save'])) {
                 $v_backup_host = escapeshellarg($_POST['v_backup_host']);
                 $v_backup_type = escapeshellarg($_POST['v_backup_type']);
                 $v_backup_username = escapeshellarg($_POST['v_backup_username']);
-                $v_backup_password = escapeshellarg($_POST['v_backup_password']);
+                $v_backup_password = escapeshellcmd($_POST['v_backup_password']);
                 $v_backup_bpath = escapeshellarg($_POST['v_backup_bpath']);
                 exec (HESTIA_CMD."v-add-backup-host '". $v_backup_type ."' '". $v_backup_host ."' '". $v_backup_username ."' '". $v_backup_password ."' '". $v_backup_bpath ."'", $output, $return_var);
                 check_return_code($return_var,$output);