Merge pull request #302 from microsoft/main

Release
microsoft · Mar 11, 2021 · 33125a3 · 33125a3
2 parents 3a0aebf + be84b99
commit 33125a3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Security/src/BackendCookieMitigation.ps1 b/Security/src/BackendCookieMitigation.ps1
@@ -218,7 +218,7 @@ if (!$RollbackMitigation) {
     Write-Verbose "[INFO] Checking for IIS URL Rewrite Module 2 on $env:computername"
 
     #If IIS 10 check for URL rewrite 2.1 else URL rewrite 2.0
-    $RewriteModule = Get-InstalledSoftware -Name IIS | Where-Object { $_.Name -like "*URL*" -and $_.Name -like "*2*" }
+    $RewriteModule = Get-InstalledSoftware -Name *IIS* | Where-Object { $_.Name -like "*URL*" -and $_.Name -like "*2*" }
     $IISVersion = Get-ItemProperty HKLM:\SOFTWARE\Microsoft\InetStp\ | Select-Object versionstring
 
     $RewriteModuleInstallLog = ($PSScriptRoot + '\' + 'RewriteModuleInstallLog.log')
@@ -254,7 +254,7 @@ if (!$RollbackMitigation) {
             $msiexecPath = $env:WINDIR + "\System32\msiexec.exe"
             Start-Process -FilePath $msiexecPath -ArgumentList $arguments -Wait
             Start-Sleep -Seconds 15
-            $RewriteModule = Get-InstalledSoftware -Name IIS | Where-Object { $_.Name -like "*URL*" -and $_.Name -like "*2*" }
+            $RewriteModule = Get-InstalledSoftware -Name *IIS* | Where-Object { $_.Name -like "*URL*" -and $_.Name -like "*2*" }
             if ($RewriteModule) {
                 Write-Verbose "[OK] IIS URL Rewrite Module 2 installed on $env:computername"
             } else {

diff --git a/Security/src/CompareExchangeHashes.ps1 b/Security/src/CompareExchangeHashes.ps1
@@ -534,14 +534,14 @@ function LoadFromGitHub($url, $filename, $installed_versions) {
         [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 
         # this file is only used for network connectivity test
-        Invoke-WebRequest -Uri "https://github.com/microsoft/CSS-Exchange/releases/latest/download/baseline_15.0.1044.25.checksum.txt" | Out-Null
+        Invoke-WebRequest -UseBasicParsing -Uri "https://github.com/microsoft/CSS-Exchange/releases/latest/download/baseline_15.0.1044.25.checksum.txt" | Out-Null
     } catch {
         Write-Error "Cannot reach out to https://github.com/microsoft/CSS-Exchange/releases/latest, please download baseline files for $installed_versions from https://github.com/microsoft/CSS-Exchange/releases/latest manually to $(GetCurrDir), then rerun this script from $(GetCurrDir)."
     }
 
     try {
         [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-        Invoke-WebRequest -Uri $url -OutFile $filename | Out-Null
+        Invoke-WebRequest -UseBasicParsing -Uri $url -OutFile $filename | Out-Null
     } catch {
         Write-Error "$filename not found... please open issue on https://github.com/microsoft/CSS-Exchange/issues, we will work on it"
     }

diff --git a/Security/src/ExchangeMitigations.ps1 b/Security/src/ExchangeMitigations.ps1
@@ -278,7 +278,7 @@ Function BackendCookieMitigation {
         Write-Verbose "[INFO] Checking for IIS URL Rewrite Module 2 on $env:computername"
 
         #If IIS 10 check for URL rewrite 2.1 else URL rewrite 2.0
-        $RewriteModule = Get-InstalledSoftware -Name IIS | Where-Object { $_.Name -like "*URL*" -and $_.Name -like "*2*" }
+        $RewriteModule = Get-InstalledSoftware -Name *IIS* | Where-Object { $_.Name -like "*URL*" -and $_.Name -like "*2*" }
         $IISVersion = Get-ItemProperty HKLM:\SOFTWARE\Microsoft\InetStp\ | Select-Object versionstring
 
         $RewriteModuleInstallLog = ($PSScriptRoot + '\' + 'RewriteModuleInstallLog.log')
@@ -314,7 +314,7 @@ Function BackendCookieMitigation {
                 $msiexecPath = $env:WINDIR + "\System32\msiexec.exe"
                 Start-Process -FilePath $msiexecPath -ArgumentList $arguments -Wait
                 Start-Sleep -Seconds 15
-                $RewriteModule = Get-InstalledSoftware -Name IIS | Where-Object { $_.Name -like "*URL*" -and $_.Name -like "*2*" }
+                $RewriteModule = Get-InstalledSoftware -Name *IIS* | Where-Object { $_.Name -like "*URL*" -and $_.Name -like "*2*" }
                 if ($RewriteModule) {
                     Write-Verbose "[OK] IIS URL Rewrite Module 2 installed on $env:computername"
                 } else {

diff --git a/Setup/README.md b/Setup/README.md
@@ -20,7 +20,7 @@ Additional Parameters are used for when they are called out from the `SetupLogRe
 
 Parameter | Description
 ----------|------------
-[string]OtherWellKnownObjectsContainer | Pass the Distinguished Name of Microsoft Exchange container to look at the OtherWellKnownObjects attributes
+[string]OtherWellKnownObjects | Tests for deleted objects in the otherWellKnownObjects attribute
 
 # [SetupLogReviewer.ps1](https://github.com/microsoft/CSS-Exchange/releases/latest/download/SetupLogReviewer.ps1)