Released 3.7.2

Calling through to request_free() from clean_req() causes deadlock since
sshfs.lock is already held by the caller of clean_req().

.github/ISSUE_TEMPLATE/issue-report.md

@@ -0,0 +1,17 @@
+---
+name: Issue report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+PLEASE READ BEFORE REPORTING AN ISSUE
+
+SSHFS does not have any active, regular contributors or developers. The current maintainer continues to apply pull requests and tries to make regular releases, but unfortunately has no capacity to do any development beyond addressing high-impact issues. When reporting bugs, please understand that unless you are including a pull request or are reporting a critical issue, you will probably not get a response.
+
+To prevent the issue tracker from being flooded with issues that no-one is intending to work on, and to give more visibilty to critical issues that users should be aware of and that most urgently need attention, I will also close most bug reports once they've been inactive for a while.
+
+Please note that this isn't meant to imply that you haven't found a bug - you most likely have and I'm grateful that you took the time to report it. Unfortunately, SSHFS is a purely volunteer driven project,
+and at the moment there simply aren't any volunteers.

.gitignore

@@ -34,3 +34,4 @@ sshfs.1
 /patches
 /m4
 .deps/
+/build

.travis.yml

@@ -1,19 +1,21 @@
-sudo: required
-dist: trusty
+dist: focal
+sudo: enabled
 
 language:
     - c
 addons:
   apt:
-    sources:
-    - ubuntu-toolchain-r-test
     packages:
     - valgrind
-    - clang
     - gcc
-    - gcc-6
+    - clang
     - python-docutils
     - python3-pip
+    - python3-setuptools
+    - ninja-build
+    - meson
+    - python3-pytest
+    - libglib2.0-dev
 install: test/travis-install.sh
 script: test/travis-build.sh
 

AUTHORS

@@ -17,25 +17,40 @@ Contributors (autogenerated list)
 Alan Jenkins <alan.christopher.jenkins@gmail.com>
 Alexander Neumann <alexander@bumpern.de>
 Anatol Pomozov <anatol.pomozov@gmail.com>
+Andrew Stone <a@stne.dev>
 Benjamin Fleischer <fleiben@gmail.com>
 Berserker <berserker.troll@yandex.com>
 Bill Zissimopoulos <billziss@navimatics.com>
+bjoe2k4 <bjoe2k4@users.noreply.github.com>
 Brandon Carter <b-carter@users.noreply.github.com>
 Chris Wolfe <cwolfe@chromium.org>
+Clayton G. Hobbs <clay@lakeserv.net>
 Daniel Lublin <daniel@lublin.se>
+Dominique Martinet <asmadeus@codewreck.org>
+DrDaveD <2129743+DrDaveD@users.noreply.github.com>
+Fabrice Fontaine <fontaine.fabrice@gmail.com>
 gala <gala132@users.noreply.github.com>
+Galen Getsov <4815620+ggetsov@users.noreply.github.com>
 George Vlahavas <vlahavas@gmail.com>
 G.raud Meyer <graud@gmx.com>
 harrim4n <git@harrim4n.com>
 Jakub Jelen <jjelen@redhat.com>
+jeg139 <54814784+jeg139@users.noreply.github.com>
 Josh Triplett <josh@joshtriplett.org>
 Julio Merino <jmmv@google.com>
 Julio Merino <jmmv@meroh.net>
+Junichi Uekawa <dancerj@gmail.com>
+Junichi Uekawa <dancer@netfort.gr.jp>
+kalvdans <github@kalvdans.no-ip.org>
+Michael Forney <mforney@mforney.org>
 Mike Kelly <mike@pair.com>
+Mike Salvatore <mike.s.salvatore@gmail.com>
 Miklos Szeredi <miklos@szeredi.hu>
 Miklos Szeredi <mszeredi@suse.cz>
+mssalvatore <mike.s.salvatore@gmail.com>
 Nikolaus Rath <Nikolaus@rath.org>
 Percy Jahn <email@percyjahn.de>
+Peter Belm <peterbelm@gmail.com>
 Qais Patankar <qaisjp@gmail.com>
 Quentin Rameau <quinq@fifth.space>
 Reid Wagner <wagnerreid@gmail.com>
@@ -43,8 +58,11 @@ Rian Hunter <rian@alum.mit.edu>
 Rian Hunter <rianhunter@users.noreply.github.com>
 Samuel Murray <samuel.murray@outlook.com>
 S. D. Cloudt <s.d.cloudt@student.tue.nl>
+Simon Arlott <70171+nomis@users.noreply.github.com>
 smheidrich <smheidrich@weltenfunktion.de>
+sunwire <50745572+sunwire@users.noreply.github.com>
 Tim Harder <radhermit@gmail.com>
 Timo Savola <timo.savola@iki.fi>
 tpoindessous <thomas@poindessous.com>
+Viktor Szakats <vszakats@users.noreply.github.com>
 Zoltan Kuscsik <zoltan.kuscsik@linaro.org>

ChangeLog.rst

@@ -1,3 +1,50 @@
+Release 3.7.2 (2021-06-08)
+--------------------------
+
+* Added a secondary check so if a mkdir request fails with EPERM an access request will be
+  tried - returning EEXIST if the access was successful.
+	Fixes: https://github.com/libfuse/sshfs/issues/243
+
+
+Release 3.7.1 (2020-11-09)
+--------------------------
+
+* Minor bugfixes.
+
+
+Release 3.7.0 (2020-01-03)
+--------------------------
+
+* New max_conns option enables the use of multiple connections to improve responsiveness
+  during large file transfers. Thanks to Timo Savola for doing most of the implementation
+  work, and thanks to CEA.fr for sponsoring remaining bugfixes and cleanups!
+
+* The `buflimit` workaround is now disabled by default. The corresponding bug in OpenSSH
+  has been fixed in 2007
+  (cf. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=365541#37), so this shouldn't be
+  needed anymore. If you depend on this workaround, please let the SSHFS maintainers know,
+  otherwise support for the workaround will be removed completely in a future version.
+
+  
+Release 3.6.0 (2019-11-03)
+--------------------------
+
+* Added "-o direct_io" option.
+  This option disables the use of page cache in kernel.
+  This is useful for example if the file size is not known before reading it.
+  For example if you mount /proc dir from a remote host without the direct_io
+  option, the read always will return zero bytes instead of actual data.
+* Added --verbose option.
+* Fixed a number of compiler warnings.
+* Improved performance under OS X.
+
+
+Release 3.5.2 (2019-04-13)
+--------------------------
+
+* Fixed "-o idmap=user" to map both UID and GID on all OSs.
+* Fixed improper handling of sequential spaces spaces in "ssh_command" option
+
 Release 3.5.1 (2018-12-22)
 --------------------------
 

README.rst

@@ -10,6 +10,20 @@ servers support and enable this SFTP access by default, so SSHFS is
 very simple to use - there's nothing to do on the server-side.
 
 
+Development Status
+------------------
+
+SSHFS is shipped by all major Linux distributions and has been in
+production use across a wide range of systems for many years. However,
+at present SSHFS does not have any active, regular contributors, and
+there are a number of known issues (see the bugtracker).  The current
+maintainer continues to apply pull requests and makes regular
+releases, but unfortunately has no capacity to do any development
+beyond addressing high-impact issues. When reporting bugs, please
+understand that unless you are including a pull request or are
+reporting a critical issue, you will probably not get a response.
+
+
 How to use
 ----------
 
@@ -84,11 +98,3 @@ https://lists.sourceforge.net/lists/listinfo/fuse-sshfs).
 
 Please report any bugs on the GitHub issue tracker at
 https://github.com/libfuse/libfuse/issues.
-
-
-Professional Support
---------------------
-
-Professional support is offered via `Rath Consulting`_.
-
-.. _`Rath Consulting`: http://www.rath-consulting.biz

cache.c

@@ -258,7 +258,7 @@ static void *cache_init(struct fuse_conn_info *conn,
 	res = cache.next_oper->init(conn, cfg);
 	
 	// Cache requires a path for each request
-        cfg->nullpath_ok = 0;
+	cfg->nullpath_ok = 0;
 
 	return res;
 }

meson.build

@@ -1,5 +1,5 @@
-project('sshfs', 'c', version: '3.5.1',
-        meson_version: '>= 0.38',
+project('sshfs', 'c', version: '3.7.2',
+        meson_version: '>= 0.40',
         default_options: [ 'buildtype=debugoptimized' ])
 
 add_global_arguments('-D_REENTRANT', '-DHAVE_CONFIG_H',

sshfs.rst

@@ -27,21 +27,24 @@ To unmount it::
 Description
 ===========
 
-SSHFS allows you to mount a remote filesystem using SSH (more
-precisely, the SFTP subsystem). Most SSH servers support and enable
-this SFTP access by default, so SSHFS is very simple to use - there's
-nothing to do on the server-side.
+SSHFS allows you to mount a remote filesystem using SSH (more precisely, the SFTP
+subsystem). Most SSH servers support and enable this SFTP access by default, so SSHFS is
+very simple to use - there's nothing to do on the server-side.
 
-SSHFS uses FUSE (Filesystem in Userspace) and should work on any
-operating system that provides a FUSE implementation. Currently,
-this includes Linux, FreeBSD and Mac OS X.
+By default, file permissions are ignored by SSHFS. Any user that can access the filesystem
+will be able to perform any operation that the remote server permits - based on the
+credentials that were used to connect to the server. If this is undesired, local
+permission checking can be enabled with ``-o default_permissions``.
 
-It is recommended to run SSHFS as regular user (not as root).  For
-this to work the mountpoint must be owned by the user.  If username is
-omitted SSHFS will use the local username. If the directory is
-omitted, SSHFS will mount the (remote) home directory.  If you need to
-enter a password sshfs will ask for it (actually it just runs ssh
-which ask for the password if needed).
+By default, only the mounting user will be able to access the filesystem. Access for other
+users can be enabled by passing ``-o allow_other``. In this case you most likely also
+want to use ``-o default_permissions``.
+
+It is recommended to run SSHFS as regular user (not as root).  For this to work the
+mountpoint must be owned by the user.  If username is omitted SSHFS will use the local
+username. If the directory is omitted, SSHFS will mount the (remote) home directory.  If
+you need to enter a password sshfs will ask for it (actually it just runs ssh which ask
+for the password if needed).
 
 
 Options
@@ -153,8 +156,11 @@ Options
 -o directport=PORT
    directly connect to PORT bypassing ssh
 
--o slave
-   communicate over stdin and stdout bypassing network
+-o passive
+   communicate over stdin and stdout bypassing network. Useful for
+   mounting local filesystem on the remote side.  An example using
+   dpipe command would be ``dpipe /usr/lib/openssh/sftp-server = ssh
+   RemoteHostname sshfs :/directory/to/be/shared ~/mnt/src -o passive``
 
 -o disable_hardlink
    With this option set, attempts to call `link(2)` will fail with
@@ -202,6 +208,27 @@ Options
    sets the interval for forced cleaning of the directory cache
    when full.
 
+-o direct_io
+   This option disables the use of page cache (file content cache) in 
+   the kernel for this filesystem.
+   This has several affects:
+
+   1. Each read() or write() system call will initiate one or more read or
+      write operations, data will not be cached in the kernel.
+
+   2. The return value of the read() and write() system calls will correspond 
+      to the return values of the read and write operations. This is useful 
+      for example if the file size is not known in advance (before reading it).
+      e.g. /proc filesystem 
+
+-o max_conns=N
+   sets the maximum number of simultaneous SSH connections
+   to use. Each connection is established with a separate SSH process.
+   The primary purpose of this feature is to improve the responsiveness of the
+   file system during large file transfers. When using more than once
+   connection, the *password_stdin* and *passive* options can not be
+   used, and the *buflimit* workaround is not supported.
+
 In addition, SSHFS accepts several options common to all FUSE file
 systems. These are described in the `mount.fuse` manpage (look
 for "general", "libfuse specific", and "high-level API" options).

test/test_sshfs.py

@@ -33,13 +33,17 @@ def name_generator(__ctr=[0]):
 @pytest.mark.parametrize("debug", (False, True))
 @pytest.mark.parametrize("cache_timeout", (0,1))
 @pytest.mark.parametrize("sync_rd", (True, False))
-def test_sshfs(tmpdir, debug, cache_timeout, sync_rd, capfd):
+@pytest.mark.parametrize("multiconn", (True,False))
+def test_sshfs(tmpdir, debug, cache_timeout, sync_rd, multiconn, capfd):
     
     # Avoid false positives from debug messages
     #if debug:
     #    capfd.register_output(r'^   unique: [0-9]+, error: -[0-9]+ .+$',
     #                          count=0)
 
+    # Avoid false positives from storing key for localhost 
+    capfd.register_output(r"^Warning: Permanently added 'localhost' .+", count=0)
+    
     # Test if we can ssh into localhost without password
     try:
         res = subprocess.call(['ssh', '-o', 'KbdInteractiveAuthentication=no',
@@ -74,6 +78,8 @@ def test_sshfs(tmpdir, debug, cache_timeout, sync_rd, capfd):
     cmdline += [ '-o', 'entry_timeout=0',
                  '-o', 'attr_timeout=0' ]
 
+    if multiconn:
+        cmdline += [ '-o', 'max_conns=3' ]
     
     new_env = dict(os.environ) # copy, don't modify
 

test/travis-build.sh

@@ -12,7 +12,7 @@ export CC
 TEST_CMD="python3 -m pytest --maxfail=99 test/"
 
 # Standard build with Valgrind
-for CC in gcc gcc-6 clang; do
+for CC in gcc clang; do
     mkdir build-${CC}; cd build-${CC}
     if [ ${CC} == 'gcc-6' ]; then
         build_opts='-D b_lundef=false'

test/travis-install.sh

@@ -2,24 +2,12 @@
 
 set -e
 
-# Meson 0.45 requires Python 3.5 or newer
-sudo python3 -m pip install pytest meson==0.44
-wget https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-linux.zip
-unzip ninja-linux.zip
-chmod 755 ninja
-sudo chown root:root ninja
-sudo mv -fv ninja /usr/local/bin
-valgrind --version
-ninja --version
-meson --version
-
 # Install fuse
 wget https://github.com/libfuse/libfuse/archive/master.zip
 unzip master.zip
 cd libfuse-master
 mkdir build
 cd build
-export CC=gcc-6
 meson ..
 ninja
 sudo ninja install
@@ -29,7 +17,7 @@ ls -d1 /usr/local/lib/*-linux-gnu | sudo tee /etc/ld.so.conf.d/usrlocal.conf
 sudo ldconfig
 
 # Setup ssh
-ssh-keygen -b 768 -t rsa -f ~/.ssh/id_rsa -P ''
+ssh-keygen -b 1024 -t rsa -f ~/.ssh/id_rsa -P ''
 cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
 chmod 600 ~/.ssh/authorized_keys
 ssh -o "StrictHostKeyChecking=no" localhost echo "SSH connection succeeded"