Continued stabilization for ASB v2 audit and remediation and the CI t…

…est automation (#717)
Azure · Jun 12, 2024 · bf8da10 · bf8da10
1 parent d16fcc6
commit bf8da10
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/universalnrp-test-run.yml b/.github/workflows/universalnrp-test-run.yml
@@ -121,6 +121,12 @@ jobs:
 
           sudo LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/omi/lib/ pwsh -Command $script
           ls -l
+          if command -v lsb_release &>/dev/null; then
+              [[ $(lsb_release -is) == "Ubuntu" ]] && sudo chmod 644 *testResults.xml
+          else
+              echo "lsb_release not found"
+          fi
+          stat *testResults.xml
 
       - name: Stage OSConfig Logs
         if: success() || failure()

diff --git a/.github/workflows/universalnrp-test.yml b/.github/workflows/universalnrp-test.yml
@@ -46,6 +46,7 @@ jobs:
       install-osconfig: ${{ matrix.install-osconfig }}
       tag: ${{ matrix.target.tag }}
 
+  # See for more details: https://github.com/marketplace/actions/publish-test-results
   report:
     name: Report
     needs: test

diff --git a/src/common/asb/Asb.c b/src/common/asb/Asb.c
@@ -666,7 +666,7 @@ void AsbInitialize(void* log)
 
     if (false == FileExists(g_etcFstabCopy))
     {
-        if (false == MakeFileBackupCopy(g_etcFstab, g_etcFstabCopy, true, log))
+        if (false == MakeFileBackupCopy(g_etcFstab, g_etcFstabCopy, false, log))
         {
             OsConfigLogError(log, "AsbInitialize: failed to make a local backup copy of '%s'", g_etcFstab);
         }

diff --git a/src/common/commonutils/FileUtils.c b/src/common/commonutils/FileUtils.c
@@ -736,7 +736,7 @@ int RenameFileWithOwnerAndAccess(const char* original, const char* target, void*
 
     if (0 != GetFileAccess(target, &ownerId, &groupId, &mode, log))
     {
-        OsConfigLogError(log, "RenameFileWithOwnerAndAccess: cannot read owner and access mode for original target file '%s', using defaults", target);
+        OsConfigLogInfo(log, "RenameFileWithOwnerAndAccess: cannot read owner and access mode for original target file '%s', using defaults", target);
 
         ownerId = 0;
         groupId = 0;

diff --git a/src/common/commonutils/SshUtils.c b/src/common/commonutils/SshUtils.c
@@ -1075,7 +1075,7 @@ static int SaveRemediationToSshdConfig(void* log)
                 memset(newConfiguration, 0, newConfigurationSize);
                 snprintf(newConfiguration, newConfigurationSize, configurationTemplate, remediation, originalConfiguration);
 
-                if (true == SavePayloadToFile(g_sshServerConfiguration, newConfiguration, newConfigurationSize, log))
+                if (true == SecureSaveToFile(g_sshServerConfiguration, newConfiguration, newConfigurationSize, log))
                 {
                     OsConfigLogInfo(log, "SaveRemediationToSshdConfig: '%s' is now updated to include the following remediation values:\n---\n%s---", g_sshServerConfiguration, remediation);
                     status = 0;