Touch attribute can now override immutable bit

The touch attribute of the files promise can now override the
immutable bit.

Ticket: ENT-10961, CFE-1840
Changelog: Commit
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>

Author: larsewi

cf-agent/verify_files_utils.c

@@ -2484,15 +2484,16 @@ static PromiseResult TouchFile(EvalContext *ctx, char *path, const Attributes *a
     PromiseResult result = PROMISE_RESULT_NOOP;
     if (MakingChanges(ctx, pp, attr, &result, "update time stamps for '%s'", path))
     {
-        if (utime(ToChangesPath(path), NULL) != -1)
+        bool override_immutable = EvalContextOverrideImmutableGet(ctx);
+        if (OverrideImmutableUtime(ToChangesPath(path), override_immutable, NULL))
         {
             RecordChange(ctx, pp, attr, "Touched (updated time stamps) for path '%s'", path);
             result = PromiseResultUpdate(result, PROMISE_RESULT_CHANGE);
         }
         else
         {
-            RecordFailure(ctx, pp, attr, "Touch '%s' failed to update timestamps. (utime: %s)",
-                          path, GetErrorStr());
+            RecordFailure(ctx, pp, attr, "Touch '%s' failed to update timestamps",
+                          path);
             result = PromiseResultUpdate(result, PROMISE_RESULT_FAIL);
         }
     }

libpromises/override_fsattrs.c

@@ -202,3 +202,26 @@ bool OverrideImmutableDelete(const char *filename, bool override)
 
     return unlink(filename) == 0;
 }
+
+bool OverrideImmutableUtime(
+    const char *filename, bool override, const struct utimbuf *times)
+{
+    assert(filename != NULL);
+
+    FSAttrsResult res;
+    bool is_immutable;
+
+    TemporarilyClearImmutableBit(filename, override, &res, &is_immutable);
+
+    int ret = utime(filename, times);
+    if (ret == -1)
+    {
+        Log(LOG_LEVEL_ERR,
+            "Failed to update access and modification times of file '%s'",
+            filename);
+    }
+
+    ResetTemporarilyClearedImmutableBit(filename, override, res, is_immutable);
+
+    return ret == 0;
+}

libpromises/override_fsattrs.h

@@ -27,6 +27,7 @@
 
 #include <stdbool.h>
 #include <stddef.h>
+#include <utime.h>
 
 /**
  * @brief Creates a mutable copy of the original file
@@ -72,4 +73,15 @@ bool OverrideImmutableRename(
  */
 bool OverrideImmutableDelete(const char *filename, bool override);
 
+/**
+ * @brief Temporarily clears the immutable bit and changes access and
+ * modification times of the inode
+ * @param filename Name of the file to touch
+ * @param override Whether to actually do override
+ * @param times Modification times (can be NULL)
+ * @return false in case of failure
+ */
+bool OverrideImmutableUtime(
+    const char *filename, bool override, const struct utimbuf *times);
+
 #endif /* CFENGINE_OVERRIDE_FSATTRS_H */