Assign the build directory to the effective user, if present

tweag · Feb 7, 2024 · 7a49064 · 7a49064
1 parent 5ef3f14
commit 7a49064
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
@@ -3017,7 +3017,17 @@ void LocalDerivationGoal::deleteTmpDir(bool force)
            might have privileged stuff (like a copy of netrc). */
         if (settings.keepFailed && !force && !drv->isBuiltin()) {
             printError("note: keeping build directory '%s'", tmpDir);
-            chmod(tmpDir.c_str(), 0755);
+            bool chowned = false;
+            struct stat info;
+            stat(tmpDir.c_str(), &info);
+            if (experimentalFeatureSettings.isEnabled(Xp::ACLs))
+                if (auto store = dynamic_cast<LocalGranularAccessStore*>(&worker.store))
+                    if (store->effectiveUser) {
+                        chown(tmpDir.c_str(), store->effectiveUser->uid, info.st_gid);
+                        chowned = true;
+                    }
+            if (!chowned)
+                chmod(tmpDir.c_str(), 0755);
         }
         else
             deletePath(tmpDir);