forked from pool/vsftpd
cf83fc9250
* Make listen mode the default.
* Fix missing "const" in ssl.c
* Add seccompsandbox.c to support a seccomp filter sandbox; works against
Ubuntu 12.04 ABI.
* Rearrange ftppolicy.c a bit so the syscall list is easily comparable with
seccompsandbox.c
* Rename deprecated "sandbox" to "ptrace_sandbox".
* Add a few more state checks to the privileged helper processes.
* Add tunable "seccomp_sandbox", default on.
* Use hardened build flags.
* Retry creating a PASV socket upon port reuse race between bind() and
listen(), patch from Ralph Wuerthner <ralph.wuerthner@de.ibm.com>.
* Don't die() if recv() indicates a closed remote connection. Problem report
on a Windows client from Herbert van den Bergh,
<herbert.van.den.bergh@oracle.com>.
* Add new config setting "allow_writeable_chroot" to help people in a bit of
a spot with the v2.3.5 defensive change. Only applies to non-anonymous.
* Remove a couple of fixed things from BUGS.
* strlen() trunction fix -- no particular impact.
* Apply some tidyups from mmoufid@yorku.ca.
* Fix delete_failed_uploads if there is a timeout. Report from Alejandro
Hernández Hdez <aalejandrohdez@gmail.com>.
* Fix other data channel bugs such as failure to log failure upon timeout.
* Use exit codes a bit more consistently.
* Fix bad interaction between SSL and trans_chunk_size.
* Redo data timeout to fire properly for SSL sessions.
* Redo idle timeout to fire properly for SSL sessions.
* Make sure PROT_EXEC isn't allowed, thanks to Will Drewry for noticing.
* Use 10 minutes as a max linger time just in case an alarm gets lost.
* Change PR_SET_NO_NEW_PRIVS define, from Kees Cook.
* Add AES128-SHA to default SSL cipher suites for FileZilla compatibility.
Unfortunately the default vsftpd SSL confiuration still doesn't fully work with
FileZilla, because FileZilla has a data connection security problem: no client
certificate presentation and no session reuse. At least the error message is
now very clear.
* Add restart_syscall to seccomp policy. Triggers reliably if you strace whilst
a data transfer is in progress.
* Fix delete_failed_uploads for anonymous sessions.
* Don't listen for urgent data if the control connection is SSL, due to possible
protocol synchronization issues.
- SUSE specific changes:
* turn off the listen mode (listen=NO) by default and change README.SUSE
* merge new hardended flags for build and linking
* fix the wrong Type=forking from systemd service file
* turn off the seccomp_sandbox off by default as SUSE kernel does not support
it (yet)
OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=38
234 lines
8.1 KiB
Diff
234 lines
8.1 KiB
Diff
Index: vsftpd.conf
|
|
===================================================================
|
|
--- vsftpd.conf.orig 2011-12-17 19:24:40.000000000 +0100
|
|
+++ vsftpd.conf 2012-04-11 10:19:06.192238657 +0200
|
|
@@ -4,23 +4,89 @@
|
|
# loosens things up a bit, to make the ftp daemon more usable.
|
|
# Please see vsftpd.conf.5 for all compiled in defaults.
|
|
#
|
|
+# If you do not change anything here you will have a minimum setup for an
|
|
+# anonymus FTP server.
|
|
+#
|
|
# READ THIS: This example file is NOT an exhaustive list of vsftpd options.
|
|
# Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's
|
|
# capabilities.
|
|
#
|
|
-# Allow anonymous FTP? (Beware - allowed by default if you comment this out).
|
|
-anonymous_enable=YES
|
|
-#
|
|
-# Uncomment this to allow local users to log in.
|
|
-#local_enable=YES
|
|
+# ################
|
|
+# General Settings
|
|
+# ################
|
|
#
|
|
# Uncomment this to enable any form of FTP write command.
|
|
-#write_enable=YES
|
|
+write_enable=NO
|
|
+#
|
|
+# Activate directory messages - messages given to remote users when they
|
|
+# go into a certain directory.
|
|
+dirmessage_enable=YES
|
|
+#
|
|
+# It is recommended that you define on your system a unique user which the
|
|
+# ftp server can use as a totally isolated and unprivileged user.
|
|
+nopriv_user=ftpsecure
|
|
+#
|
|
+# You may fully customise the login banner string:
|
|
+#ftpd_banner=Welcome to blah FTP service.
|
|
+#
|
|
+# You may activate the "-R" option to the builtin ls. This is disabled by
|
|
+# default to avoid remote users being able to cause excessive I/O on large
|
|
+# sites. However, some broken FTP clients such as "ncftp" and "mirror" assume
|
|
+# the presence of the "-R" option, so there is a strong case for enabling it.
|
|
+#ls_recurse_enable=YES
|
|
+#
|
|
+# You may specify a file of disallowed anonymous e-mail addresses. Apparently
|
|
+# useful for combatting certain DoS attacks.
|
|
+#deny_email_enable=YES
|
|
+# (default follows)
|
|
+#banned_email_file=/etc/vsftpd.banned_emails
|
|
+#
|
|
+# If enabled, all user and group information in
|
|
+# directory listings will be displayed as "ftp".
|
|
+#hide_ids=YES
|
|
+#
|
|
+# #######################
|
|
+# Local FTP user Settings
|
|
+# #######################
|
|
+#
|
|
+# Uncomment this to allow local users to log in.
|
|
+local_enable=YES
|
|
#
|
|
# Default umask for local users is 077. You may wish to change this to 022,
|
|
# if your users expect that (022 is used by most other ftpd's)
|
|
#local_umask=022
|
|
#
|
|
+# You may specify an explicit list of local users to chroot() to their home
|
|
+# directory. If chroot_local_user is YES, then this list becomes a list of
|
|
+# users to NOT chroot().
|
|
+#chroot_local_user=YES
|
|
+#chroot_list_enable=YES
|
|
+# (default follows)
|
|
+#chroot_list_file=/etc/vsftpd.chroot_list
|
|
+#
|
|
+# The maximum data transfer rate permitted, in bytes per second, for
|
|
+# local authenticated users. The default is 0 (unlimited).
|
|
+#local_max_rate=7200
|
|
+#
|
|
+# ##########################
|
|
+# Anonymus FTP user Settings
|
|
+# ##########################
|
|
+#
|
|
+# Allow anonymous FTP? (Beware - allowed by default if you comment this out).
|
|
+anonymous_enable=YES
|
|
+#
|
|
+# The maximum data transfer rate permitted, in bytes per second, for anonymous
|
|
+# authenticated users. The default is 0 (unlimited).
|
|
+#anon_max_rate=7200
|
|
+#
|
|
+# Anonymous users will only be allowed to download files which are
|
|
+# world readable.
|
|
+anon_world_readable_only=YES
|
|
+#
|
|
+# Default umask for anonymus users is 077. You may wish to change this to 022,
|
|
+# if your users expect that (022 is used by most other ftpd's)
|
|
+#anon_umask=022
|
|
+#
|
|
# Uncomment this to allow the anonymous FTP user to upload files. This only
|
|
# has an effect if the above global write enable is activated. Also, you will
|
|
# obviously need to create a directory writable by the FTP user.
|
|
@@ -30,15 +96,9 @@
|
|
# new directories.
|
|
#anon_mkdir_write_enable=YES
|
|
#
|
|
-# Activate directory messages - messages given to remote users when they
|
|
-# go into a certain directory.
|
|
-dirmessage_enable=YES
|
|
-#
|
|
-# Activate logging of uploads/downloads.
|
|
-xferlog_enable=YES
|
|
-#
|
|
-# Make sure PORT transfer connections originate from port 20 (ftp-data).
|
|
-connect_from_port_20=YES
|
|
+# Uncomment this to enable anonymus FTP users to perform other write operations
|
|
+# like deletion and renaming.
|
|
+#anon_other_write_enable=YES
|
|
#
|
|
# If you want, you can arrange for uploaded anonymous files to be owned by
|
|
# a different user. Note! Using "root" for uploaded files is not
|
|
@@ -46,24 +106,51 @@
|
|
#chown_uploads=YES
|
|
#chown_username=whoever
|
|
#
|
|
+# ############
|
|
+# Log Settings
|
|
+# ############
|
|
+#
|
|
+# Log to the syslog daemon instead of using an logfile.
|
|
+syslog_enable=YES
|
|
+#
|
|
+# Uncomment this to log all FTP requests and responses.
|
|
+#log_ftp_protocol=YES
|
|
+#
|
|
+# Activate logging of uploads/downloads.
|
|
+#xferlog_enable=YES
|
|
+#
|
|
# You may override where the log file goes if you like. The default is shown
|
|
# below.
|
|
-#xferlog_file=/var/log/vsftpd.log
|
|
+#
|
|
+#vsftpd_log_file=/var/log/vsftpd.log
|
|
#
|
|
# If you want, you can have your log file in standard ftpd xferlog format.
|
|
# Note that the default log file location is /var/log/xferlog in this case.
|
|
#xferlog_std_format=YES
|
|
#
|
|
+# You may override where the log file goes if you like. The default is shown
|
|
+# below.
|
|
+#xferlog_file=/var/log/vsftpd.log
|
|
+#
|
|
+# Enable this to have booth logfiles. Standard xferlog and vsftpd's own style log.
|
|
+#dual_log_enable=YES
|
|
+#
|
|
+# Uncomment this to enable session status information in the system process listing.
|
|
+#setproctitle_enable=YES
|
|
+#
|
|
+# #################
|
|
+# Transfer Settings
|
|
+# #################
|
|
+#
|
|
+# Make sure PORT transfer connections originate from port 20 (ftp-data).
|
|
+connect_from_port_20=YES
|
|
+#
|
|
# You may change the default value for timing out an idle session.
|
|
#idle_session_timeout=600
|
|
#
|
|
# You may change the default value for timing out a data connection.
|
|
#data_connection_timeout=120
|
|
#
|
|
-# It is recommended that you define on your system a unique user which the
|
|
-# ftp server can use as a totally isolated and unprivileged user.
|
|
-#nopriv_user=ftpsecure
|
|
-#
|
|
# Enable this and the server will recognise asynchronous ABOR requests. Not
|
|
# recommended for security (the code is non-trivial). Not enabling it,
|
|
# however, may confuse older FTP clients.
|
|
@@ -77,41 +164,29 @@
|
|
# predicted this attack and has always been safe, reporting the size of the
|
|
# raw file.
|
|
# ASCII mangling is a horrible feature of the protocol.
|
|
-#ascii_upload_enable=YES
|
|
+ascii_upload_enable=YES
|
|
#ascii_download_enable=YES
|
|
#
|
|
-# You may fully customise the login banner string:
|
|
-#ftpd_banner=Welcome to blah FTP service.
|
|
-#
|
|
-# You may specify a file of disallowed anonymous e-mail addresses. Apparently
|
|
-# useful for combatting certain DoS attacks.
|
|
-#deny_email_enable=YES
|
|
-# (default follows)
|
|
-#banned_email_file=/etc/vsftpd.banned_emails
|
|
-#
|
|
-# You may specify an explicit list of local users to chroot() to their home
|
|
-# directory. If chroot_local_user is YES, then this list becomes a list of
|
|
-# users to NOT chroot().
|
|
-# (Warning! chroot'ing can be very dangerous. If using chroot, make sure that
|
|
-# the user does not have write access to the top level directory within the
|
|
-# chroot)
|
|
-#chroot_local_user=YES
|
|
-#chroot_list_enable=YES
|
|
-# (default follows)
|
|
-#chroot_list_file=/etc/vsftpd.chroot_list
|
|
+# Set to NO if you want to disallow the PASV method of obtaining a data
|
|
+# connection.
|
|
+#pasv_enable=NO
|
|
#
|
|
-# You may activate the "-R" option to the builtin ls. This is disabled by
|
|
-# default to avoid remote users being able to cause excessive I/O on large
|
|
-# sites. However, some broken FTP clients such as "ncftp" and "mirror" assume
|
|
-# the presence of the "-R" option, so there is a strong case for enabling it.
|
|
-#ls_recurse_enable=YES
|
|
+# PAM setting. Do NOT change this unless you know what you do!
|
|
+pam_service_name=vsftpd
|
|
#
|
|
# When "listen" directive is enabled, vsftpd runs in standalone mode and
|
|
# listens on IPv4 sockets. This directive cannot be used in conjunction
|
|
# with the listen_ipv6 directive.
|
|
-listen=YES
|
|
+listen=NO
|
|
#
|
|
# This directive enables listening on IPv6 sockets. To listen on IPv4 and IPv6
|
|
# sockets, you must run two copies of vsftpd with two configuration files.
|
|
# Make sure, that one of the listen options is commented !!
|
|
-#listen_ipv6=YES
|
|
+listen_ipv6=YES
|
|
+#
|
|
+# Set to ssl_enable=YES if you want to enable SSL
|
|
+ssl_enable=NO
|
|
+#
|
|
+# Limit passive ports to this range to assis firewalling
|
|
+pasv_min_port=30000
|
|
+pasv_max_port=30100
|