Skip to content

Commit

Permalink
Merge branch 'rsanderson8310-WinSrv2022V1R5' into 4.22.0
Browse files Browse the repository at this point in the history
  • Loading branch information
erjenkin committed May 31, 2024
2 parents d806f6b + f92e9f2 commit f3863e2
Show file tree
Hide file tree
Showing 12 changed files with 1,120 additions and 1,022 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* Update PowerSTIG to Parse/Apply Microsoft Windows 10 STIG - Ver 2, Rel 9 [#1342](https://github.com/microsoft/PowerStig/issues/1342)
* Update PowerSTIG to Parse/Apply Microsoft Windows Server 2016 STIG - Ver 2, Rel 8 [#1340](https://github.com/microsoft/PowerStig/issues/1340)
* Update PowerSTIG to Parse/Apply Microsoft Windows Server 2019 STIG - Ver 2, Rel 9 [#1339](https://github.com/microsoft/PowerStig/issues/1339)
* Update PowerSTIG to Parse/Apply Microsoft Windows Server 2022 STIG - Ver 1, Rel 5 [#1337](https://github.com/microsoft/PowerStig/issues/1337)
* Update Powerstig to parse/apply Microsoft Office System 2016 STIG - Ver 2, Rel 3 [#1352](https://github.com/microsoft/PowerStig/issues/1352)
* Update Powerstig to parse/apply Microsoft Office 365 ProPlus STIG - Ver 2, Rel 12 [#1351](https://github.com/microsoft/PowerStig/issues/1351)
* Update Powerstig to parse/apply Microsoft .Net Framework 4.0 STIG - Ver 2, Rel 4 [#1349](https://github.com/microsoft/PowerStig/issues/1349)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ V-254458::*::HardCodedRule(RegistryRule)@{DscResource = 'Registry'; Ensure = 'Pr
V-254484::0x00000002 (2) (Prompt for consent on the secure desktop)::1 or 2
V-254490::0x00000002 (2) (or if the Value Name does not exist)::2
V-254499::- Administrators::- Administrators`r`nSystems that have the Hyper-V role will also have "Virtual Machines" given this user right (this may be displayed as "NT Virtual Machine\Virtual Machines", SID S-1-5-83-0). This is not a finding.
V-254254::CREATOR OWNER - Full Control - Subkeys::CREATOR OWNER - Full Control - Subkeys Only

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ V-254458::*::HardCodedRule(RegistryRule)@{DscResource = 'Registry'; Ensure = 'Pr
V-254484::0x00000002 (2) (Prompt for consent on the secure desktop)::1 or 2
V-254490::0x00000002 (2) (or if the Value Name does not exist)::2
V-254499::- Administrators::- Administrators`r`nSystems that have the Hyper-V role will also have "Virtual Machines" given this user right (this may be displayed as "NT Virtual Machine\Virtual Machines", SID S-1-5-83-0). This is not a finding.
V-254254::CREATOR OWNER - Full Control - Subkeys::CREATOR OWNER - Full Control - Subkeys Only

Large diffs are not rendered by default.

Large diffs are not rendered by default.

60 changes: 36 additions & 24 deletions source/StigData/Processed/WindowsServer-2022-DC-1.4.org.default.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,25 @@
<!-- Ensure ServiceName/StartupType is populated with correct Firewall service information-->
<OrganizationalSetting id="V-254265" ServiceName="" StartupType="" />
<!-- Ensure ''V-254343.b'' -match '1|3'-->
<OrganizationalSetting id="V-254343.b" ValueData="" />
<OrganizationalSetting id="V-254343.b" ValueData="1" />
<!-- Ensure ''V-254344'' -match '1|3|8|ShouldBeAbsent'-->
<OrganizationalSetting id="V-254344" ValueData="" />
<OrganizationalSetting id="V-254344" ValueData="8" />
<!-- Ensure ''V-254357'' -match '0|1|2|99|100'-->
<OrganizationalSetting id="V-254357" ValueData="" />
<OrganizationalSetting id="V-254357" ValueData="100" />
<!-- Ensure ''V-254358'' -ge '32768'-->
<OrganizationalSetting id="V-254358" ValueData="" />
<OrganizationalSetting id="V-254358" ValueData="32768" />
<!-- Ensure ''V-254359'' -ge '196608'-->
<OrganizationalSetting id="V-254359" ValueData="" />
<OrganizationalSetting id="V-254359" ValueData="196608" />
<!-- Ensure ''V-254360'' -ge '32768'-->
<OrganizationalSetting id="V-254360" ValueData="" />
<OrganizationalSetting id="V-254360" ValueData="32768" />
<!-- Ensure ''V-254387'' -le '600' -and ''V-254387'' -ne '0'-->
<OrganizationalSetting id="V-254387" PolicyValue="" />
<OrganizationalSetting id="V-254387" PolicyValue="600" />
<!-- Ensure ''V-254388'' -le '10' -and ''V-254388'' -ne '0'-->
<OrganizationalSetting id="V-254388" PolicyValue="" />
<OrganizationalSetting id="V-254388" PolicyValue="10" />
<!-- Ensure ''V-254389'' -le '7'-->
<OrganizationalSetting id="V-254389" PolicyValue="" />
<OrganizationalSetting id="V-254389" PolicyValue="7" />
<!-- Ensure ''V-254390'' -le '5'-->
<OrganizationalSetting id="V-254390" PolicyValue="" />
<OrganizationalSetting id="V-254390" PolicyValue="5" />
<!-- Ensure location for DoD Root CA 3 certificate is present-->
<OrganizationalSetting id="V-254442.a" Location="" />
<!-- Ensure location for DoD Root CA 4 certificate is present-->
Expand All @@ -43,35 +43,47 @@
<!-- Ensure location for US DoD CCEB Interoperability Root CA 2 certificate is present-->
<OrganizationalSetting id="V-254444" Location="" />
<!-- Ensure ''V-254454'' -le '30' -and ''V-254454'' -gt '0'-->
<OrganizationalSetting id="V-254454" ValueData="" />
<OrganizationalSetting id="V-254454" ValueData="30" />
<!-- Ensure ''V-254456'' -le '900' -and ''V-254456'' -gt '0'-->
<OrganizationalSetting id="V-254456" ValueData="" />
<OrganizationalSetting id="V-254456" ValueData="900" />
<!-- Ensure 'V-254457' is set to the required legal notice before logon-->
<OrganizationalSetting id="V-254457" ValueData="" />
<OrganizationalSetting id="V-254457" ValueData="You are accessing a U.S. Government (USG) Information System (IS) that is provided for USG-authorized use only.
By using this IS (which includes any device attached to this IS), you consent to the following conditions:
-The USG routinely intercepts and monitors communications on this IS for purposes including, but not limited to, penetration testing, COMSEC monitoring, network operations and defense, personnel misconduct (PM), law enforcement (LE), and counterintelligence (CI) investigations.
-At any time, the USG may inspect and seize data stored on this IS.
-Communications using, or data stored on, this IS are not private, are subject to routine monitoring, interception, and search, and may be disclosed or used for any USG-authorized purpose.
-This IS includes security measures (e.g., authentication and access controls) to protect USG interests--not for your personal benefit or privacy.
-Notwithstanding the above, using this IS does not constitute consent to PM, LE or CI investigative searching or monitoring of the content of privileged communications, or work product, related to personal representation or services by attorneys, psychotherapists, or clergy, and their assistants. Such communications and work product are private and confidential. See User Agreement for details." />
<!-- Ensure ''V-254458'' -match '^(DoD Notice and Consent Banner|US Department of Defense Warning Statement)$'-->
<OrganizationalSetting id="V-254458" ValueData="" />
<OrganizationalSetting id="V-254458" ValueData="DoD Notice and Consent Banner" />
<!-- Ensure ''V-254459'' -match '1|2'-->
<OrganizationalSetting id="V-254459" ValueData="" />
<OrganizationalSetting id="V-254459" ValueData="1" />
<!-- Ensure ''V-254484'' -match '1|2'-->
<OrganizationalSetting id="V-254484" ValueData="" />
<OrganizationalSetting id="V-254484" ValueData="1" />
<!-- Ensure ''V-254285'' -ge '15' -or ''V-254285'' -eq '0'-->
<OrganizationalSetting id="V-254285" PolicyValue="" />
<OrganizationalSetting id="V-254285" PolicyValue="15" />
<!-- Ensure ''V-254286'' -le '3' -and ''V-254286'' -ne '0'-->
<OrganizationalSetting id="V-254286" PolicyValue="" />
<OrganizationalSetting id="V-254286" PolicyValue="3" />
<!-- Ensure ''V-254287'' -ge '15'-->
<OrganizationalSetting id="V-254287" PolicyValue="" />
<OrganizationalSetting id="V-254287" PolicyValue="15" />
<!-- Ensure ''V-254288'' -ge '24'-->
<OrganizationalSetting id="V-254288" PolicyValue="" />
<OrganizationalSetting id="V-254288" PolicyValue="24" />
<!-- Ensure ''V-254289'' -le '60' -and ''V-254289'' -ne '0'-->
<OrganizationalSetting id="V-254289" PolicyValue="" />
<OrganizationalSetting id="V-254289" PolicyValue="60" />
<!-- Ensure ''V-254290'' -ne '0'-->
<OrganizationalSetting id="V-254290" PolicyValue="" />
<OrganizationalSetting id="V-254290" PolicyValue="1" />
<!-- Ensure ''V-254291'' -ge '14'-->
<OrganizationalSetting id="V-254291" PolicyValue="" />
<OrganizationalSetting id="V-254291" PolicyValue="14" />
<!-- Ensure ''V-254447'' -ne 'Administrator'-->
<OrganizationalSetting id="V-254447" OptionValue="" />
<!-- Ensure ''V-254448'' -ne 'Guest'-->
<OrganizationalSetting id="V-254448" OptionValue="" />
<!-- Ensure ''V-254499'' -match '^(Administrators,NT Virtual Machine\\Virtual Machines|Administrators)$'-->
<OrganizationalSetting id="V-254499" Identity="" />
<OrganizationalSetting id="V-254499" Identity="Administrators" />
</OrganizationalSettings>
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="1.3">
<OrganizationalSettings fullversion="1.5">
<!-- Ensure ServiceName/StartupType is populated with correct AntiVirus service information-->
<OrganizationalSetting id="V-254248" ServiceName="" StartupType="" />
<!-- Ensure ServiceName/StartupType is populated with correct Firewall service information-->
Expand Down Expand Up @@ -36,6 +36,8 @@
<OrganizationalSetting id="V-254442.b" Location="" />
<!-- Ensure location for DoD Root CA 5 certificate is present-->
<OrganizationalSetting id="V-254442.c" Location="" />
<!-- Ensure location for DoD Root CA 6 certificate is present-->
<OrganizationalSetting id="V-254442.d" Location="" />
<!-- Ensure location for DoD Interoperability Root CA 2 certificate is present-->
<OrganizationalSetting id="V-254443" Location="" />
<!-- Ensure location for US DoD CCEB Interoperability Root CA 2 certificate is present-->
Expand Down
Loading

0 comments on commit f3863e2

Please sign in to comment.