Feedback from the HotFix today in main and related update to the reference policy definitions matching latest main build (#906)

MariusNi · web-flow · commit 32f48703afde · 2025-03-12T17:27:00.000-07:00
diff --git a/src/adapters/mc/asb/AzureLinuxBaseline_DeployIfNotExists.json b/src/adapters/mc/asb/AzureLinuxBaseline_DeployIfNotExists.json
@@ -1,9 +1,9 @@
 {
   "properties": {
-    "displayName": "Audit Azure security baseline for Linux (powered by OSConfig)",
+    "displayName": "Audit and configure Azure security baseline for Linux (powered by OSConfig)",
     "policyType": "Custom",
     "mode": "Indexed",
-    "description": "This demo policy audits (and can also optionally configure) the Azure security baseline for Linux",
+    "description": "This policy audits and configures the Azure security baseline on Linux machines (Azure VMs and Arc-enabled machines). For more information, see https://aka.ms/azsecbaselinelinuxdocs",
     "metadata": {
       "category": "Guest Configuration",
       "version": "1.0.0",
@@ -15,7 +15,7 @@
         "version": "1.0.0",
         "contentType": "Custom",
         "contentUri": "https://github.com/Azure/azure-osconfig/releases/download/test_policy_package/AzureLinuxBaseline.zip",
-        "contentHash": "2EE557B1F9843F2FDD4ACF29563B51A9D1D7EF7721C73D920AEF2C412A1E2499"
+        "contentHash": "4E6BF9AC06618C97EFE07B7A01A2DFAA009130D1FC9E9628F9A38C7765C881A6"
       }
     },
     "parameters": {
@@ -341,7 +341,7 @@
                         "version": "1.0.0",
                         "contentType": "Custom",
                         "contentUri": "https://github.com/Azure/azure-osconfig/releases/download/test_policy_package/AzureLinuxBaseline.zip",
-                        "contentHash": "2EE557B1F9843F2FDD4ACF29563B51A9D1D7EF7721C73D920AEF2C412A1E2499",
+                        "contentHash": "4E6BF9AC06618C97EFE07B7A01A2DFAA009130D1FC9E9628F9A38C7765C881A6",
                         "assignmentType": "ApplyAndAutoCorrect"
                       }
                     }
@@ -358,7 +358,7 @@
                         "version": "1.0.0",
                         "contentType": "Custom",
                         "contentUri": "https://github.com/Azure/azure-osconfig/releases/download/test_policy_package/AzureLinuxBaseline.zip",
-                        "contentHash": "2EE557B1F9843F2FDD4ACF29563B51A9D1D7EF7721C73D920AEF2C412A1E2499",
+                        "contentHash": "4E6BF9AC06618C97EFE07B7A01A2DFAA009130D1FC9E9628F9A38C7765C881A6",
                         "assignmentType": "ApplyAndAutoCorrect"
                       }
                     }
@@ -375,7 +375,7 @@
                         "version": "1.0.0",
                         "contentType": "Custom",
                         "contentUri": "https://github.com/Azure/azure-osconfig/releases/download/test_policy_package/AzureLinuxBaseline.zip",
-                        "contentHash": "2EE557B1F9843F2FDD4ACF29563B51A9D1D7EF7721C73D920AEF2C412A1E2499",
+                        "contentHash": "4E6BF9AC06618C97EFE07B7A01A2DFAA009130D1FC9E9628F9A38C7765C881A6",
                         "assignmentType": "ApplyAndAutoCorrect"
                       }
                     }
diff --git a/src/adapters/mc/ssh/LinuxSshServerSecurityBaseline_DeployIfNotExists.json b/src/adapters/mc/ssh/LinuxSshServerSecurityBaseline_DeployIfNotExists.json
@@ -15,7 +15,7 @@
         "version": "1.0.0",
         "contentType": "Custom",
         "contentUri": "https://github.com/Azure/azure-osconfig/releases/download/test_policy_package/LinuxSshServerSecurityBaseline.zip",
-        "contentHash": "88B900762F29AF01A059573D17036D4B970308413B987C6AE1B9F74CEC250D3B",
+        "contentHash": "5B5C2F46FE15B3549B390EFD6817AE889397F80E574C6C49E3E0FAC66474531F",
         "configurationParameter": {
           "accessPermissionsForSshdConfig": "Ensure that permissions on /etc/ssh/sshd_config are configured;DesiredObjectValue",
           "ignoreHosts": "Ensure that the SSH IgnoreRhosts is configured;DesiredObjectValue",
@@ -624,7 +624,7 @@
                         "version": "1.0.0",
                         "contentType": "Custom",
                         "contentUri": "https://github.com/Azure/azure-osconfig/releases/download/test_policy_package/LinuxSshServerSecurityBaseline.zip",
-                        "contentHash": "88B900762F29AF01A059573D17036D4B970308413B987C6AE1B9F74CEC250D3B",
+                        "contentHash": "5B5C2F46FE15B3549B390EFD6817AE889397F80E574C6C49E3E0FAC66474531F",
                         "assignmentType": "ApplyAndAutoCorrect",
                         "configurationParameter": [
                           {
@@ -715,7 +715,7 @@
                         "version": "1.0.0",
                         "contentType": "Custom",
                         "contentUri": "https://github.com/Azure/azure-osconfig/releases/download/test_policy_package/LinuxSshServerSecurityBaseline.zip",
-                        "contentHash": "88B900762F29AF01A059573D17036D4B970308413B987C6AE1B9F74CEC250D3B",
+                        "contentHash": "5B5C2F46FE15B3549B390EFD6817AE889397F80E574C6C49E3E0FAC66474531F",
                         "assignmentType": "ApplyAndAutoCorrect",
                         "configurationParameter": [
                           {
@@ -806,7 +806,7 @@
                         "version": "1.0.0",
                         "contentType": "Custom",
                         "contentUri": "https://github.com/Azure/azure-osconfig/releases/download/test_policy_package/LinuxSshServerSecurityBaseline.zip",
-                        "contentHash": "88B900762F29AF01A059573D17036D4B970308413B987C6AE1B9F74CEC250D3B",
+                        "contentHash": "5B5C2F46FE15B3549B390EFD6817AE889397F80E574C6C49E3E0FAC66474531F",
                         "assignmentType": "ApplyAndAutoCorrect",
                         "configurationParameter": [
                           {
diff --git a/src/common/logging/Logging.c b/src/common/logging/Logging.c
@@ -42,7 +42,7 @@ static bool g_consoleLoggingEnabled = true;
 
 bool IsConsoleLoggingEnabled(void)
 {
-    return g_consoleLoggingEnabled;
+    return IsDaemon() ? false : g_consoleLoggingEnabled;
 }
 
 void SetConsoleLoggingEnabled(bool enabledOrDisabled)
diff --git a/src/common/logging/Logging.h b/src/common/logging/Logging.h
@@ -71,7 +71,7 @@ bool IsDaemon(void);
             OSCONFIG_LOG_TO_FILE(log, level, FORMAT, ##__VA_ARGS__);\
             fflush(GetLogFile(log));\
         }\
-        if ((false == IsDaemon()) && (true == IsConsoleLoggingEnabled())) {\
+        if (IsConsoleLoggingEnabled()) {\
             OSCONFIG_LOG(log, level, FORMAT, ##__VA_ARGS__);\
         }\
     }\

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"properties": {`
`3`		`- "displayName": "Audit Azure security baseline for Linux (powered by OSConfig)",`
	`3`	`+ "displayName": "Audit and configure Azure security baseline for Linux (powered by OSConfig)",`
`4`	`4`	`"policyType": "Custom",`
`5`	`5`	`"mode": "Indexed",`
`6`		`- "description": "This demo policy audits (and can also optionally configure) the Azure security baseline for Linux",`
	`6`	`+ "description": "This policy audits and configures the Azure security baseline on Linux machines (Azure VMs and Arc-enabled machines). For more information, see https://aka.ms/azsecbaselinelinuxdocs",`
`7`	`7`	`"metadata": {`
`8`	`8`	`"category": "Guest Configuration",`
`9`	`9`	`"version": "1.0.0",`
`@@ -15,7 +15,7 @@`
`15`	`15`	`"version": "1.0.0",`
`16`	`16`	`"contentType": "Custom",`
`17`	`17`	`"contentUri": "https://github.com/Azure/azure-osconfig/releases/download/test_policy_package/AzureLinuxBaseline.zip",`
`18`		`- "contentHash": "2EE557B1F9843F2FDD4ACF29563B51A9D1D7EF7721C73D920AEF2C412A1E2499"`
	`18`	`+ "contentHash": "4E6BF9AC06618C97EFE07B7A01A2DFAA009130D1FC9E9628F9A38C7765C881A6"`
`19`	`19`	`}`
`20`	`20`	`},`
`21`	`21`	`"parameters": {`
`@@ -341,7 +341,7 @@`
`341`	`341`	`"version": "1.0.0",`
`342`	`342`	`"contentType": "Custom",`
`343`	`343`	`"contentUri": "https://github.com/Azure/azure-osconfig/releases/download/test_policy_package/AzureLinuxBaseline.zip",`
`344`		`- "contentHash": "2EE557B1F9843F2FDD4ACF29563B51A9D1D7EF7721C73D920AEF2C412A1E2499",`
	`344`	`+ "contentHash": "4E6BF9AC06618C97EFE07B7A01A2DFAA009130D1FC9E9628F9A38C7765C881A6",`
`345`	`345`	`"assignmentType": "ApplyAndAutoCorrect"`
`346`	`346`	`}`
`347`	`347`	`}`
`@@ -358,7 +358,7 @@`
`358`	`358`	`"version": "1.0.0",`
`359`	`359`	`"contentType": "Custom",`
`360`	`360`	`"contentUri": "https://github.com/Azure/azure-osconfig/releases/download/test_policy_package/AzureLinuxBaseline.zip",`
`361`		`- "contentHash": "2EE557B1F9843F2FDD4ACF29563B51A9D1D7EF7721C73D920AEF2C412A1E2499",`
	`361`	`+ "contentHash": "4E6BF9AC06618C97EFE07B7A01A2DFAA009130D1FC9E9628F9A38C7765C881A6",`
`362`	`362`	`"assignmentType": "ApplyAndAutoCorrect"`
`363`	`363`	`}`
`364`	`364`	`}`
`@@ -375,7 +375,7 @@`
`375`	`375`	`"version": "1.0.0",`
`376`	`376`	`"contentType": "Custom",`
`377`	`377`	`"contentUri": "https://github.com/Azure/azure-osconfig/releases/download/test_policy_package/AzureLinuxBaseline.zip",`
`378`		`- "contentHash": "2EE557B1F9843F2FDD4ACF29563B51A9D1D7EF7721C73D920AEF2C412A1E2499",`
	`378`	`+ "contentHash": "4E6BF9AC06618C97EFE07B7A01A2DFAA009130D1FC9E9628F9A38C7765C881A6",`
`379`	`379`	`"assignmentType": "ApplyAndAutoCorrect"`
`380`	`380`	`}`
`381`	`381`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ static bool g_consoleLoggingEnabled = true;`
`42`	`42`
`43`	`43`	`bool IsConsoleLoggingEnabled(void)`
`44`	`44`	`{`
`45`		`- return g_consoleLoggingEnabled;`
	`45`	`+ return IsDaemon() ? false : g_consoleLoggingEnabled;`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`void SetConsoleLoggingEnabled(bool enabledOrDisabled)`