Merge branch '4.19.0' into hinderjd#1281
This commit is contained in:
Eric Jenkins
GitHub
Коммит
4e1e20fe34
|
|
@ -3,6 +3,7 @@
|
|||
## [Unreleased]
|
||||
|
||||
* Update PowerSTIG to Parse/Apply U_MS_Office_365_ProPlus_V2R11_STIG: [#1281](https://github.com/microsoft/PowerStig/issues/1281)
|
||||
* Update PowerSTIG to Parse/Apply U_MS_Windows_11_V1R5_STIG: [#1273](https://github.com/microsoft/PowerStig/issues/1273)
|
||||
|
||||
## [4.18.0] - 2023-09-05
|
||||
|
||||
|
|
|
|||
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
|
|
@ -1,95 +1,99 @@
|
|||
<!--
|
||||
The organizational settings file is used to define the local organizations
|
||||
preferred setting within an allowed range of the STIG.
|
||||
|
||||
Each setting in this file is linked by STIG ID and the valid range is in an
|
||||
associated comment.
|
||||
-->
|
||||
<OrganizationalSettings fullversion="1.2">
|
||||
<!-- Ensure ValueData is set to 0x00000006 (6) or greater -->
|
||||
<OrganizationalSetting id="V-253261" ValueData="" />
|
||||
<!-- Ensure ''V-253297'' -ge '15' -or ''V-253297'' -eq '0'-->
|
||||
<OrganizationalSetting id="V-253297" PolicyValue="15" />
|
||||
<!-- Ensure ''V-253298'' -le '3' -and ''V-253298'' -ne '0'-->
|
||||
<OrganizationalSetting id="V-253298" PolicyValue="3" />
|
||||
<!-- Ensure ''V-253299'' -ge '15'-->
|
||||
<OrganizationalSetting id="V-253299" PolicyValue="15" />
|
||||
<!-- Ensure ''V-253300'' -ge '24'-->
|
||||
<OrganizationalSetting id="V-253300" PolicyValue="24" />
|
||||
<!-- Ensure ''V-253301'' -le '60' -and ''V-253301'' -ne '0'-->
|
||||
<OrganizationalSetting id="V-253301" PolicyValue="30" />
|
||||
<!-- Ensure ''V-253302'' -ge '1'-->
|
||||
<OrganizationalSetting id="V-253302" PolicyValue="1" />
|
||||
<!-- Ensure ''V-253303'' -ge '15'-->
|
||||
<OrganizationalSetting id="V-253303" PolicyValue="14" />
|
||||
<!-- Ensure ''V-253337'' -ge '32768'-->
|
||||
<OrganizationalSetting id="V-253337" ValueData="32768" />
|
||||
<!-- Ensure ''V-253338'' -ge '1024000'-->
|
||||
<OrganizationalSetting id="V-253338" ValueData="1024000" />
|
||||
<!-- Ensure ''V-253339'' -ge '32768'-->
|
||||
<OrganizationalSetting id="V-253339" ValueData="32768" />
|
||||
<!-- Ensure ''V-253364'' -match '1|ShouldBeAbsent'-->
|
||||
<OrganizationalSetting id="V-253364" ValueData="1" />
|
||||
<!-- Ensure ''V-253369.b'' -match '1|3'-->
|
||||
<OrganizationalSetting id="V-253369.b" ValueData="1" />
|
||||
<!-- Ensure ''V-253371'' -match '1|2'-->
|
||||
<OrganizationalSetting id="V-253371" ValueData="1" />
|
||||
<!-- Ensure ''V-253372'' -match '1|3|8'-->
|
||||
<OrganizationalSetting id="V-253372" ValueData="1" />
|
||||
<!-- Ensure ''V-253377'' -match '1|ShouldBeAbsent'-->
|
||||
<OrganizationalSetting id="V-253377" ValueData="1" />
|
||||
<!-- Ensure ''V-253396'' -match '0|ShouldBeAbsent'-->
|
||||
<OrganizationalSetting id="V-253396" ValueData="0" />
|
||||
<!-- Ensure ''V-253397'' -match '0|ShouldBeAbsent'-->
|
||||
<OrganizationalSetting id="V-253397" ValueData="0" />
|
||||
<!-- Ensure ''V-253398'' -match '0|ShouldBeAbsent'-->
|
||||
<OrganizationalSetting id="V-253398" ValueData="0" />
|
||||
<!-- Ensure ''V-253401'' -ge '6'-->
|
||||
<OrganizationalSetting id="V-253401" ValueData="6" />
|
||||
<!-- Ensure ''V-253408'' -match '0|ShouldBeAbsent'-->
|
||||
<OrganizationalSetting id="V-253408" ValueData="0" />
|
||||
<!-- Ensure ''V-253412'' -match '0|ShouldBeAbsent'-->
|
||||
<OrganizationalSetting id="V-253412" ValueData="0" />
|
||||
<!-- Ensure location for DoD Root CA 3 certificate is present-->
|
||||
<OrganizationalSetting id="V-253427.a" Location="" />
|
||||
<!-- Ensure location for DoD Root CA 4 certificate is present-->
|
||||
<OrganizationalSetting id="V-253427.b" Location="" />
|
||||
<!-- Ensure location for DoD Root CA 5 certificate is present-->
|
||||
<OrganizationalSetting id="V-253427.c" Location="" />
|
||||
<!-- Ensure location for DoD Interoperability Root CA 2 certificate is present-->
|
||||
<OrganizationalSetting id="V-253429.a" Location="" />
|
||||
<!-- Ensure location for DoD Interoperability Root CA 2 certificate is present-->
|
||||
<OrganizationalSetting id="V-253429.b" Location="" />
|
||||
<!-- Ensure location for US DoD CCEB Interoperability Root CA 2 certificate is present-->
|
||||
<OrganizationalSetting id="V-253430" Location="" />
|
||||
<!-- Ensure ''V-253435'' -ne 'Administrator'-->
|
||||
<OrganizationalSetting id="V-253435" OptionValue="" />
|
||||
<!-- Ensure ''V-253436'' -ne 'Guest'-->
|
||||
<OrganizationalSetting id="V-253436" OptionValue="" />
|
||||
<!-- Ensure ''V-253442'' -le '30' -and ''V-253442'' -gt '0'-->
|
||||
<OrganizationalSetting id="V-253442" ValueData="30" />
|
||||
<!-- Ensure ''V-253444'' -le '900' -and ''V-253444'' -gt '0'-->
|
||||
<OrganizationalSetting id="V-253444" ValueData="450" />
|
||||
<!-- Ensure 'V-253445' is set to the required legal notice before logon-->
|
||||
<OrganizationalSetting id="V-253445" 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-253446'' -match '^(DoD Notice and Consent Banner|US Department of Defense Warning Statement)$'-->
|
||||
<OrganizationalSetting id="V-253446" ValueData="US Department of Defense Warning Statement" />
|
||||
<!-- Ensure ''V-253447'' -le '10'-->
|
||||
<OrganizationalSetting id="V-253447" ValueData="10" />
|
||||
<!-- Ensure ''V-253448'' -match '1|2'-->
|
||||
<OrganizationalSetting id="V-253448" ValueData="1" />
|
||||
<!-- Ensure ''V-253478'' -match '2|ShouldBeAbsent'-->
|
||||
<OrganizationalSetting id="V-253478" ValueData="2" />
|
||||
</OrganizationalSettings>
|
||||
<!--
|
||||
The organizational settings file is used to define the local organizations
|
||||
preferred setting within an allowed range of the STIG.
|
||||
|
||||
Each setting in this file is linked by STIG ID and the valid range is in an
|
||||
associated comment.
|
||||
-->
|
||||
<OrganizationalSettings fullversion="1.5">
|
||||
<!-- Ensure ValueData is set to 0x00000006 (6) or greater -->
|
||||
<OrganizationalSetting id="V-253261" ValueData="" />
|
||||
<!-- Ensure ''V-253297'' -ge '15' -or ''V-253297'' -eq '0'-->
|
||||
<OrganizationalSetting id="V-253297" PolicyValue="15" />
|
||||
<!-- Ensure ''V-253298'' -le '3' -and ''V-253298'' -ne '0'-->
|
||||
<OrganizationalSetting id="V-253298" PolicyValue="3" />
|
||||
<!-- Ensure ''V-253299'' -ge '15'-->
|
||||
<OrganizationalSetting id="V-253299" PolicyValue="15" />
|
||||
<!-- Ensure ''V-253300'' -ge '24'-->
|
||||
<OrganizationalSetting id="V-253300" PolicyValue="24" />
|
||||
<!-- Ensure ''V-253301'' -le '60' -and ''V-253301'' -ne '0'-->
|
||||
<OrganizationalSetting id="V-253301" PolicyValue="30" />
|
||||
<!-- Ensure ''V-253302'' -ge '1'-->
|
||||
<OrganizationalSetting id="V-253302" PolicyValue="1" />
|
||||
<!-- Ensure ''V-253303'' -ge '14'-->
|
||||
<OrganizationalSetting id="V-253303" PolicyValue="14" />
|
||||
<!-- Ensure ''V-253337'' -ge '32768'-->
|
||||
<OrganizationalSetting id="V-253337" ValueData="32768" />
|
||||
<!-- Ensure ''V-253338'' -ge '1024000'-->
|
||||
<OrganizationalSetting id="V-253338" ValueData="1024000" />
|
||||
<!-- Ensure ''V-253339'' -ge '32768'-->
|
||||
<OrganizationalSetting id="V-253339" ValueData="32768" />
|
||||
<!-- Ensure ''V-253364'' -match '3|ShouldBeAbsent'-->
|
||||
<OrganizationalSetting id="V-253364" ValueData="3" />
|
||||
<!-- Ensure ''V-253369.b'' -match '1|3'-->
|
||||
<OrganizationalSetting id="V-253369.b" ValueData="1" />
|
||||
<!-- Ensure ''V-253371'' -match '1|2'-->
|
||||
<OrganizationalSetting id="V-253371" ValueData="1" />
|
||||
<!-- Ensure ''V-253372'' -match '1|3|8'-->
|
||||
<OrganizationalSetting id="V-253372" ValueData="1" />
|
||||
<!-- Ensure ''V-253377'' -match '1|ShouldBeAbsent'-->
|
||||
<OrganizationalSetting id="V-253377" ValueData="1" />
|
||||
<!-- Ensure ''V-253396'' -match '0|ShouldBeAbsent'-->
|
||||
<OrganizationalSetting id="V-253396" ValueData="0" />
|
||||
<!-- Ensure ''V-253397'' -match '0|ShouldBeAbsent'-->
|
||||
<OrganizationalSetting id="V-253397" ValueData="0" />
|
||||
<!-- Ensure ''V-253398'' -match '0|ShouldBeAbsent'-->
|
||||
<OrganizationalSetting id="V-253398" ValueData="0" />
|
||||
<!-- Ensure ''V-253401'' -ge '6'-->
|
||||
<OrganizationalSetting id="V-253401" ValueData="6" />
|
||||
<!-- Ensure ''V-253408'' -match '0|ShouldBeAbsent'-->
|
||||
<OrganizationalSetting id="V-253408" ValueData="0" />
|
||||
<!-- Ensure ''V-253412'' -match '0|ShouldBeAbsent'-->
|
||||
<OrganizationalSetting id="V-253412" ValueData="0" />
|
||||
<!-- Ensure location for DoD Root CA 3 certificate is present-->
|
||||
<OrganizationalSetting id="V-253427.a" Location="" />
|
||||
<!-- Ensure location for DoD Root CA 4 certificate is present-->
|
||||
<OrganizationalSetting id="V-253427.b" Location="" />
|
||||
<!-- Ensure location for DoD Root CA 5 certificate is present-->
|
||||
<OrganizationalSetting id="V-253427.c" Location="" />
|
||||
<!-- Ensure location for DoD Root CA 6 O certificate is present-->
|
||||
<OrganizationalSetting id="V-253427.d" Location="" />
|
||||
<!-- Ensure location for DoD Interoperability Root CA 2 certificate is present-->
|
||||
<OrganizationalSetting id="V-253429.a" Location="" />
|
||||
<!-- Ensure location for DoD Interoperability Root CA 2 certificate is present-->
|
||||
<OrganizationalSetting id="V-253429.b" Location="" />
|
||||
<!-- Ensure location for US DoD CCEB Interoperability Root CA 2 certificate is present-->
|
||||
<OrganizationalSetting id="V-253430.a" Location="" />
|
||||
<!-- Ensure location for US DoD CCEB Interoperability Root CA 2,Thumbprint: 9 certificate is present-->
|
||||
<OrganizationalSetting id="V-253430.b" Location="" />
|
||||
<!-- Ensure ''V-253435'' -ne 'Administrator'-->
|
||||
<OrganizationalSetting id="V-253435" OptionValue="" />
|
||||
<!-- Ensure ''V-253436'' -ne 'Guest'-->
|
||||
<OrganizationalSetting id="V-253436" OptionValue="" />
|
||||
<!-- Ensure ''V-253442'' -le '30' -and ''V-253442'' -gt '0'-->
|
||||
<OrganizationalSetting id="V-253442" ValueData="30" />
|
||||
<!-- Ensure ''V-253444'' -le '900' -and ''V-253444'' -gt '0'-->
|
||||
<OrganizationalSetting id="V-253444" ValueData="900" />
|
||||
<!-- Ensure 'V-253445' is set to the required legal notice before logon-->
|
||||
<OrganizationalSetting id="V-253445" 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-253446'' -match '^(DoD Notice and Consent Banner|US Department of Defense Warning Statement)$'-->
|
||||
<OrganizationalSetting id="V-253446" ValueData="US Department of Defense Warning Statement" />
|
||||
<!-- Ensure ''V-253447'' -le '10'-->
|
||||
<OrganizationalSetting id="V-253447" ValueData="10" />
|
||||
<!-- Ensure ''V-253448'' -match '1|2'-->
|
||||
<OrganizationalSetting id="V-253448" ValueData="1" />
|
||||
<!-- Ensure ''V-253478'' -match '2|ShouldBeAbsent'-->
|
||||
<OrganizationalSetting id="V-253478" ValueData="2" />
|
||||
</OrganizationalSettings>
|
||||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
Загрузка…
Ссылка в новой задаче