Skip to content

Commit abbdf4f

Browse files
author
Kristan Kenney
committed
Update mail-ssl branch to align with develop branch
2 parents 77ba59c + c06eb31 commit abbdf4f

20 files changed

+134
-147
lines changed

‎bin/v-add-sys-sftp-jail‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@
99
# Variable&Function #
1010
#----------------------------------------------------------#
1111

12-
# Importing system environment as we run this script
13-
# mostly by cron which do not read it by itself
14-
source /etc/profile
15-
1612
# Includes
13+
source /etc/profile
1714
source $HESTIA/func/main.sh
1815
source $HESTIA/conf/hestia.conf
1916

@@ -22,10 +19,6 @@ source $HESTIA/conf/hestia.conf
2219
# Verifications #
2320
#----------------------------------------------------------#
2421

25-
if [ -z "$SFTPJAIL_KEY" ]; then
26-
exit
27-
fi
28-
2922

3023
#----------------------------------------------------------#
3124
# Action #

‎bin/v-add-user‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,7 @@ if [ -x "$HESTIA/data/packages/$package.sh" ]; then
205205
fi
206206

207207
# Adding jailed sftp env
208-
if [ ! -z "$SFTPJAIL_KEY" ]; then
209-
$BIN/v-add-user-sftp-jail $user
210-
fi
208+
$BIN/v-add-user-sftp-jail $user
211209

212210
# Logging
213211
log_history "added system user $user" '' 'admin'

‎bin/v-add-user-sftp-jail‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,17 @@ source $HESTIA/conf/hestia.conf
2323

2424
check_args '1' "$#" 'USER'
2525
is_format_valid 'user'
26-
if [ -z "$SFTPJAIL_KEY" ]; then
27-
exit
28-
fi
2926
user_str=$(grep "^$user:" /etc/passwd |egrep "rssh|nologin")
3027
if [ -z "$user_str" ]; then
3128
exit
3229
fi
3330

31+
# Do not create chroot for syslog user
32+
if [ $user = "syslog" ]; then
33+
exit
34+
fi
35+
36+
3437
#----------------------------------------------------------#
3538
# Action #
3639
#----------------------------------------------------------#

‎bin/v-add-web-domain-ftp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,7 @@ echo "$ftp_user:$password" | /usr/sbin/chpasswd
9292
ftp_md5=$(awk -v user=$ftp_user -F : 'user == $1 {print $2}' /etc/shadow)
9393

9494
# Adding jailed sftp env
95-
if [ ! -z "$SFTPJAIL_KEY" ]; then
96-
$BIN/v-add-user-sftp-jail $ftp_user
97-
fi
95+
$BIN/v-add-user-sftp-jail $ftp_user
9896

9997

10098
#----------------------------------------------------------#

‎bin/v-change-dns-domain-tpl‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,11 @@ fi
137137
update_object_value 'dns' 'DOMAIN' "$domain" '$TPL' "$template"
138138
update_object_value 'dns' 'DOMAIN' "$domain" '$RECORDS' "$records"
139139

140+
# Rebuild DNS zone and update counters to ensure that it has updated correctly
141+
$BIN/v-rebuild-dns-domain $user $domain no
142+
$BIN/v-update-user-stats $user
143+
$BIN/v-update-user-counters $user
144+
140145
# Restarting named
141146
$BIN/v-restart-dns $restart
142147
check_result $? "DNS restart failed" >/dev/null

‎bin/v-change-user-shell‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,10 @@ shell_path=$(grep -w "$shell" /etc/shells | head -n1)
4040
shell=$(basename $shell_path)
4141

4242
# Adding jailed sftp env
43-
if [ ! -z "$SFTPJAIL_KEY" ]; then
44-
if [[ "$shell" =~ nologin ]] || [[ "$shell" =~ rssh ]]; then
45-
$BIN/v-add-user-sftp-jail $user >/dev/null 2>&1
46-
else
47-
$BIN/v-delete-user-sftp-jail $user >/dev/null 2>&1
48-
fi
43+
if [[ "$shell" =~ nologin ]] || [[ "$shell" =~ rssh ]]; then
44+
$BIN/v-add-user-sftp-jail $user >/dev/null 2>&1
45+
else
46+
$BIN/v-delete-user-sftp-jail $user >/dev/null 2>&1
4947
fi
5048

5149

‎bin/v-change-web-domain-dirlist‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
#!/bin/bash
2+
# info: enable/disable directory listing
3+
# options: USER DOMAIN MODE
4+
#
5+
# The call is used for changing the directory list mode.
6+
7+
8+
#----------------------------------------------------------#
9+
# Variable&Function #
10+
#----------------------------------------------------------#
11+
12+
# Argument defenition
13+
user=$1
14+
domain=$2
15+
mode=$3
16+
17+
# Includes
18+
source $HESTIA/func/main.sh
19+
source $HESTIA/func/domain.sh
20+
source $HESTIA/conf/hestia.conf
21+
22+
# Additional argument formatting
23+
format_domain
24+
format_domain_idn
25+
26+
27+
#----------------------------------------------------------#
28+
# Verifications #
29+
#----------------------------------------------------------#
30+
31+
check_args '3' "$#" 'USER DOMAIN MODE'
32+
is_format_valid 'user' 'domain'
33+
is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
34+
is_object_valid 'user' 'USER' "$user"
35+
is_object_unsuspended 'user' 'USER' "$user"
36+
is_object_valid 'web' 'DOMAIN' "$domain"
37+
is_object_unsuspended 'web' 'DOMAIN' "$domain"
38+
39+
40+
#----------------------------------------------------------#
41+
# Action #
42+
#----------------------------------------------------------#
43+
44+
# Fetching domain variables
45+
get_domain_values 'web'
46+
47+
if [ "$mode" = "on" ]; then
48+
# Enable directory listing
49+
sed -i "s/-Index/+Index/g" $HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.conf
50+
if [ -e "$ssl_dir/$domain.ca" ]; then
51+
# Enable directory listing for SSL-enforced domains
52+
sed -i "s/-Index/+Index/g" $HOMEDIR/$user/conf/web/s$WEB_SYSTEM.$domain.conf
53+
fi
54+
echo "INFO: Enabled directory browsing for $domain."
55+
else
56+
# Disable directory listing
57+
sed -i "s/+Index/-Index/g" $HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.conf
58+
if [ -e "$ssl_dir/$domain.ca" ]; then
59+
# Enable directory listing for SSL-enforced domains
60+
sed -i "s/+Index/-Index/g" $HOMEDIR/$user/conf/web/s$WEB_SYSTEM.$domain.conf
61+
fi
62+
echo "INFO: Disabled directory browsing for $domain."
63+
fi
64+
65+
66+
#----------------------------------------------------------#
67+
# Hestia #
68+
#----------------------------------------------------------#
69+
70+
# Rebuilding vhosts
71+
$BIN/v-restart-web
72+
73+
# Logging
74+
log_history "turned directory browsing $mode for $domain."
75+
log_event "$OK" "$EVENT"
76+
77+
exit

‎bin/v-delete-sys-sftp-jail‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ source $HESTIA/conf/hestia.conf
2222
# Verifications #
2323
#----------------------------------------------------------#
2424

25-
#if [ -z "$SFTPJAIL_KEY" ]; then
26-
# exit
27-
#fi
28-
2925

3026
#----------------------------------------------------------#
3127
# Action #

‎bin/v-delete-user‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,7 @@ sed -i "/ $user$/d" $HESTIA/data/queue/disk.pipe
7575
sed -i "/ $user$/d" $HESTIA/data/queue/traffic.pipe
7676

7777
# Deleting sftp jail
78-
if [ ! -z "$SFTPJAIL_KEY" ]; then
79-
$BIN/v-delete-user-sftp-jail $user
80-
fi
78+
$BIN/v-delete-user-sftp-jail $user
8179

8280
# Deleting system user
8381
/usr/sbin/userdel -f $user >> /dev/null 2>&1

‎bin/v-delete-web-domain-ftp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,7 @@ if [ "$?" != 0 ]; then
5757
fi
5858

5959
# Deleting sftp jail
60-
if [ ! -z "$SFTPJAIL_KEY" ]; then
61-
$BINv-delete-user-sftp-jail $ftp_user
62-
fi
60+
$BINv-delete-user-sftp-jail $ftp_user
6361

6462

6563
#----------------------------------------------------------#

0 commit comments

Comments
 (0)