Skip to content

Commit

Permalink
Merge pull request #1301 from microsoft/erjenkin#1276
Browse files Browse the repository at this point in the history
Update PowerSTIG to Parse/Apply U_MS_Windows_Server_2019_V2R8_STIG
  • Loading branch information
erjenkin authored Dec 22, 2023
2 parents ba153c5 + f68ca77 commit a4b5edc
Show file tree
Hide file tree
Showing 10 changed files with 752 additions and 528 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## [Unreleased]

* Update PowerSTIG to Parse/Apply U_MS_Windows_Server_2019_V2R8_STIG [#1276](https://github.com/microsoft/PowerStig/issues/1276)
* Update PowerSTIG to Parse/Apply U_MS_Windows_Server_2022_V1R4_STIG: [#1277](https://github.com/microsoft/PowerStig/issues/1277)
* Update PowerSTIG to Parse/Apply U_MS_Windows_Server_2016_V2R7_STIG [#1275](https://github.com/microsoft/PowerStig/issues/1275)
* Update PowerSTIG to Parse/Apply U_RHEL_7_V3R13_STIG: [#1283](https://github.com/microsoft/PowerStig/issues/1283)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ V-205717::0x00000002 (2) (Prompt for consent on the secure desktop)::1 or 2
V-205830::0x00000000 (0) (or if the Value Name does not exist)::0
V-214936::*::HardCodedRule(ServiceRule)@{DscResource = 'Service'; Ensure = 'Present'; ServiceName = $null; ServiceState = 'Running'; StartupType = $null; OrganizationValueTestString = 'ServiceName/StartupType is populated with correct Firewall service information'}
V-205632::*::HardCodedRule(RegistryRule)@{DscResource = 'Registry'; Ensure = 'Present'; Key = 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System'; ValueName = 'LegalNoticeCaption'; ValueType = 'String'; ValueData = $null; OrganizationValueTestString = "'{0}' -match '^(DoD Notice and Consent Banner|US Department of Defense Warning Statement)$'"}
V-205648::Thumbprint: D37ECF61C0B4ED88681EF3630C4E2FC787B37AEFB::Thumbprint: D37ECF61C0B4ED88681EF3630C4E2FC787B37AEF

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ V-205717::0x00000002 (2) (Prompt for consent on the secure desktop)::1 or 2
V-205830::0x00000000 (0) (or if the Value Name does not exist)::0
V-214936::*::HardCodedRule(ServiceRule)@{DscResource = 'Service'; Ensure = 'Present'; ServiceName = $null; ServiceState = 'Running'; StartupType = $null; OrganizationValueTestString = 'ServiceName/StartupType is populated with correct Firewall service information'}
V-205632::*::HardCodedRule(RegistryRule)@{DscResource = 'Registry'; Ensure = 'Present'; Key = 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System'; ValueName = 'LegalNoticeCaption'; ValueType = 'String'; ValueData = $null; OrganizationValueTestString = "'{0}' -match '^(DoD Notice and Consent Banner|US Department of Defense Warning Statement)$'"}
V-205648::Thumbprint: D37ECF61C0B4ED88681EF3630C4E2FC787B37AEFB::Thumbprint: D37ECF61C0B4ED88681EF3630C4E2FC787B37AEF

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Each setting in this file is linked by STIG ID and the valid range is in an
associated comment.
-->
<OrganizationalSettings fullversion="2.6">
<OrganizationalSettings fullversion="2.8">
<!-- Ensure 'V-205631' is set to the required legal notice before logon-->
<OrganizationalSetting id="V-205631" ValueData="You are accessing a U.S. Government (USG) Information System (IS) that is provided for USG-authorized use only.
Expand All @@ -30,6 +30,8 @@ By using this IS (which includes any device attached to this IS), you consent to
<OrganizationalSetting id="V-205648.b" Location="" />
<!-- Ensure location for DoD Root CA 5 certificate is present-->
<OrganizationalSetting id="V-205648.c" Location="" />
<!-- Ensure location for DoD Root CA 6 certificate is present-->
<OrganizationalSetting id="V-205648.d" Location="" />
<!-- Ensure location for DoD Interoperability Root CA 2 certificate is present-->
<OrganizationalSetting id="V-205649" Location="" />
<!-- Ensure location for US DoD CCEB Interoperability Root CA 2 certificate is present-->
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Each setting in this file is linked by STIG ID and the valid range is in an
associated comment.
-->
<OrganizationalSettings fullversion="2.6">
<OrganizationalSettings fullversion="2.8">
<!-- Ensure 'V-205631' is set to the required legal notice before logon-->
<OrganizationalSetting id="V-205631" ValueData="You are accessing a U.S. Government (USG) Information System (IS) that is provided for USG-authorized use only.
Expand All @@ -30,6 +30,8 @@ By using this IS (which includes any device attached to this IS), you consent to
<OrganizationalSetting id="V-205648.b" Location="" />
<!-- Ensure location for DoD Root CA 5 certificate is present-->
<OrganizationalSetting id="V-205648.c" Location="" />
<!-- Ensure location for DoD Root CA 6 certificate is present-->
<OrganizationalSetting id="V-205648.d" Location="" />
<!-- Ensure location for DoD Interoperability Root CA 2 certificate is present-->
<OrganizationalSetting id="V-205649" Location="" />
<!-- Ensure location for US DoD CCEB Interoperability Root CA 2 certificate is present-->
Expand Down
Loading

0 comments on commit a4b5edc

Please sign in to comment.