[frameworks/kio/Frameworks/6.24] /: kioworkers/file: Restore ACL writes in FileProtocol::chmod()

Git commit f8c0fbbc85bbf471b76793d38922a2f213776682 by Marco Martin.
Committed on 27/07/2026 at 09:43.
Pushed by mart into branch 'Frameworks/6.24'.

kioworkers/file: Restore ACL writes in FileProtocol::chmod()


Amends c84f9435


(cherry picked from commit 8715dbd23a4ccd3f5cef4ef0247958a7777aa152)

95914485 ChmodJob: remove dead ACL metadata code
fe551b79 kioworkers/file: Restore ACL writes in FileProtocol::chmod()
c283d05f minor fix in chmod()
65bf9ab8 Add ACL write test
316f750f Edit jobtest.h
1516b80f Revert deleted code

Co-authored-by: David Wild <[email protected]>

M  +45   -0    autotests/jobtest.cpp
M  +1    -0    autotests/jobtest.h
M  +5    -3    src/kioworkers/file/file.cpp

https://invent.kde.org/frameworks/kio/-/commit/f8c0fbbc85bbf471b76793d38922a2f213776682

diff --git a/autotests/jobtest.cpp b/autotests/jobtest.cpp
index 83f091034e..7c578f845e 100644
--- a/autotests/jobtest.cpp
+++ b/autotests/jobtest.cpp
@@ -2151,6 +2151,51 @@ void JobTest::chmodFile()
     QFile::remove(filePath);
 }
 
+void JobTest::chmodFileSetAcl()
+{
+#if !HAVE_POSIX_ACL
+    QSKIP("POSIX ACL support not compiled in");
+#elif defined(Q_OS_FREEBSD)
+    QSKIP("The test is not adapted for FreeBSD yet");
+#else
+    const QString filePath = homeTmpDir() + "fileForChmodAcl";
+    createTestFile(filePath);
+    KFileItem item(QUrl::fromLocalFile(filePath));
+    KFileItemList items;
+    items << item;
+    KIO::Job *job = KIO::chmod(items, item.permissions(), S_IWGRP, QString(), QString(), false, KIO::HideProgressInfo);
+    job->setUiDelegate(nullptr);
+
+    // A named-user entry makes this an *extended* ACL
+    QByteArray want = "user::rw-\nuser:root:rwx\ngroup::rw-\nmask::rwx\nother::r--\n";
+    job->addMetaData(QStringLiteral("ACL_STRING"), want);
+
+    QVERIFY2(job->exec(), qPrintable(job->errorString()));
+
+    auto aclText = [](const QByteArray &path) {
+        acl_t acl = acl_get_file(path.constData(), ACL_TYPE_ACCESS);
+        char *text = acl ? acl_to_text(acl, nullptr) : nullptr;
+        const QByteArray result = text ? QByteArray(text) : QByteArray();
+        if (text) {
+            acl_free(text);
+        }
+        if (acl) {
+            acl_free(acl);
+        }
+        return result;
+    };
+
+    const QByteArray srcEnc = QFile::encodeName(filePath);
+
+    const QByteArray srcAcl = aclText(srcEnc);
+    QVERIFY(!srcAcl.isEmpty());
+
+    QCOMPARE(aclText(srcEnc), want);
+
+    QFile::remove(filePath);
+#endif
+}
+
 #ifdef Q_OS_UNIX
 void JobTest::chmodSticky()
 {
diff --git a/autotests/jobtest.h b/autotests/jobtest.h
index 19944cc4c7..88e9c3067f 100644
--- a/autotests/jobtest.h
+++ b/autotests/jobtest.h
@@ -98,6 +98,7 @@ private Q_SLOTS:
     void mostLocalUrl();
     void mostLocalUrlHttp();
     void chmodFile();
+    void chmodFileSetAcl();    
 #ifdef Q_OS_UNIX
     void chmodSticky();
 #endif
diff --git a/src/kioworkers/file/file.cpp b/src/kioworkers/file/file.cpp
index 37e3f77a6e..bf6527e5c6 100644
--- a/src/kioworkers/file/file.cpp
+++ b/src/kioworkers/file/file.cpp
@@ -146,11 +146,13 @@ WorkerResult FileProtocol::chmod(const QUrl &url, int permissions)
     /* FIXME: Should be atomic */
 #ifdef Q_OS_UNIX
     // QFile::Permissions does not support special attributes like sticky
-    if (::chmod(_path.constData(), permissions) == -1)
+    if (::chmod(_path.constData(), permissions) == -1 ||
 #else
-    if (!QFile::setPermissions(path, modeToQFilePermissions(permissions)))
+    if (!QFile::setPermissions(path, modeToQFilePermissions(permissions)) ||
 #endif
-    {
+        (setACL(_path.data(), permissions, false) == -1) ||
+        /* if not a directory, cannot set default ACLs */
+        (setACL(_path.data(), permissions, true) == -1 && errno != ENOTDIR)) {
         return WorkerResult::fail(KIO::ERR_CANNOT_CHMOD, path);
     }