Added argument to NOOP OverrideImmutable functions

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

Author: larsewi

libpromises/override_fsattrs.c

@@ -7,8 +7,23 @@
 #include <cf3.defs.h>
 #include <string_lib.h>
 
-bool OverrideImmutableBegin(const char *orig, char *copy, size_t copy_len)
+bool OverrideImmutableBegin(
+    const char *orig, char *copy, size_t copy_len, bool override)
 {
+    if (!override)
+    {
+        size_t ret = strlcpy(copy, orig, copy_len);
+        if (ret >= copy_len)
+        {
+            Log(LOG_LEVEL_ERR,
+                "Failed to copy filename '%s': Filename too long (%zu >= %zu)",
+                ret,
+                copy_len);
+            return false;
+        }
+        return true;
+    }
+
     srand(time(NULL)); /* Seed random number generator */
     int rand_number = rand() % 999999;
     assert(rand_number >= 0);
@@ -38,8 +53,13 @@ bool OverrideImmutableBegin(const char *orig, char *copy, size_t copy_len)
     return true;
 }
 
-bool OverrideImmutableCommit(const char *orig, const char *copy)
+bool OverrideImmutableCommit(const char *orig, const char *copy, bool override)
 {
+    if (!override)
+    {
+        return true;
+    }
+
     struct stat sb;
     if (lstat(orig, &sb) == -1)
     {
@@ -133,8 +153,13 @@ bool OverrideImmutableCommit(const char *orig, const char *copy)
     return true;
 }
 
-bool OverrideImmutableAbort(ARG_UNUSED const char *orig, const char *copy)
+bool OverrideImmutableAbort(
+    ARG_UNUSED const char *orig, const char *copy, bool override)
 {
     assert(copy != NULL);
+    if (!override)
+    {
+        return true;
+    }
     return unlink(copy) == 0;
 }

libpromises/override_fsattrs.h

@@ -33,26 +33,32 @@
  * @param orig The original file (may be immutable)
  * @param copy Updated to contain the filename of the mutable copy
  * @param copy_len The size of the buffer to store the filename of the copy
+ * @param override Whether to actually do override (original filename is
+ * copied to copy buffer if false)
  * @return false in case of failure
  */
-bool OverrideImmutableBegin(const char *orig, char *copy, size_t copy_len);
+bool OverrideImmutableBegin(
+    const char *orig, char *copy, size_t copy_len, bool override);
 
 /**
  * @brief Temporarily clears the immutable bit of the original file and
  * replaces it with the mutated copy
  * @param orig The original file (may be immutable)
  * @param copy The mutated copy to replace the original
+ * @param override Whether to actually do override
  * @return false in case of failure
  * @note The immutable bit is reset to it's original state
  */
-bool OverrideImmutableCommit(const char *orig, const char *copy);
+bool OverrideImmutableCommit(
+    const char *orig, const char *copy, bool override);
 
 /**
  * @brief Simply unlinks the mutable copy
  * @param orig Not used (reserved in for future use)
  * @param copy The mutated copy to unlink
+ * @param override NOOP if override is false
  * @return false in case of failure (but you probably don't care)
  */
-bool OverrideImmutableAbort(const char *orig, const char *copy);
+bool OverrideImmutableAbort(const char *orig, const char *copy, bool override);
 
 #endif /* CFENGINE_OVERRIDE_FSATTRS_H */