Merge remote-tracking branch 'upstream/master' into flared/main

Author: isra17

.github/workflows/python.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
 
     steps:
       - uses: actions/checkout@v4
@@ -23,7 +23,7 @@ jobs:
         run: python -c "import sys; print(sys.version)"
 
       - name: Install Python build dependencies
-        run: python -m pip install --upgrade pip setuptools wheel
+        run: python -m pip install --upgrade pip setuptools wheel pytest
 
       - name: Install libfuse-dev and pkg-config
         run: sudo apt install -y libfuse-dev pkg-config
@@ -34,5 +34,4 @@ jobs:
       - name: Test
         run: |
           sudo modprobe fuse
-          mkdir /tmp/foo && python example/hello.py /tmp/foo && [ "$(cat /tmp/foo/hello)" = "Hello World!" ]
-          mkdir /tmp/bar && python example/fioc.py /tmp/bar && [ -f /tmp/bar/fioc ]
+          python -m pytest

AUTHORS

@@ -4,7 +4,6 @@ Python bindings
 Csaba Henk <[email protected]>
 Sebastien Delafond <[email protected]>
 Steven James
-Jeff Epler         <[email protected]>
 
 Contributions
 =============
@@ -13,3 +12,8 @@ hello.py by Andrew Straw <[email protected]>
 threading related code cleaned up by Miklos Szeredi <[email protected]>
 IOCTL support by Cédric Carrée
 poll support by David Lechner <[email protected]>
+
+Retired
+=======
+
+Jeff Epler         <[email protected]>

example/fioc.py

@@ -71,6 +71,7 @@ def _IOWR(cls,t,nr,size):
 FIOC_GET_SIZE = IOCTL._IOR(ord('E'),0, struct.calcsize("L"));
 FIOC_SET_SIZE = IOCTL._IOW(ord('E'),1, struct.calcsize("L"));
 
+print(f"{FIOC_GET_SIZE:x} {FIOC_SET_SIZE:x}")
 # object type
 FIOC_NONE = 0
 FIOC_ROOT = 1

example/xattr.py

@@ -0,0 +1,61 @@
+# Example by github @vignedev from https://github.com/libfuse/python-fuse/issues/77
+
+import fuse
+import stat, errno
+from fuse import Fuse, Stat, Direntry
+
+fuse.fuse_python_api = (0, 2)
+
+BROKEN_FILE = '/utf8_attr'
+FATTR_NAME = 'user.xdg.comment'
+FATTR_VALUE = 'ああ、メッセージは切り取られていない'
+
+class EmptyStat(Stat):
+  def __init__(self):
+    self.st_mode = 0
+    self.st_ino = 0
+    self.st_dev = 0
+    self.st_nlink = 0
+    self.st_uid = 0
+    self.st_gid = 0
+    self.st_size = 0
+    self.st_atime = 0
+    self.st_mtime = 0
+    self.st_ctime = 0
+
+class GetAttrBug(Fuse):
+  def getattr(self, path):
+    ret_stat = EmptyStat()
+    if path == '/':
+      ret_stat.st_mode = stat.S_IFDIR | int(0e755)
+      return ret_stat
+
+    if path == BROKEN_FILE:
+      ret_stat.st_mode = stat.S_IFREG | int(0e000)
+      return ret_stat
+    
+    return -errno.ENOENT
+
+  def readdir(self, path, offset):
+    yield Direntry('.')
+    yield Direntry('..')
+    yield Direntry(BROKEN_FILE[1:])
+
+  def open(self, path, flags):
+    return -errno.EACCES
+
+  def read(self, path, size, offset):
+    return
+
+  def listxattr(self, path, size):
+    if size == 0: return 1
+    else: return [ FATTR_NAME ]
+
+  def getxattr(self, path, attr, size):
+    if size == 0: return len(FATTR_VALUE.encode('utf8'))
+    else: return FATTR_VALUE
+
+if __name__ == '__main__':
+  server = GetAttrBug(dash_s_do='setsingle')
+  server.parse(errex=1)
+  server.main()

example/xmp.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-#    Copyright (C) 2001  Jeff Epler  <jepler@unpythonic.dhs.org>
+#    Copyright (C) 2001  Jeff Epler  <jepler@gmail.com>
 #    Copyright (C) 2006  Csaba Henk  <[email protected]>
 #
 #    This program can be distributed under the terms of the GNU LGPL.

fuse.py

@@ -1,5 +1,5 @@
 #
-#    Copyright (C) 2001  Jeff Epler  <jepler@unpythonic.dhs.org>
+#    Copyright (C) 2001  Jeff Epler  <jepler@gmail.com>
 #    Copyright (C) 2006  Csaba Henk  <[email protected]>
 #
 #    This program can be distributed under the terms of the GNU LGPL.

fuseparts/__init__.py

@@ -1 +1 @@
-__version__ = "1.0.8post1"
+__version__ = "1.0.9post1"

fuseparts/_fusemodule.c

@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2001  Jeff Epler  <jepler@unpythonic.dhs.org>
+    Copyright (C) 2001  Jeff Epler  <jepler@gmail.com>
 
     This program can be distributed under the terms of the GNU LGPL.
     See the file COPYING.
@@ -94,12 +94,16 @@
         PyErr_SetString(PyExc_ValueError, "non-decodable filename");
         return NULL;
     }
-
+    static inline Py_ssize_t PyString_Size(PyObject *s) {
+        Py_ssize_t result = -1;
+        (void)PyUnicode_AsUTF8AndSize(s, &result);
+        return result;
+    }
 #else
     #define PyString_AsString PyUnicode_AsUTF8
+    #define PyString_Size PyUnicode_GET_LENGTH
 #endif
     #define PyString_Check PyUnicode_Check
-    #define PyString_Size PyUnicode_GET_LENGTH
 #endif
 
 #ifdef FIX_PATH_DECODING
@@ -683,14 +687,14 @@ read_func(const char *path, char *buf, size_t s, off_t off)
 	if(PyObject_CheckBuffer(v)) {
 		PyObject_GetBuffer(v, &buffer, PyBUF_SIMPLE);
 
-		if(buffer.len <= s) {
+		if((size_t)buffer.len <= s) {
 			memcpy(buf, buffer.buf, buffer.len);
 			ret = buffer.len;
 		}
 
 		PyBuffer_Release(&buffer);
 	} else if(PyBytes_Check(v)) {
-		if(PyBytes_Size(v) > s)
+		if((size_t)PyBytes_Size(v) > s)
 			goto OUT_DECREF;
 		memcpy(buf, PyBytes_AsString(v), PyBytes_Size(v));
 		ret = PyBytes_Size(v);
@@ -919,6 +923,10 @@ flush_func(const char *path)
 	EPILOGUE
 }
 
+#ifdef __APPLE__
+static int
+getxattr_func(const char *path, const char *name, char *value, size_t size, uint32_t position)
+#else
 static int
 #if __APPLE__
 getxattr_func(const char *path, const char *name, char *value, size_t size, u_int32_t position)
@@ -948,7 +956,7 @@ getxattr_func(const char *path, const char *name, char *value, size_t size)
         /* If the size of the value buffer is too small to hold the result,  errno
          * is set to ERANGE.
          */
-		if (PyString_Size(v) > size) {
+		if ((size_t)PyString_Size(v) > size) {
             ret = -ERANGE;
 			goto OUT_DECREF;
         }
@@ -984,9 +992,9 @@ listxattr_func(const char *path, char *list, size_t size)
 	}
 
 	for (;;) {
-		int ilen;
+		size_t ilen;
 
-	        w = PyIter_Next(iter);
+		w = PyIter_Next(iter);
 		if (!w) {
 			ret = lx - list;
 			break;
@@ -1020,7 +1028,11 @@ listxattr_func(const char *path, char *list, size_t size)
 
 	EPILOGUE
 }
-
+#ifdef __APPLE__
+static int
+setxattr_func(const char *path, const char *name,
+		     const char *value, size_t size, int flags, uint32_t position)
+#else
 static int
 #if __APPLE__
 setxattr_func(const char *path, const char *name, const char *value,
@@ -1277,15 +1289,36 @@ poll_func(const char *path, struct fuse_file_info *fi,
 	  struct fuse_pollhandle *ph, unsigned *reventsp)
 {
 	PyObject *pollhandle = Py_None;
+	int ret = -EINVAL;
+	PyObject *v;
 
-	if (ph)
+	PYLOCK();
+
+	if (ph) {
 		pollhandle = PyCapsule_New(ph, pollhandle_name, pollhandle_destructor);
+		if (!pollhandle) {
+			PyErr_Print();
+			goto OUT;
+		}
+	}
 
 #ifdef FIX_PATH_DECODING
-	PROLOGUE(PYO_CALLWITHFI(fi, poll_cb, O&O, &Path_AsDecodedUnicode, path, pollhandle));
+	v = PYO_CALLWITHFI(fi, poll_cb, O&O, &Path_AsDecodedUnicode, path, pollhandle);
 #else
-	PROLOGUE(PYO_CALLWITHFI(fi, poll_cb, sO, path, pollhandle));
+	v = PYO_CALLWITHFI(fi, poll_cb, sO, path, pollhandle);
 #endif
+	if (!v) {
+		PyErr_Print();
+		goto OUT;
+	}
+	if (v == Py_None) {
+		ret = 0;
+		goto OUT_DECREF;
+	}
+	if (PyInt_Check(v)) {
+		ret = PyInt_AsLong(v);
+		goto OUT_DECREF;
+	}
 
 OUT_DECREF:
 	Py_DECREF(v);
@@ -1311,7 +1344,9 @@ pyfuse_loop_mt(struct fuse *f)
 #ifdef WITH_THREAD
 	PyThreadState *save;
 
+#if PY_VERSION_HEX < 0x03070000
 	PyEval_InitThreads();
+#endif
 	interp = PyThreadState_Get()->interp;
 	save = PyEval_SaveThread();
 	err = fuse_loop_mt(f);

pytest.ini

@@ -0,0 +1,3 @@
+[pytest]
+markers =
+    fstype: Type of filesystem to mount

setup.py

@@ -103,7 +103,7 @@ def setup(**kwargs):
        package_data={'': ['COPYING', 'AUTHORS', 'FAQ', 'INSTALL',
                           'README.md', 'README.new_fusepy_api.rst',
                           'README.package_maintainers.rst']},
-       author = 'Jeff Epler <[email protected]>, Csaba Henk <[email protected]>, Steven James, Miklos Szeredi <[email protected]>, Sébastien Delafond<[email protected]>',
+       author = 'Csaba Henk <[email protected]>, Steven James, Miklos Szeredi <[email protected]>, Sébastien Delafond<[email protected]>',
        maintainer = 'Sébastien Delafond',
        maintainer_email = '[email protected]',
        ext_modules = [fusemodule],

tests/test_basic.py

@@ -0,0 +1,66 @@
+import os
+import time
+import sys
+import struct
+import subprocess
+import pathlib
+import tempfile
+import pytest
+import fcntl
+
+topdir = pathlib.Path(__file__).parent.parent
+
+@pytest.fixture
+def filesystem(request):
+    fstype = request.node.get_closest_marker("fstype").args[0]
+
+    with tempfile.TemporaryDirectory() as tmpdir:
+        st_dev = os.stat(tmpdir).st_dev
+        proc = subprocess.Popen([sys.executable, "-d", topdir / "example" / f"{fstype}.py", tmpdir], stdin=subprocess.DEVNULL)
+
+        deadline = time.time() + 1
+        while time.time() < deadline:
+            new_st_dev = os.stat(tmpdir).st_dev
+            if new_st_dev != st_dev:
+                break
+            time.sleep(.01)
+        if new_st_dev == st_dev:
+            proc.terminate()
+            raise RuntimeError("Filesystem did not mount within 1s")
+
+
+        yield pathlib.Path(tmpdir)
+
+        subprocess.call(["fusermount", "-u", "-q", "-z", tmpdir])
+
+        deadline = time.time() + 1
+        while time.time() < deadline:
+            result = proc.poll()
+            if result is not None:
+                if result != 0:
+                    raise RuntimeError("Filesystem exited with an error: {result}")
+                return
+            time.sleep(.01)
+
+        proc.terminate()
+        raise RuntimeError("Filesystem failed to exit within 1s after unmount")
+
+@pytest.mark.fstype("hello")
+def test_hello(filesystem):
+    content = (filesystem / "hello").read_text(encoding="utf-8")
+    assert content == "Hello World!\n"
+
+@pytest.mark.fstype("fioc")
+def test_fioc(filesystem):
+    FIOC_GET_SIZE, FIOC_SET_SIZE = 0x80084500, 0x40084501
+    with (filesystem / "fioc").open("rb") as f:
+        b = struct.pack("L", 42)
+        fcntl.ioctl(f.fileno(), FIOC_SET_SIZE, b)
+
+        b = bytearray(struct.calcsize('l'))
+        fcntl.ioctl(f.fileno(), FIOC_GET_SIZE, b)
+        assert struct.unpack("L", b)[0] == 42
+
+@pytest.mark.fstype("xattr")
+def test_xattr(filesystem):
+    assert os.getxattr(filesystem / "utf8_attr", "user.xdg.comment").decode("utf-8") == 'ああ、メッセージは切り取られていない'