Skip to content

Commit b1a884d

Browse files
ScIT-RaphaelScIT-Raphael
committed
Enable sftp by default.
1 parent d2e8b4c commit b1a884d

File tree

14 files changed

+28
-131
lines changed

14 files changed

+28
-131
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
@@ -204,9 +204,7 @@ if [ -x "$HESTIA/data/packages/$package.sh" ]; then
204204
fi
205205

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

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

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ 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

‎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-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-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
#----------------------------------------------------------#

‎bin/v-list-sys-config‎

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ json_list() {
4141
"DISK_QUOTA": "'$DISK_QUOTA'",
4242
"FIREWALL_SYSTEM": "'$FIREWALL_SYSTEM'",
4343
"FIREWALL_EXTENSION": "'$FIREWALL_EXTENSION'",
44-
"FILEMANAGER_KEY": "'$FILEMANAGER_KEY'",
45-
"SFTPJAIL_KEY": "'$SFTPJAIL_KEY'",
4644
"REPOSITORY": "'$REPOSITORY'",
4745
"VERSION": "'$VERSION'",
4846
"LANGUAGE": "'$LANGUAGE'",
@@ -126,15 +124,6 @@ shell_list() {
126124
if [ ! -z "$DISK_QUOTA" ]; then
127125
echo "Disk Quota: $DISK_QUOTA"
128126
fi
129-
if [ ! -z "$FILEMANAGER_KEY" ]; then
130-
echo "FileManager: $FILEMANAGER_KEY"
131-
fi
132-
if [ ! -z "$SFTPJAIL_KEY" ]; then
133-
echo "SFTP Chroot: $SFTPJAIL_KEY"
134-
fi
135-
if [ ! -z "$SOFTACULOUS" ]; then
136-
echo "Softaculous: $SOFTACULOUS"
137-
fi
138127
if [ ! -z "$LANGUAGE" ] && [ "$LANGUAGE" != 'en' ]; then
139128
echo "Language: $LANGUAGE"
140129
fi
@@ -149,9 +138,8 @@ plain_list() {
149138
echo -ne "$ANTIVIRUS_SYSTEM\t$ANTISPAM_SYSTEM\t$DB_SYSTEM\t"
150139
echo -ne "$DNS_SYSTEM\t$DNS_CLUSTER\t$STATS_SYSTEM\t$BACKUP_SYSTEM\t"
151140
echo -ne "$CRON_SYSTEM\t$DISK_QUOTA\t$FIREWALL_SYSTEM\t"
152-
echo -ne "$FIREWALL_EXTENSION\t$FILEMANAGER_KEY\t$SFTPJAIL_KEY\t"
153-
echo -ne "$REPOSITORY\t$VERSION\t$LANGUAGE\t$BACKUP_GZIP\t$BACKUP\t"
154-
echo -e "$MAIL_URL\t$DB_PMA_URL\t$DB_PGA_URL"
141+
echo -ne "$FIREWALL_EXTENSION\t$REPOSITORY\t$VERSION\t$LANGUAGE\t"
142+
echo -e "$BACKUP_GZIP\t$BACKUP\t$MAIL_URL\t$DB_PMA_URL\t$DB_PGA_URL"
155143
}
156144

157145

@@ -163,19 +151,18 @@ csv_list() {
163151
echo -n "'ANTIVIRUS_SYSTEM','ANTISPAM_SYSTEM','DB_SYSTEM',"
164152
echo -n "'DNS_SYSTEM','DNS_CLUSTER','STATS_SYSTEM','BACKUP_SYSTEM',"
165153
echo -n "'CRON_SYSTEM','DISK_QUOTA','FIREWALL_SYSTEM',"
166-
echo -n "'FIREWALL_EXTENSION','FILEMANAGER_KEY','SFTPJAIL_KEY',"
167-
echo -n "'REPOSITORY','VERSION','LANGUAGE','BACKUP_GZIP','BACKUP',"
168-
echo -n "'MAIL_URL','DB_PMA_URL','DB_PGA_URL'"
154+
echo -n "'FIREWALL_EXTENSION','REPOSITORY',"
155+
echo -n "'VERSION','LANGUAGE','BACKUP_GZIP','BACKUP','MAIL_URL',"
156+
echo -n "'DB_PMA_URL','DB_PGA_URL'"
169157
echo
170158
echo -n "'$WEB_SYSTEM','$WEB_RGROUPS','$WEB_PORT','$WEB_SSL',"
171159
echo -n "'$WEB_SSL_PORT','$WEB_BACKEND','$PROXY_SYSTEM','$PROXY_PORT',"
172160
echo -n "'$PROXY_SSL_PORT','$FTP_SYSTEM','$MAIL_SYSTEM','$IMAP_SYSTEM',"
173161
echo -n "'$ANTIVIRUS_SYSTEM','$ANTISPAM_SYSTEM','$DB_SYSTEM',"
174162
echo -n "'$DNS_SYSTEM','$DNS_CLUSTER','$STATS_SYSTEM','$BACKUP_SYSTEM',"
175-
echo -n "'$CRON_SYSTEM','$DISK_QUOTA','$FIREWALL_SYSTEM',"
176-
echo -n "'$FIREWALL_EXTENSION','$FILEMANAGER_KEY','$SFTPJAIL_KEY',"
177-
echo -n "'$REPOSITORY','$VERSION','$LANGUAGE','$BACKUP_GZIP','$BACKUP',"
178-
echo -n "'$MAIL_URL','$DB_PMA_URL','$DB_PGA_URL', '$SOFTACULOUS'"
163+
echo -n "'$CRON_SYSTEM','$DISK_QUOTA','$FIREWALL_SYSTEM','$REPOSITORY',"
164+
echo -n "'$FIREWALL_EXTENSION','$VERSION','$LANGUAGE','$BACKUP_GZIP',"
165+
echo -n "'$BACKUP','$MAIL_URL','$DB_PMA_URL','$DB_PGA_URL'"
179166
echo
180167
}
181168

‎install/hst-install-debian.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1608,6 +1608,10 @@ check_result $? "can't create admin user"
16081608
$HESTIA/bin/v-change-user-shell admin nologin
16091609
$HESTIA/bin/v-change-user-language admin $lang
16101610

1611+
# Enable sftp jail
1612+
$HESTIA/bin/v-add-sys-sftp-jail > /dev/null 2>&1
1613+
check_result $? "can't enable sftp jail"
1614+
16111615
# Roundcube permissions fix
16121616
if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then
16131617
if [ ! -d "/var/log/roundcube" ]; then

0 commit comments

Comments
 (0)