Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update PowerSTIG to send a warning to the user when using a composite that leverages the new DISA Ids #773

Merged
merged 2 commits into from
Nov 4, 2020
Merged

Update PowerSTIG to send a warning to the user when using a composite that leverages the new DISA Ids #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef1741b
add disa warn msg to composites with new 2.1 stig
bcwilhite Nov 3, 2020
cdb93f2
updated changelog.md
bcwilhite Nov 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions source/DSCResources/IisServer/IisServer.schema.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions source/DSCResources/IisSite/IisSite.schema.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions source/DSCResources/Office/Office.schema.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
8 changes: 8 additions & 0 deletions source/DSCResources/Resources/disaWarning.Message.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
3 changes: 3 additions & 0 deletions source/DSCResources/SqlServer/SqlServer.schema.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 2 additions & 0 deletions source/DSCResources/WindowsDnsServer/WindowsDnsServer.schema.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}