added support for 2012R2 MS/DC 2.17/2.18 (#532)

* added support for 2012R2 MS/DC 2.17/2.18 * added new line on the xccdf * removed tab from processed xml.
microsoft · Nov 20, 2019 · 2abeef5 · 2abeef5
1 parent 2feedd2
commit 2abeef5
Show file tree

Hide file tree

Showing 11 changed files with 5,169 additions and 5,274 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Fixed [#427](https://github.com/microsoft/PowerStig/issues/427): Windows 10 Rule V-63373 fails to apply settings to system drive
 * Fixed [#514](https://github.com/microsoft/PowerStig/issues/514): Feature request: additional support for servicerule properties
 * Fixed [#521](https://github.com/microsoft/PowerStig/issues/521): Organizational setting warning should include Stig name
+* Update PowerSTIG to parse/convert the Windows Server 2012 R2 MS/DC V2R17/V2R18 Respectively: [531](https://github.com/microsoft/PowerStig/issues/531)
 
 ## 4.1.1
 

diff --git a/...nd_2012_R2_DC_STIG_V2R16_Manual-xccdf.log → ...nd_2012_R2_DC_STIG_V2R18_Manual-xccdf.log b/...nd_2012_R2_DC_STIG_V2R16_Manual-xccdf.log → ...nd_2012_R2_DC_STIG_V2R18_Manual-xccdf.log
@@ -6,7 +6,7 @@ V-2379::is greater than 7 days::is greater than "7" days
 V-2380::is greater than 5 minutes::is greater than "5" minutes
 V-6836::"Minimum password length,"::"Minimum password length"
 V-8316::*::''
-V-36707::Value:  0x00000001 (1) ::Value: 1 Or 2
+V-36707::Value: 0x00000001 (1) ::Value: 1 Or 2
 V-36736::*::HardCodedRule(ServiceRule)@{DscResource = 'Service'; Ensure = 'Present'; ServiceName = $null; ServiceState = 'Running'; StartupType = $null; OrganizationValueTestString = 'ServiceName/StartupType is populated with correct Certificate Revocation Checking service information'}
 V-42420::*::HardCodedRule(ServiceRule)@{DscResource = 'Service'; Ensure = 'Present'; ServiceName = $null; ServiceState = 'Running'; StartupType = $null; OrganizationValueTestString = 'ServiceName/StartupType is populated with correct Firewall service information'}
 V-80473::*::HardCodedRule(AuditSettingRule)@{DscResource = 'AuditSetting'; DesiredValue = '6.3.9600.17415'; Operator = '-ge'; Property = 'Version'; Query = "SELECT * FROM CIM_Datafile WHERE FileName='powershell' AND Path LIKE '%\\Windows\\System32\\WindowsPowerShell\\v1.0\\%' AND Extension='exe'"}

diff --git a/...nd_2012_R2_DC_STIG_V2R16_Manual-xccdf.xml → ...nd_2012_R2_DC_STIG_V2R18_Manual-xccdf.xml b/...nd_2012_R2_DC_STIG_V2R16_Manual-xccdf.xml → ...nd_2012_R2_DC_STIG_V2R18_Manual-xccdf.xml
diff --git a/...nd_2012_R2_MS_STIG_V2R15_Manual-xccdf.log → ...nd_2012_R2_MS_STIG_V2R17_Manual-xccdf.log b/...nd_2012_R2_MS_STIG_V2R15_Manual-xccdf.log → ...nd_2012_R2_MS_STIG_V2R17_Manual-xccdf.log
@@ -2,7 +2,7 @@ V-2372::"Store password using reversible encryption"::"Store passwords using rev
 V-6836::"Minimum password length,"::"Minimum password length"
 V-6840::*::HardCodedRule(AuditSettingRule)@{DscResource = 'AuditSetting'; DesiredValue = $true; Operator = '-eq'; Property = 'PasswordExpires'; Query = "SELECT * FROM Win32_UserAccount WHERE Disabled=$false AND LocalAccount=$true"}
 V-7002::*::HardCodedRule(AuditSettingRule)@{DscResource = 'AuditSetting'; DesiredValue = $true; Operator = '-eq'; Property = 'PasswordRequired'; Query = "SELECT * FROM Win32_UserAccount WHERE Disabled=$false AND LocalAccount=$true"}
-V-36707::Value:  0x00000001 (1) ::Value: 1 Or 2
+V-36707::Value: 0x00000001 (1) ::Value: 1 Or 2
 V-36736::*::HardCodedRule(ServiceRule)@{DscResource = 'Service'; Ensure = 'Present'; ServiceName = $null; ServiceState = 'Running'; StartupType = $null; OrganizationValueTestString = 'ServiceName/StartupType is populated with correct Certificate Revocation Checking service information'}
 V-42420::*::HardCodedRule(ServiceRule)@{DscResource = 'Service'; Ensure = 'Present'; ServiceName = $null; ServiceState = 'Running'; StartupType = $null; OrganizationValueTestString = 'ServiceName/StartupType is populated with correct Firewall service information'}
 V-80473::*::HardCodedRule(AuditSettingRule)@{DscResource = 'AuditSetting'; DesiredValue = '6.3.9600.17415'; Operator = '-ge'; Property = 'Version'; Query = "SELECT * FROM CIM_Datafile WHERE FileName='powershell' AND Path LIKE '%\\Windows\\System32\\WindowsPowerShell\\v1.0\\%' AND Extension='exe'"}

diff --git a/...nd_2012_R2_MS_STIG_V2R15_Manual-xccdf.xml → ...nd_2012_R2_MS_STIG_V2R17_Manual-xccdf.xml b/...nd_2012_R2_MS_STIG_V2R15_Manual-xccdf.xml → ...nd_2012_R2_MS_STIG_V2R17_Manual-xccdf.xml
diff --git a/StigData/Archive/Windows.Server.2012R2/U_Windows_2012_and_2012_R2_DC_STIG-xccdf.md b/StigData/Archive/Windows.Server.2012R2/U_Windows_2012_and_2012_R2_DC_STIG-xccdf.md
diff --git a/StigData/Archive/Windows.Server.2012R2/U_Windows_2012_and_2012_R2_MS_STIG-xccdf.md b/StigData/Archive/Windows.Server.2012R2/U_Windows_2012_and_2012_R2_MS_STIG-xccdf.md
diff --git a/...dowsServer-2012R2-DC-2.16.org.default.xml → ...dowsServer-2012R2-DC-2.18.org.default.xml b/...dowsServer-2012R2-DC-2.16.org.default.xml → ...dowsServer-2012R2-DC-2.18.org.default.xml
@@ -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.16">
+<OrganizationalSettings fullversion="2.18">
   <!-- Ensure ServiceName/StartupType is populated with correct AntiVirus service information-->
   <OrganizationalSetting id="V-1074" ServiceName="" StartupType="" />
   <!-- Ensure ''V-1090'' -le '4'-->