Merge pull request #321 from Microsoft/erjenkin#341

Update PowerSTIG to Utilize LogTargetW3C parameter in xWebAdministration 2.5.0.0

Author: erjenkin

CHANGELOG.md

@@ -25,6 +25,7 @@ UPDATES
 * Fixed [#284](https://github.com/Microsoft/PowerStig/issues/284): [V-74415] [V-74413] Windows 10 STIG rule V-74415 and V-74413 should not contain white space in key
 * Removed: Internet Explorer 1.13
 * Fixed [290](https://github.com/Microsoft/PowerStig/issues/290): [V-76731] IIS Server STIG V-76731 fails to properly set STIG guidance because rule is not split.
+* Fixed [314](https://github.com/Microsoft/PowerStig/issues/314): Update PowerSTIG to Utilize LogTargetW3C parameter in xWebAdministration 2.5.0.0.
 
 * Added the following STIGs
   * IIS Site 8.5 V1R6 [#276](https://github.com/Microsoft/PowerStig/issues/276)

DSCResources/IisServer/IisServer.schema.psm1

@@ -87,7 +87,7 @@ Configuration IisServer
     . "$resourcePath\windows.xRegistry.ps1"
     . "$resourcePath\windows.xWindowsFeature.ps1"
 
-    Import-DscResource -ModuleName xWebAdministration -ModuleVersion 2.3.0.0
+    Import-DscResource -ModuleName xWebAdministration -ModuleVersion 2.5.0.0
     . "$resourcePath\windows.xIisMimeTypeMapping.ps1"
     . "$resourcePath\windows.xWebConfigProperty.ps1"
     . "$resourcePath\windows.xIisLogging.ps1"

DSCResources/IisSite/IisSite.schema.psm1

@@ -88,7 +88,7 @@ Configuration IisSite
     Import-DscResource -ModuleName xPSDesiredStateConfiguration -ModuleVersion 8.3.0.0
     . "$resourcePath\windows.xWindowsFeature.ps1"
 
-    Import-DscResource -ModuleName xWebAdministration -ModuleVersion 2.3.0.0
+    Import-DscResource -ModuleName xWebAdministration -ModuleVersion 2.5.0.0
     . "$resourcePath\windows.xWebSite.ps1"
     . "$resourcePath\windows.xWebAppPool.ps1"
     . "$resourcePath\windows.xIisMimeTypeMapping.ps1"

DSCResources/Resources/windows.xIisLogging.ps1

@@ -7,6 +7,7 @@ if ($rules)
 {
     $logFlags = Get-UniqueStringArray -InputObject $rules.LogFlags -AsString
     $logFormat = Get-UniqueString -InputObject $rules.LogFormat
+    $logTargetW3C = Get-UniqueString -InputObject $rules.LogTargetW3C
     $logCustomField = Get-LogCustomField -LogCustomField $rules.LogCustomFieldEntry.Entry -Resource 'xIisLogging'
 
     $resourceTitle = "[$($rules.id -join ' ')]"
@@ -17,6 +18,7 @@ if ($rules)
             LogPath         = '$LogPath'
             LogFlags        = @($logFlags)
             LogFormat       = '$logFormat'
+            LogTargetW3C    = '$logTargetW3C'
             LogCustomFields = @($logCustomField)
         }"
     )

DSCResources/Resources/windows.xWebSite.ps1

@@ -8,6 +8,7 @@ if ($rules)
     $logFlags = Get-UniqueStringArray -InputObject $rules.LogFlags -AsString
     $logFormat = Get-UniqueString -InputObject $rules.LogFormat
     $logPeriod = Get-UniqueString -InputObject $rules.LogPeriod
+    $logTargetW3C = Get-UniqueString -InputObject $rules.LogTargetW3C
     $logCustomField = Get-LogCustomField -LogCustomField $rules.LogCustomFieldEntry.Entry -Resource 'xWebSite'
 
     foreach ($website in $WebsiteName)
@@ -22,6 +23,7 @@ if ($rules)
                     Name            = '$website'
                     LogFlags        = @($logFlags)
                     LogFormat       = '$logFormat'
+                    LogTargetW3C    = '$logTargetW3C'
                     LogCustomFields = @($logCustomField)
                 }"
             )
@@ -35,6 +37,7 @@ if ($rules)
                     LogFlags        = @($logFlags)
                     LogFormat       = '$logFormat'
                     LogPeriod       = '$logPeriod'
+                    LogTargetW3C    = '$logTargetW3C'
                     LogCustomFields = @($logCustomField)
                 }"
             )

PowerStig.psd1

@@ -45,7 +45,7 @@ RequiredModules  = @(
     @{ModuleName = 'WindowsDefenderDsc'; ModuleVersion = '1.0.0.0'},
     @{ModuleName = 'xDnsServer'; ModuleVersion = '1.11.0.0'},
     @{ModuleName = 'xPSDesiredStateConfiguration'; ModuleVersion = '8.3.0.0'},
-    @{ModuleName = 'xWebAdministration'; ModuleVersion = '2.3.0.0'},
+    @{ModuleName = 'xWebAdministration'; ModuleVersion = '2.5.0.0'},
     @{ModuleName = 'xWinEventLog'; ModuleVersion = '1.2.0.0'}
 )