WIP: revert old logic

Author: robertwoj-microsoft

.vscode/settings.json

@@ -12,6 +12,71 @@
     // Use JSON with comments
     "files.associations": {
         "*.json": "jsonc",
-        "string": "cpp"
+        "string": "cpp",
+        "any": "cpp",
+        "array": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "*.tcc": "cpp",
+        "bitset": "cpp",
+        "cctype": "cpp",
+        "chrono": "cpp",
+        "cinttypes": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "compare": "cpp",
+        "concepts": "cpp",
+        "condition_variable": "cpp",
+        "csetjmp": "cpp",
+        "csignal": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "deque": "cpp",
+        "list": "cpp",
+        "map": "cpp",
+        "set": "cpp",
+        "unordered_map": "cpp",
+        "vector": "cpp",
+        "exception": "cpp",
+        "algorithm": "cpp",
+        "functional": "cpp",
+        "iterator": "cpp",
+        "memory": "cpp",
+        "memory_resource": "cpp",
+        "numeric": "cpp",
+        "optional": "cpp",
+        "random": "cpp",
+        "ratio": "cpp",
+        "regex": "cpp",
+        "string_view": "cpp",
+        "system_error": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "fstream": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "mutex": "cpp",
+        "new": "cpp",
+        "ostream": "cpp",
+        "ranges": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "stop_token": "cpp",
+        "streambuf": "cpp",
+        "thread": "cpp",
+        "typeinfo": "cpp",
+        "variant": "cpp"
     }
 }

src/modules/compliance/src/lib/ComplianceInterface.cpp

@@ -158,9 +158,9 @@ int ComplianceMmiSet(MMI_HANDLE clientSession, const char* componentName, const
         {
             char* tmp = json_serialize_to_string(object.get());
             realPayload = tmp;
-            // json_free_serialized_string(tmp);
+            json_free_serialized_string(tmp);
         }
-        auto result = engine.mmiSet(objectName, realPayload);
+        auto result = engine.mmiSet(objectName, std::move(realPayload));
         if (!result.has_value())
         {
             OsConfigLogError(engine.log(), "ComplianceMmiSet failed: %s", result.error().message.c_str());

src/modules/compliance/src/lib/procedures/ensureFilePermissions.cpp

@@ -77,35 +77,36 @@ AUDIT_FN(ensureFilePermissions)
         }
     }
 
-    const mode_t supportedMask = 0x1FF;
+    mode_t perms = 0x0;
+    mode_t mask = 0x1FF;
+    bool has_perms_or_mask = false;
     if (args.find("permissions") != args.end())
     {
         char* endptr;
-        mode_t perms = strtol(args["permissions"].c_str(), &endptr, 8);
+        perms = strtol(args["permissions"].c_str(), &endptr, 8);
         if (('\0' != *endptr) || ((perms & supportedMask) != perms))
         {
             return Error("Invalid permissions parameter");
         }
-        if (perms != (statbuf.st_mode & supportedMask))
-        {
-            logstream << "Invalid permissions - are " << std::oct << (statbuf.st_mode & supportedMask) << " should be " << std::oct << perms << std::dec;
-            return false;
-        }
+        has_perms_or_mask = true;
     }
+
     if (args.find("mask") != args.end())
     {
         char* endptr;
-        mode_t mask = strtol(args["mask"].c_str(), &endptr, 8);
+        mask = strtol(args["mask"].c_str(), &endptr, 8);
         if (('\0' != *endptr) || ((mask & supportedMask) != mask))
         {
             return Error("Invalid mask parameter");
         }
-        if (((statbuf.st_mode & supportedMask) & mask) != 0)
-        {
-            logstream << "Invalid permissions - are " << std::oct << (statbuf.st_mode & supportedMask) << " should be " << std::oct
-                      << ((statbuf.st_mode & supportedMask) & (~mask)) << " with mask " << std::oct << mask << std::dec;
-            return false;
-        }
+        mask &= supportedMask;
+        has_perms_or_mask = true;
+    }
+    if (has_perms_or_mask && ((perms & mask) != (statbuf.st_mode & mask)))
+    {
+        logstream << "Invalid permissions - are " << std::oct << (statbuf.st_mode & supportedMask) << " should be " << std::oct << perms
+                  << " with mask " << std::oct << mask << std::dec;
+        return false;
     }
 
     return true;
@@ -189,43 +190,42 @@ REMEDIATE_FN(ensureFilePermissions)
         }
     }
 
+    mode_t perms = 0x1FF;
+    mode_t mask = 0x1FF;
+    bool has_perms_or_mask = false;
     if (args.find("permissions") != args.end())
     {
         char* endptr;
-        const mode_t perms = strtol(args["permissions"].c_str(), &endptr, 8);
+        perms = strtol(args["permissions"].c_str(), &endptr, 8);
         if (('\0' != *endptr) || ((perms & supportedMask) != perms))
         {
             logstream << "ERROR: Invalid permissions: " << args["permissions"];
             return Error("Invalid permissions: " + args["permissions"]);
         }
-        if (perms != (statbuf.st_mode & supportedMask))
-        {
-            if (chmod(args["filename"].c_str(), perms) < 0)
-            {
-                logstream << "ERROR: Chmod error " << strerror(errno);
-                return false;
-            }
-        }
+        has_perms_or_mask = true;
     }
     if (args.find("mask") != args.end())
     {
         char* endptr;
-        const mode_t mask = strtol(args["mask"].c_str(), &endptr, 8);
+        mask = strtol(args["mask"].c_str(), &endptr, 8);
         if (('\0' != *endptr) || ((mask & supportedMask) != mask))
         {
             logstream << "ERROR: Invalid permissions mask: " << args["mask"];
             return Error("Invalid permissions mask: " + args["mask"]);
         }
-        if (((statbuf.st_mode & supportedMask) & mask) != 0)
+        has_perms_or_mask = true;
+    }
+
+    unsigned short new_perms = (statbuf.st_mode & ~mask) | (perms & mask);
+    OsConfigLogInfo(NULL, "Setting permissions to %o, current: %o, perms: %o, mask: %o", new_perms, statbuf.st_mode, perms, mask);
+    if (has_perms_or_mask && (new_perms != statbuf.st_mode))
+    {
+        if (chmod(args["filename"].c_str(), new_perms) < 0)
         {
-            if (chmod(args["filename"].c_str(), statbuf.st_mode & (~mask)) < 0)
-            {
-                logstream << "ERROR: Chmod error " << strerror(errno);
-                return false;
-            }
+            logstream << "ERROR: Chmod error";
+            return Error("Chmod error");
         }
     }
-
     return true;
 }
 } // namespace compliance

src/modules/test/recipes/compliance/EnsureFilePermissions.json

@@ -83,7 +83,7 @@
     "ObjectType": "Reported",
     "ComponentName": "Compliance",
     "ObjectName": "auditTest",
-    "Payload": "{ ensureFilePermissions: ensureFilePermissions for '\/tmp/testfile' Invalid permissions - are 777 should be 644 } == FALSE"
+    "Payload": "{ ensureFilePermissions: ensureFilePermissions for '\/tmp/testfile' Invalid permissions - are 777 should be 644 with mask 777 } == FALSE"
   },
   {
     "ObjectType": "Desired",