xDscWebService: FIX The IIS apppool account and credentials cannot be set and fixing some bugs from PR #614

CHANGELOG.md

@@ -20,6 +20,9 @@
     #536](https://github.com/PowerShell/xPSDesiredStateConfiguration/issues/536)
     and starts the deprecation process for configuring a windows firewall
     (exception) rule using xDSCWebService
+  - Fixes [issue
+    #463](https://github.com/PowerShell/xPSDesiredStateConfiguration/issues/463)
+    and fixes some bugs introduced with the new firewall rule handling
 
 ## 8.6.0.0
 

DSCPullServerSetup/PullServerDeploymentVerificationTest/PullServerSetupTests.ps1

@@ -29,8 +29,8 @@ Describe PullServerInstallationTests {
         $DscWebConfigPath = Join-Path -Path $env:SystemDrive -ChildPath $DscWebConfigChildPath
 
         # Skip all tests if web.config is not found
-        if (-not (Test-Path $DscWebConfigPath)){
-            Write-Error 'No pullserver web.config found.' -ErrorAction Stop
+        if (-not (Test-Path -Path $DscWebConfigPath)){
+            throw 'No pullserver web.config found.'
         }
 
         # Get web.config content as XML

DSCResources/MSFT_xDSCWebService/Firewall.psm1

@@ -1,5 +1,5 @@
 # Name and description for the Firewall rules. Used in multiple locations
-New-Variable -Name fireWallRuleDisplayName -Value 'Desired State Configuration - Pull Server Port:{0}' -Option ReadOnly -Scope Script -Force
+New-Variable -Name FireWallRuleDisplayName -Value 'DSCPullServer_IIS_Port' -Option ReadOnly -Scope Script -Force
 New-Variable -Name netsh -Value "$env:windir\system32\netsh.exe" -Option ReadOnly -Scope Script -Force
 <#
     .SYNOPSIS
@@ -22,11 +22,13 @@ function Add-PullServerFirewallConfiguration
     Write-Verbose -Message 'Disable Inbound Firewall Notification'
     $null = & $script:netsh advfirewall set currentprofile settings inboundusernotification disable
 
+    $ruleName = $FireWallRuleDisplayName
+
     # Remove all existing rules with that displayName
-    $null = & $script:netsh advfirewall firewall delete rule name=DSCPullServer_IIS_Port protocol=tcp localport=$Port
+    $null = & $script:netsh advfirewall firewall delete rule name=$ruleName protocol=tcp localport=$Port
 
     Write-Verbose -Message "Add Firewall Rule for port $Port"
-    $null = & $script:netsh advfirewall firewall add rule name=DSCPullServer_IIS_Port dir=in action=allow protocol=TCP localport=$Port
+    $null = & $script:netsh advfirewall firewall add rule name=$ruleName dir=in action=allow protocol=TCP localport=$Port
 }
 
 <#
@@ -51,14 +53,17 @@ function Remove-PullServerFirewallConfiguration
     {
         # remove all existing rules with that displayName
         Write-Verbose -Message "Delete Firewall Rule for port $Port"
-        $null = & $script:netsh advfirewall firewall delete rule name=DSCPullServer_IIS_Port protocol=tcp localport=$Port
+        $ruleName = $FireWallRuleDisplayName
 
         # backwards compatibility with old code
         if (Get-Command -Name Get-NetFirewallRule -CommandType Cmdlet -ErrorAction:SilentlyContinue)
         {
             # Remove all rules with that name
-            $ruleName = ($($FireWallRuleDisplayName) -f $port)
-            Get-NetFirewallRule | Where-Object -Property DisplayName -eq -Value "$ruleName" | Remove-NetFirewallRule
+            Get-NetFirewallRule -DisplayName $ruleName | Remove-NetFirewallRule
+        }
+        else
+        {
+            $null = & $script:netsh advfirewall firewall delete rule name=$ruleName protocol=tcp localport=$Port
         }
     }
     else
@@ -88,7 +93,8 @@ function Test-PullServerFirewallConfiguration
 
     # Remove all existing rules with that displayName
     Write-Verbose -Message "Testing Firewall Rule for port $Port"
-    $result = & $script:netsh advfirewall firewall show rule name=DSCPullServer_IIS_Port | Select-String -Pattern "LocalPort:\s*$Port"
+    $ruleName = $FireWallRuleDisplayName
+    $result = & $script:netsh advfirewall firewall show rule name=$ruleName | Select-String -Pattern "LocalPort:\s*$Port"
     return -not [string]::IsNullOrWhiteSpace($result)
 }