Skip to content

Commit 599d2a0

Browse files
sahsanujaapmarcus
andauthored
Enhancement/exim advertise auth only on localhost and tls connections (hestiacp#3935)
* Update exim4.conf.template Exim will advertise AUTH for localhost and TLS connections so we avoid to send cleartext passwords over the net * Update exim4.conf.4.94.template Exim will advertise AUTH for localhost and TLS connections so we avoid to send cleartext passwords over the net * Update exim4.conf.4.95.template Exim will advertise AUTH for localhost and TLS connections so we avoid to send cleartext passwords over the net * Update exim4.conf.template Changed tls_cipher by tls_in_cipher (both work but Exim uses tls_in_cipher in their examples * Update exim4.conf.4.94.template Changed tls_cipher by tls_in_cipher (both work but Exim uses tls_in_cipher in their examples) * Update exim4.conf.4.95.template Changed tls_cipher by tls_in_cipher (both work but Exim uses tls_in_cipher in their examples) * Create 1.8.6.sh Added steps to modify Exim conf file to add auth_advertise_hosts * Do not update on install update --------- Co-authored-by: Jaap Marcus <9754650+jaapmarcus@users.noreply.github.com>
1 parent ace8a0d commit 599d2a0

File tree

5 files changed

+36
-0
lines changed

5 files changed

+36
-0
lines changed

install/deb/exim/exim4.conf.4.94.template

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ tls_privatekey = \
6565
daemon_smtp_ports = 25 : 465 : 587
6666
tls_on_connect_ports = 465
6767
tls_require_ciphers = PERFORMANCE:-RSA:-VERS-ALL:+VERS-TLS1.2:+VERS-TLS1.3:%SERVER_PRECEDENCE
68+
auth_advertise_hosts = localhost : ${if eq{$tls_in_cipher}{}{}{*}}
6869
never_users = root
6970
host_lookup = *
7071
rfc1413_hosts = *

install/deb/exim/exim4.conf.4.95.template

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ tls_privatekey = \
6767
daemon_smtp_ports = 25 : 465 : 587
6868
tls_on_connect_ports = 465
6969
tls_require_ciphers = PERFORMANCE:-RSA:-VERS-ALL:+VERS-TLS1.2:+VERS-TLS1.3:%SERVER_PRECEDENCE
70+
auth_advertise_hosts = localhost : ${if eq{$tls_in_cipher}{}{}{*}}
7071
never_users = root
7172
host_lookup = *
7273
rfc1413_hosts = *

install/deb/exim/exim4.conf.template

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ tls_privatekey = \
6565
daemon_smtp_ports = 25 : 465 : 587
6666
tls_on_connect_ports = 465
6767
tls_require_ciphers = PERFORMANCE:-RSA:-VERS-ALL:+VERS-TLS1.2:+VERS-TLS1.3:%SERVER_PRECEDENCE
68+
auth_advertise_hosts = localhost : ${if eq{$tls_in_cipher}{}{}{*}}
6869
never_users = root
6970
host_lookup = *
7071
rfc1413_hosts = *
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
3+
# Modify Exim conf file (/etc/exim4/exim4.conf.template) to advertise AUTH only for localhost and TLS
4+
# connections, so we avoid that users send their passwords as clear text over the net.
5+
if ! grep -qw '^auth_advertise_hosts =' '/etc/exim4/exim4.conf.template'; then
6+
echo '[ * ] Enable auth advertise for Exim only for localhost and TLS connections'
7+
sed -i '/^tls_require_ciphers\s=\s.*/a auth_advertise_hosts = localhost : ${if eq{$tls_in_cipher}{}{}{*}}' '/etc/exim4/exim4.conf.template'
8+
systemctl restart exim4
9+
fi

install/upgrade/versions/1.8.6.sh

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/bin/bash
2+
3+
# Hestia Control Panel upgrade script for target version 1.8.6
4+
5+
#######################################################################################
6+
####### Place additional commands below. #######
7+
#######################################################################################
8+
####### upgrade_config_set_value only accepts true or false. #######
9+
####### #######
10+
####### Pass through information to the end user in case of a issue or problem #######
11+
####### #######
12+
####### Use add_upgrade_message "My message here" to include a message #######
13+
####### in the upgrade notification email. Example: #######
14+
####### #######
15+
####### add_upgrade_message "My message here" #######
16+
####### #######
17+
####### You can use \n within the string to create new lines. #######
18+
#######################################################################################
19+
20+
upgrade_config_set_value 'UPGRADE_UPDATE_WEB_TEMPLATES' 'false'
21+
upgrade_config_set_value 'UPGRADE_UPDATE_DNS_TEMPLATES' 'false'
22+
upgrade_config_set_value 'UPGRADE_UPDATE_MAIL_TEMPLATES' 'false'
23+
upgrade_config_set_value 'UPGRADE_REBUILD_USERS' 'false'
24+
upgrade_config_set_value 'UPGRADE_UPDATE_FILEMANAGER_CONFIG' 'false'

0 commit comments

Comments
 (0)