Merge aee25c3564 into 7f15c14fc6

.github/workflows/black.yaml

@@ -9,7 +9,7 @@ jobs:
   lint:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: psf/black@stable
         with:
             version: "~= 23.0"

.github/workflows/ci.yml

@@ -78,11 +78,11 @@ jobs:
         # just fetching 1 commit is not enough for setuptools-scm, so we fetch all
         fetch-depth: 0
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Cache pip
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ hashFiles('requirements.d/development.txt') }}
@@ -114,7 +114,7 @@ jobs:
         #sudo -E bash -c "tox -e py"
         tox --skip-missing-interpreters
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v3
       env:
         OS: ${{ runner.os }}
         python: ${{ matrix.python-version }}

requirements.d/development.lock.txt

@@ -1,14 +1,14 @@
-setuptools==69.2.0
+setuptools==68.2.2
 setuptools-scm==8.0.4
-pip==24.0
-wheel==0.43.0
-virtualenv==20.25.1
-build==1.2.1
+pip==23.3.2
+wheel==0.41.3
+virtualenv==20.25.0
+build==1.0.3
 pkgconfig==1.5.5
-tox==4.14.2
-pytest==8.1.1
-pytest-xdist==3.5.0
-pytest-cov==5.0.0
+tox==4.11.3
+pytest==7.4.3
+pytest-xdist==3.3.1
+pytest-cov==4.1.0
 pytest-benchmark==4.0.0
-Cython==3.0.10
-pre-commit==3.7.0
+Cython==3.0.5
+pre-commit==3.5.0

src/borg/archive.py

@@ -967,11 +967,7 @@ Duration: {0.duration}
                     if not symlink:
                         os.chmod(path, item.mode)
             if not self.noacls:
-                try:
-                    acl_set(path, item, self.numeric_ids, fd=fd)
-                except OSError as e:
-                    if e.errno not in (errno.ENOTSUP,):
-                        raise
+                acl_set(path, item, self.numeric_ids, fd=fd)
             if not self.noxattrs and "xattrs" in item:
                 # chown removes Linux capabilities, so set the extended attributes at the end, after chown,
                 # since they include the Linux capabilities in the "security.capability" attribute.
@@ -1217,11 +1213,7 @@ class MetadataCollector:
             attrs["xattrs"] = StableDict(xattrs)
         if not self.noacls:
             with backup_io("extended stat (ACLs)"):
-                try:
-                    acl_get(path, attrs, st, self.numeric_ids, fd=fd)
-                except OSError as e:
-                    if e.errno not in (errno.ENOTSUP,):
-                        raise
+                acl_get(path, attrs, st, self.numeric_ids, fd=fd)
         return attrs
 
     def stat_attrs(self, st, path, fd=None):

src/borg/archiver/prune_cmd.py

@@ -169,7 +169,7 @@ class PruneMixIn:
                     or (args.list_pruned and archive in to_delete)
                     or (args.list_kept and archive not in to_delete)
                 ):
-                    list_logger.info(f"{log_message:<44} {formatter.format_item(archive, jsonline=False)}")
+                    list_logger.info(f"{log_message:<40} {formatter.format_item(archive, jsonline=False)}")
             pi.finish()
             if sig_int:
                 # Ctrl-C / SIGINT: do not checkpoint (commit) again, we already have a checkpoint in this case.

src/borg/helpers/time.py

@@ -100,7 +100,7 @@ def format_timedelta(td):
     s = ts % 60
     m = int(ts / 60) % 60
     h = int(ts / 3600) % 24
-    txt = "%.3f seconds" % s
+    txt = "%.2f seconds" % s
     if m:
         txt = "%d minutes %s" % (m, txt)
     if h:

src/borg/platform/darwin.pyx

@@ -1,7 +1,6 @@
 import os
 
 from libc.stdint cimport uint32_t
-from libc cimport errno
 
 from .posix import user2uid, group2gid
 from ..helpers import safe_decode, safe_encode
@@ -116,25 +115,20 @@ def _remove_non_numeric_identifier(acl):
 def acl_get(path, item, st, numeric_ids=False, fd=None):
     cdef acl_t acl = NULL
     cdef char *text = NULL
-    if isinstance(path, str):
-        path = os.fsencode(path)
     try:
         if fd is not None:
             acl = acl_get_fd_np(fd, ACL_TYPE_EXTENDED)
         else:
+            if isinstance(path, str):
+                path = os.fsencode(path)
             acl = acl_get_link_np(path, ACL_TYPE_EXTENDED)
-        if acl == NULL:
-            if errno.errno == errno.ENOENT:
-                # macOS weirdness: if a file has no ACLs, it sets errno to ENOENT. :-(
-                return
-            raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(path))
-        text = acl_to_text(acl, NULL)
-        if text == NULL:
-            raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(path))
-        if numeric_ids:
-            item['acl_extended'] = _remove_non_numeric_identifier(text)
-        else:
-            item['acl_extended'] = text
+        if acl is not NULL:
+            text = acl_to_text(acl, NULL)
+            if text is not NULL:
+                if numeric_ids:
+                    item['acl_extended'] = _remove_non_numeric_identifier(text)
+                else:
+                    item['acl_extended'] = text
     finally:
         acl_free(text)
         acl_free(acl)
@@ -145,19 +139,16 @@ def acl_set(path, item, numeric_ids=False, fd=None):
     acl_text = item.get('acl_extended')
     if acl_text is not None:
         try:
-            if isinstance(path, str):
-                path = os.fsencode(path)
             if numeric_ids:
                 acl = acl_from_text(acl_text)
             else:
                 acl = acl_from_text(<bytes>_remove_numeric_id_if_possible(acl_text))
-            if acl == NULL:
-                raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(path))
-            if fd is not None:
-                if acl_set_fd_np(fd, acl, ACL_TYPE_EXTENDED) == -1:
-                    raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(path))
-            else:
-                if acl_set_link_np(path, ACL_TYPE_EXTENDED, acl) == -1:
-                    raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(path))
+            if acl is not NULL:
+                if fd is not None:
+                    acl_set_fd_np(fd, acl, ACL_TYPE_EXTENDED)
+                else:
+                    if isinstance(path, str):
+                        path = os.fsencode(path)
+                    acl_set_link_np(path, ACL_TYPE_EXTENDED, acl)
         finally:
             acl_free(acl)

src/borg/platform/freebsd.pyx

@@ -1,7 +1,4 @@
 import os
-import stat
-
-from libc cimport errno
 
 from .posix import posix_acl_use_stored_uid_gid
 from ..helpers import safe_encode, safe_decode
@@ -9,6 +6,10 @@ from .xattr import _listxattr_inner, _getxattr_inner, _setxattr_inner, split_lst
 
 API_VERSION = '1.2_05'
 
+cdef extern from "errno.h":
+    int errno
+    int EINVAL
+
 cdef extern from "sys/extattr.h":
     ssize_t c_extattr_list_file "extattr_list_file" (const char *path, int attrnamespace, void *data, size_t nbytes)
     ssize_t c_extattr_list_link "extattr_list_link" (const char *path, int attrnamespace, void *data, size_t nbytes)
@@ -43,12 +44,10 @@ cdef extern from "sys/acl.h":
     char *acl_to_text_np(acl_t acl, ssize_t *len, int flags)
     int ACL_TEXT_NUMERIC_IDS
     int ACL_TEXT_APPEND_ID
-    int acl_extended_link_np(const char * path)  # check also: acl_is_trivial_np
 
 cdef extern from "unistd.h":
     long lpathconf(const char *path, int name)
     int _PC_ACL_NFS4
-    int _PC_ACL_EXTENDED
 
 
 # On FreeBSD, borg currently only deals with the USER namespace as it is unclear
@@ -125,21 +124,21 @@ def setxattr(path, name, value, *, follow_symlinks=False):
 
 
 cdef _get_acl(p, type, item, attribute, flags, fd=None):
-    cdef acl_t acl
-    cdef char *text
-    if fd is not None:
-        acl = acl_get_fd_np(fd, type)
-    else:
-        acl = acl_get_link_np(p, type)
-    if acl == NULL:
-        raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(p))
-    text = acl_to_text_np(acl, NULL, flags)
-    if text == NULL:
+    cdef acl_t acl = NULL
+    cdef char *text = NULL
+    try:
+        if fd is not None:
+            acl = acl_get_fd_np(fd, type)
+        else:
+            acl = acl_get_link_np(p, type)
+        if acl is not NULL:
+            text = acl_to_text_np(acl, NULL, flags)
+            if text is not NULL:
+                item[attribute] = text
+    finally:
+        acl_free(text)
         acl_free(acl)
-        raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(p))
-    item[attribute] = text
-    acl_free(text)
-    acl_free(acl)
+
 
 def acl_get(path, item, st, numeric_ids=False, fd=None):
     """Saves ACL Entries
@@ -147,46 +146,34 @@ def acl_get(path, item, st, numeric_ids=False, fd=None):
     If `numeric_ids` is True the user/group field is not preserved only uid/gid
     """
     cdef int flags = ACL_TEXT_APPEND_ID
-    flags |= ACL_TEXT_NUMERIC_IDS if numeric_ids else 0
     if isinstance(path, str):
         path = os.fsencode(path)
-    ret = acl_extended_link_np(path)
-    if ret < 0:
-        raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(path))
-    if ret == 0:
-        # there is no ACL defining permissions other than those defined by the traditional file permission bits.
-        return
     ret = lpathconf(path, _PC_ACL_NFS4)
-    if ret < 0:
-        raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(path))
-    nfs4_acl = ret == 1
-    if nfs4_acl:
+    if ret < 0 and errno == EINVAL:
+        return
+    flags |= ACL_TEXT_NUMERIC_IDS if numeric_ids else 0
+    if ret > 0:
         _get_acl(path, ACL_TYPE_NFS4, item, 'acl_nfs4', flags, fd=fd)
     else:
         _get_acl(path, ACL_TYPE_ACCESS, item, 'acl_access', flags, fd=fd)
-        if stat.S_ISDIR(st.st_mode):
-            _get_acl(path, ACL_TYPE_DEFAULT, item, 'acl_default', flags, fd=fd)
+        _get_acl(path, ACL_TYPE_DEFAULT, item, 'acl_default', flags, fd=fd)
 
 
 cdef _set_acl(path, type, item, attribute, numeric_ids=False, fd=None):
     cdef acl_t acl = NULL
     text = item.get(attribute)
-    if text:
-        if numeric_ids:
-            if type == ACL_TYPE_NFS4:
-                text = _nfs4_use_stored_uid_gid(text)
-            elif type in (ACL_TYPE_ACCESS, ACL_TYPE_DEFAULT):
-                text = posix_acl_use_stored_uid_gid(text)
-        acl = acl_from_text(<bytes>text)
-        if acl == NULL:
-            raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(path))
+    if text is not None:
+        if numeric_ids and type == ACL_TYPE_NFS4:
+            text = _nfs4_use_stored_uid_gid(text)
+        elif numeric_ids and type in (ACL_TYPE_ACCESS, ACL_TYPE_DEFAULT):
+            text = posix_acl_use_stored_uid_gid(text)
         try:
-            if fd is not None:
-                if acl_set_fd_np(fd, acl, type) == -1:
-                    raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(path))
-            else:
-                if acl_set_link_np(path, type, acl) == -1:
-                    raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(path))
+            acl = acl_from_text(<bytes> text)
+            if acl is not NULL:
+                if fd is not None:
+                    acl_set_fd_np(fd, acl, type)
+                else:
+                    acl_set_link_np(path, type, acl)
         finally:
             acl_free(acl)
 
@@ -214,14 +201,6 @@ def acl_set(path, item, numeric_ids=False, fd=None):
     """
     if isinstance(path, str):
         path = os.fsencode(path)
-    ret = lpathconf(path, _PC_ACL_NFS4)
-    if ret < 0:
-        raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(path))
-    if ret == 1:
-        _set_acl(path, ACL_TYPE_NFS4, item, 'acl_nfs4', numeric_ids, fd=fd)
-    ret = lpathconf(path, _PC_ACL_EXTENDED)
-    if ret < 0:
-        raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(path))
-    if ret == 1:
-        _set_acl(path, ACL_TYPE_ACCESS, item, 'acl_access', numeric_ids, fd=fd)
-        _set_acl(path, ACL_TYPE_DEFAULT, item, 'acl_default', numeric_ids, fd=fd)
+    _set_acl(path, ACL_TYPE_NFS4, item, 'acl_nfs4', numeric_ids, fd=fd)
+    _set_acl(path, ACL_TYPE_ACCESS, item, 'acl_access', numeric_ids, fd=fd)
+    _set_acl(path, ACL_TYPE_DEFAULT, item, 'acl_default', numeric_ids, fd=fd)

src/borg/platform/linux.pyx

@@ -50,7 +50,7 @@ cdef extern from "sys/acl.h":
     char *acl_to_text(acl_t acl, ssize_t *len)
 
 cdef extern from "acl/libacl.h":
-    int acl_extended_file_nofollow(const char *path)
+    int acl_extended_file(const char *path)
     int acl_extended_fd(int fd)
 
 cdef extern from "linux/fs.h":
@@ -233,19 +233,15 @@ def acl_get(path, item, st, numeric_ids=False, fd=None):
     cdef acl_t access_acl = NULL
     cdef char *default_text = NULL
     cdef char *access_text = NULL
-    cdef int ret = 0
 
+    if stat.S_ISLNK(st.st_mode):
+        # symlinks can not have ACLs
+        return
     if isinstance(path, str):
         path = os.fsencode(path)
-    if fd is not None:
-        ret = acl_extended_fd(fd)
-    else:
-        ret = acl_extended_file_nofollow(path)
-    if ret < 0:
-        raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(path))
-    if ret == 0:
-        # there is no ACL defining permissions other than those defined by the traditional file permission bits.
-        # note: this should also be the case for symlink fs objects, as they can not have ACLs.
+    if (fd is not None and acl_extended_fd(fd) <= 0
+        or
+        fd is None and acl_extended_file(path) <= 0):
         return
     if numeric_ids:
         converter = acl_numeric_ids
@@ -256,28 +252,25 @@ def acl_get(path, item, st, numeric_ids=False, fd=None):
             access_acl = acl_get_fd(fd)
         else:
             access_acl = acl_get_file(path, ACL_TYPE_ACCESS)
-        if access_acl == NULL:
-            raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(path))
-        access_text = acl_to_text(access_acl, NULL)
-        if access_text == NULL:
-            raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(path))
-        item['acl_access'] = converter(access_text)
+        if access_acl is not NULL:
+            access_text = acl_to_text(access_acl, NULL)
+            if access_text is not NULL:
+                item['acl_access'] = converter(access_text)
     finally:
         acl_free(access_text)
         acl_free(access_acl)
-    if stat.S_ISDIR(st.st_mode):
-        # only directories can have a default ACL. there is no fd-based api to get it.
-        try:
+
+    try:
+        if stat.S_ISDIR(st.st_mode):
+            # only directories can have a default ACL. there is no fd-based api to get it.
             default_acl = acl_get_file(path, ACL_TYPE_DEFAULT)
-            if default_acl == NULL:
-                raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(path))
-            default_text = acl_to_text(default_acl, NULL)
-            if default_text == NULL:
-                raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(path))
-            item['acl_default'] = converter(default_text)
-        finally:
-            acl_free(default_text)
-            acl_free(default_acl)
+            if default_acl is not NULL:
+                default_text = acl_to_text(default_acl, NULL)
+                if default_text is not NULL:
+                    item['acl_default'] = converter(default_text)
+    finally:
+        acl_free(default_text)
+        acl_free(default_acl)
 
 
 def acl_set(path, item, numeric_ids=False, fd=None):
@@ -288,7 +281,7 @@ def acl_set(path, item, numeric_ids=False, fd=None):
         # Linux does not support setting ACLs on symlinks
         return
 
-    if isinstance(path, str):
+    if fd is None and isinstance(path, str):
         path = os.fsencode(path)
     if numeric_ids:
         converter = posix_acl_use_stored_uid_gid
@@ -297,26 +290,21 @@ def acl_set(path, item, numeric_ids=False, fd=None):
     access_text = item.get('acl_access')
     if access_text is not None:
         try:
-            access_acl = acl_from_text(<bytes>converter(access_text))
-            if access_acl == NULL:
-                raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(path))
-            if fd is not None:
-                if acl_set_fd(fd, access_acl) == -1:
-                    raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(path))
-            else:
-                if acl_set_file(path, ACL_TYPE_ACCESS, access_acl) == -1:
-                    raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(path))
+            access_acl = acl_from_text(<bytes> converter(access_text))
+            if access_acl is not NULL:
+                if fd is not None:
+                    acl_set_fd(fd, access_acl)
+                else:
+                    acl_set_file(path, ACL_TYPE_ACCESS, access_acl)
         finally:
             acl_free(access_acl)
     default_text = item.get('acl_default')
     if default_text is not None:
         try:
-            default_acl = acl_from_text(<bytes>converter(default_text))
-            if default_acl == NULL:
-                raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(path))
-            # only directories can get a default ACL. there is no fd-based api to set it.
-            if acl_set_file(path, ACL_TYPE_DEFAULT, default_acl) == -1:
-                raise OSError(errno.errno, os.strerror(errno.errno), os.fsdecode(path))
+            default_acl = acl_from_text(<bytes> converter(default_text))
+            if default_acl is not NULL:
+                # only directories can get a default ACL. there is no fd-based api to set it.
+                acl_set_file(path, ACL_TYPE_DEFAULT, default_acl)
         finally:
             acl_free(default_acl)
 

src/borg/testsuite/archive.py

@@ -61,8 +61,8 @@ def test_stats_format(stats):
 Number of files: 1
 Original size: 20 B
 Deduplicated size: 20 B
-Time spent in hashing: 0.000 seconds
-Time spent in chunking: 0.000 seconds
+Time spent in hashing: 0.00 seconds
+Time spent in chunking: 0.00 seconds
 Added files: 0
 Unchanged files: 0
 Modified files: 0

src/borg/testsuite/helpers.py

@@ -368,7 +368,7 @@ def test_text_invalid(text):
 def test_format_timedelta():
     t0 = datetime(2001, 1, 1, 10, 20, 3, 0)
     t1 = datetime(2001, 1, 1, 12, 20, 4, 100000)
-    assert format_timedelta(t1 - t0) == "2 hours 1.100 seconds"
+    assert format_timedelta(t1 - t0) == "2 hours 1.10 seconds"
 
 
 @pytest.mark.parametrize(

src/borg/testsuite/platform.py

@@ -1,4 +1,3 @@
-import errno
 import functools
 import os
 
@@ -32,38 +31,25 @@ def are_acls_working():
     with unopened_tempfile() as filepath:
         open(filepath, "w").close()
         try:
-            if is_darwin:
-                acl_key = "acl_extended"
-                acl_value = b"!#acl 1\nuser:FFFFEEEE-DDDD-CCCC-BBBB-AAAA00000000:root:0:allow:read\n"
+            if is_freebsd:
+                access = b"user::rw-\ngroup::r--\nmask::rw-\nother::---\nuser:root:rw-\n"
+                contained = b"user:root:rw-"
             elif is_linux:
-                acl_key = "acl_access"
-                acl_value = b"user::rw-\ngroup::r--\nmask::rw-\nother::---\nuser:root:rw-:9999\ngroup:root:rw-:9999\n"
-            elif is_freebsd:
-                acl_key = "acl_access"
-                acl_value = b"user::rw-\ngroup::r--\nmask::rw-\nother::---\nuser:root:rw-\ngroup:wheel:rw-\n"
+                access = b"user::rw-\ngroup::r--\nmask::rw-\nother::---\nuser:root:rw-:0\n"
+                contained = b"user:root:rw-:0"
+            elif is_darwin:
+                return True  # improve?
             else:
-                return False  # ACLs unsupported on this platform.
-            write_acl = {acl_key: acl_value}
-            acl_set(filepath, write_acl)
+                return False  # unsupported platform
+            acl = {"acl_access": access}
+            acl_set(filepath, acl)
             read_acl = {}
             acl_get(filepath, read_acl, os.stat(filepath))
-            acl = read_acl.get(acl_key, None)
-            if acl is not None:
-                if is_darwin:
-                    check_for = b"root:0:allow:read"
-                elif is_linux:
-                    check_for = b"user::rw-"
-                elif is_freebsd:
-                    check_for = b"user::rw-"
-                else:
-                    return False  # ACLs unsupported on this platform.
-                if check_for in acl:
-                    return True
+            read_acl_access = read_acl.get("acl_access", None)
+            if read_acl_access and contained in read_acl_access:
+                return True
         except PermissionError:
             pass
-        except OSError as e:
-            if e.errno not in (errno.ENOTSUP,):
-                raise
         return False
 
 

src/borg/testsuite/platform_darwin.py

@@ -20,7 +20,7 @@ def set_acl(path, acl, numeric_ids=False):
 
 
 @skipif_acls_not_working
-def test_extended_acl():
+def test_access_acl():
     file = tempfile.NamedTemporaryFile()
     assert get_acl(file.name) == {}
     set_acl(

src/borg/testsuite/platform_freebsd.py

@@ -49,7 +49,6 @@ def set_acl(path, access=None, default=None, nfs4=None, numeric_ids=False):
 @skipif_acls_not_working
 def test_access_acl():
     file1 = tempfile.NamedTemporaryFile()
-    assert get_acl(file1.name) == {}
     set_acl(
         file1.name,
         access=b"user::rw-\ngroup::r--\nmask::rw-\nother::---\nuser:root:rw-\ngroup:wheel:rw-\n",
@@ -87,7 +86,6 @@ def test_access_acl():
 @skipif_acls_not_working
 def test_default_acl():
     tmpdir = tempfile.mkdtemp()
-    assert get_acl(tmpdir) == {}
     set_acl(tmpdir, access=ACCESS_ACL, default=DEFAULT_ACL)
     assert get_acl(tmpdir)["acl_access"] == ACCESS_ACL
     assert get_acl(tmpdir)["acl_default"] == DEFAULT_ACL