From ef1741b5089d8273758dbe3df2691a06242d3163 Mon Sep 17 00:00:00 2001 From: Brian Wilhite Date: Tue, 3 Nov 2020 10:24:19 -0500 Subject: [PATCH 1/2] add disa warn msg to composites with new 2.1 stig --- source/DSCResources/IisServer/IisServer.schema.psm1 | 3 +++ source/DSCResources/IisSite/IisSite.schema.psm1 | 3 +++ source/DSCResources/Office/Office.schema.psm1 | 3 +++ source/DSCResources/Resources/disaWarning.Message.ps1 | 8 ++++++++ source/DSCResources/SqlServer/SqlServer.schema.psm1 | 3 +++ .../WindowsDnsServer/WindowsDnsServer.schema.psm1 | 2 ++ 6 files changed, 22 insertions(+) create mode 100644 source/DSCResources/Resources/disaWarning.Message.ps1 diff --git a/source/DSCResources/IisServer/IisServer.schema.psm1 b/source/DSCResources/IisServer/IisServer.schema.psm1 index fec639bf6..b93ac7dda 100644 --- a/source/DSCResources/IisServer/IisServer.schema.psm1 +++ b/source/DSCResources/IisServer/IisServer.schema.psm1 @@ -92,5 +92,8 @@ configuration IisServer . "$resourcePath\windows.xIisMimeTypeMapping.ps1" . "$resourcePath\windows.xWebConfigProperty.ps1" . "$resourcePath\windows.xIisLogging.ps1" + + # DISA STIG Warning Message when v2.1 or greater verison of STIG is specified + . "$resourcePath\disaWarning.Message.ps1" } #endregion Composite diff --git a/source/DSCResources/IisSite/IisSite.schema.psm1 b/source/DSCResources/IisSite/IisSite.schema.psm1 index 36b698f7d..1ce0ad721 100644 --- a/source/DSCResources/IisSite/IisSite.schema.psm1 +++ b/source/DSCResources/IisSite/IisSite.schema.psm1 @@ -97,6 +97,9 @@ configuration IisSite . "$resourcePath\windows.xIisMimeTypeMapping.ps1" . "$resourcePath\windows.xWebConfigProperty.ps1" . "$resourcePath\windows.xSslSettings.ps1" + + # DISA STIG Warning Message when v2.1 or greater verison of STIG is specified + . "$resourcePath\disaWarning.Message.ps1" } #endregion Composite diff --git a/source/DSCResources/Office/Office.schema.psm1 b/source/DSCResources/Office/Office.schema.psm1 index cf13b817b..3902e0da0 100644 --- a/source/DSCResources/Office/Office.schema.psm1 +++ b/source/DSCResources/Office/Office.schema.psm1 @@ -78,4 +78,7 @@ configuration Office . "$resourcePath\windows.Registry.ps1" . "$resourcePath\windows.Script.skip.ps1" . "$resourcePath\windows.RefreshRegistryPolicy.ps1" + + # DISA STIG Warning Message when v2.1 or greater verison of STIG is specified + . "$resourcePath\disaWarning.Message.ps1" } diff --git a/source/DSCResources/Resources/disaWarning.Message.ps1 b/source/DSCResources/Resources/disaWarning.Message.ps1 new file mode 100644 index 000000000..4cf8b5a65 --- /dev/null +++ b/source/DSCResources/Resources/disaWarning.Message.ps1 @@ -0,0 +1,8 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. + +if ($stig.Version -ge [version]2.1) +{ + Write-Warning -Message "With DISA's Quarterly Release (October 2020), rule Ids have changed." + Write-Warning -Message "For more information, please visit https://aka.ms/PowerStigDisaChanges" +} diff --git a/source/DSCResources/SqlServer/SqlServer.schema.psm1 b/source/DSCResources/SqlServer/SqlServer.schema.psm1 index 8a255cea6..e09c10f8c 100644 --- a/source/DSCResources/SqlServer/SqlServer.schema.psm1 +++ b/source/DSCResources/SqlServer/SqlServer.schema.psm1 @@ -109,4 +109,7 @@ configuration SqlServer Import-DscResource -ModuleName PSDSCresources -ModuleVersion 2.12.0.0 . "$resourcePath\windows.Registry.ps1" . "$resourcePath\windows.Script.skip.ps1" + + # DISA STIG Warning Message when v2.1 or greater verison of STIG is specified + . "$resourcePath\disaWarning.Message.ps1" } diff --git a/source/DSCResources/WindowsDnsServer/WindowsDnsServer.schema.psm1 b/source/DSCResources/WindowsDnsServer/WindowsDnsServer.schema.psm1 index 851b6768f..1f46596d9 100644 --- a/source/DSCResources/WindowsDnsServer/WindowsDnsServer.schema.psm1 +++ b/source/DSCResources/WindowsDnsServer/WindowsDnsServer.schema.psm1 @@ -106,4 +106,6 @@ configuration WindowsDnsServer Import-DscResource -ModuleName ComputerManagementDsc -ModuleVersion 8.4.0 . "$resourcePath\windows.WindowsEventLog.ps1" + # DISA STIG Warning Message when v2.1 or greater verison of STIG is specified + . "$resourcePath\disaWarning.Message.ps1" } From cdb93f2c409d7fe04b506f3dc924ec58c9884325 Mon Sep 17 00:00:00 2001 From: Brian Wilhite Date: Tue, 3 Nov 2020 10:25:35 -0500 Subject: [PATCH 2/2] updated changelog.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b57ec9239..846fb96cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## [Unreleased] +* Update PowerSTIG to send a warning to the user when using a composite that leverages the new DISA Ids: [#772](https://github.com/microsoft/PowerStig/issues/772) * Update PowerSTIG to successfully parse/apply Microsoft Office System 2013 STIG - Ver 2, Rel 1: [#769](https://github.com/microsoft/PowerStig/issues/769) * Update PowerSTIG to successfully parse/apply Microsoft Windows 2012 Server DNS STIG - Ver 2, Rel 1: [#760](https://github.com/microsoft/PowerStig/issues/760) * Update PowerSTIG to successfully parse/apply Microsoft SQL Server 2016 Instance Version 2; Release 1: [#761](https://github.com/microsoft/PowerStig/issues/761)