Merge pull request #130 from microsoft/main

Release
microsoft · Mar 8, 2021 · 6829f46 · 6829f46
2 parents f241a96 + a36c114
commit 6829f46
Show file tree

Hide file tree

Showing 14 changed files with 6,459 additions and 95 deletions.
diff --git a/.build/Build.ps1 b/.build/Build.ps1
@@ -28,6 +28,7 @@ New-Item -Path $distFolder -ItemType Directory | Out-Null
 $scriptFiles = Get-ChildItem -Path $repoRoot -Directory |
     Where-Object { $_.Name -ne ".build" } |
     ForEach-Object { Get-ChildItem -Path $_.FullName *.ps1 -Recurse } |
+    Where-Object {! $_.Name.Contains(".Tests.ps1")}
     Sort-Object Name |
     ForEach-Object { $_.FullName }
 

diff --git a/Security/Baselines/baseline_15.0.1395.4_checksum.txt b/Security/Baselines/baseline_15.0.1395.4_checksum.txt
diff --git a/Security/Baselines/baseline_15.0.1473.3_checksum.txt b/Security/Baselines/baseline_15.0.1473.3_checksum.txt
diff --git a/Security/Baselines/baseline_15.0.1497.2_checksum.txt b/Security/Baselines/baseline_15.0.1497.2_checksum.txt
diff --git a/Security/Baselines/baseline_15.1.1466.3_checksum.txt b/Security/Baselines/baseline_15.1.1466.3_checksum.txt
diff --git a/Security/Baselines/baseline_15.1.1979.3_checksum.txt b/Security/Baselines/baseline_15.1.1979.3_checksum.txt
diff --git a/Security/Baselines/baseline_15.1.2044.4_checksum.txt b/Security/Baselines/baseline_15.1.2044.4_checksum.txt
diff --git a/Security/Baselines/baseline_15.2.659.4_checksum.txt b/Security/Baselines/baseline_15.2.659.4_checksum.txt
diff --git a/Security/Baselines/baseline_15.2.721.2_checksum.txt b/Security/Baselines/baseline_15.2.721.2_checksum.txt
diff --git a/Security/Baselines/baseline_15.2.792.3_checksum.txt b/Security/Baselines/baseline_15.2.792.3_checksum.txt
diff --git a/Setup/SetupAssist.ps1 b/Setup/SetupAssist.ps1
@@ -5,10 +5,12 @@
 #
 [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidUsingEmptyCatchBlock', '', Justification = 'Need to do nothing about it')]
 [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseShouldProcessForStateChangingFunctions', '', Justification = 'Use is the best verb and do not need to confirm')]
+[Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSReviewUnusedParameter', '', Justification = 'Parameter is used')]
 [CmdletBinding()]
 param(
-
+    [string]$OtherWellKnownObjectsContainer
 )
+
 function IsAdministrator {
     $ident = [System.Security.Principal.WindowsIdentity]::GetCurrent()
     $prin = New-Object System.Security.Principal.WindowsPrincipal($ident)
@@ -18,14 +20,34 @@ function IsAdministrator {
 function GetGroupMatches($whoamiOutput, $groupName) {
     $m = @($whoamiOutput | Select-String "(^\w+\\$($groupName))\W+Group")
     if ($m.Count -eq 0) { return $m }
-    return $m.Matches | ForEach-Object { $_.Groups[1].Value }
+    return $m | ForEach-Object {
+        [PSCustomObject]@{
+            GroupName = ($_.Matches.Groups[1].Value)
+            SID       = (GetSidFromLine $_.Line)
+        }
+    }
+}
+
+Function GetSidFromLine ([string]$Line) {
+    $startIndex = $Line.IndexOf("S-")
+    return $Line.Substring($startIndex,
+        $Line.IndexOf(" ", $startIndex) - $startIndex)
 }
 
 # From https://stackoverflow.com/questions/47867949/how-can-i-check-for-a-pending-reboot
 function Test-PendingReboot {
-    if (Get-ChildItem "HKLM:\Software\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending" -EA Ignore) { return $true }
-    if (Get-Item "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired" -EA Ignore) { return $true }
-    if (Get-ItemProperty "HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager" -Name PendingFileRenameOperations -EA Ignore) { return $true }
+    if (Get-ChildItem "HKLM:\Software\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending" -EA Ignore) {
+        Write-Verbose "Key set in: HKLM:\Software\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending. Remove it if reboot doesn't work"
+        return $true
+    }
+    if (Get-Item "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired" -EA Ignore) {
+        Write-Verbose "Key exists at: HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired. Remove it if reboot doesn't work"
+        return $true
+    }
+    if (Get-ItemProperty "HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager" -Name PendingFileRenameOperations -EA Ignore) {
+        Write-Verbose "Key set at: HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager - PendingFileRenameOperations. Remove it if reboot doesn't work"
+        return $true
+    }
     try {
         $util = [wmiclass]"\\.\root\ccm\clientsdk:CCM_ClientUtilities"
         $status = $util.DetermineIfRebootPending()
@@ -174,77 +196,160 @@ function Get-ExchangeAdSetupObjects {
     return $hash
 }
 
-if (IsAdministrator) {
-    Write-Host "User is an administrator."
-} else {
-    Write-Warning "User is not an administrator."
-}
+Function MainUse {
+    $whoamiOutput = whoami /all
 
-$whoamiOutput = whoami /all
+    $whoamiOutput | Select-String "User Name" -Context (0, 3)
 
-$g = GetGroupMatches $whoamiOutput "Domain Admins"
+    if (IsAdministrator) {
+        Write-Host "User is an administrator."
+    } else {
+        Write-Warning "User is not an administrator."
+    }
 
-if ($g.Count -gt 0) {
-    $g | ForEach-Object { Write-Host "User is a member of" $_ }
-} else {
-    Write-Warning "User is not a member of Domain Admins."
-}
+    [array]$g = GetGroupMatches $whoamiOutput "Domain Admins"
 
-$g = GetGroupMatches $whoamiOutput "Schema Admins"
+    if ($g.Count -gt 0) {
+        $g | ForEach-Object { Write-Host "User is a member of $($_.GroupName)   $($_.SID)" }
+    } else {
+        Write-Warning "User is not a member of Domain Admins."
+    }
 
-if ($g.Count -gt 0) {
-    $g | ForEach-Object { Write-Host "User is a member of" $_ }
-} else {
-    Write-Warning "User is not a member of Schema Admins. - Only required if doing a Schema Update"
-}
+    [array]$g = GetGroupMatches $whoamiOutput "Schema Admins"
 
-$g = GetGroupMatches $whoamiOutput "Enterprise Admins"
+    if ($g.Count -gt 0) {
+        $g | ForEach-Object { Write-Host "User is a member of $($_.GroupName)   $($_.SID)" }
+    } else {
+        Write-Warning "User is not a member of Schema Admins. - Only required if doing a Schema Update"
+    }
 
-if ($g.Count -gt 0) {
-    $g | ForEach-Object { Write-Host "User is a member of" $_ }
-} else {
-    Write-Warning "User is not a member of Enterprise Admins. - Only required if doing a Schema Update or PrepareAD or PrepareDomain"
-}
+    [array]$g = GetGroupMatches $whoamiOutput "Enterprise Admins"
 
-$g = GetGroupMatches $whoamiOutput "Organization Management"
+    if ($g.Count -gt 0) {
+        $g | ForEach-Object { Write-Host "User is a member of $($_.GroupName)   $($_.SID)" }
+    } else {
+        Write-Warning "User is not a member of Enterprise Admins. - Only required if doing a Schema Update or PrepareAD or PrepareDomain"
+    }
 
-if ($g.Count -gt 0) {
-    $g | ForEach-Object { Write-Host "User is a member of" $_ }
-} else {
-    Write-Warning "User is not a member of Organization Management."
-}
+    [array]$g = GetGroupMatches $whoamiOutput "Organization Management"
 
-$p = Get-ExecutionPolicy
-if ($p -ne "Unrestricted" -and $p -ne "Bypass") {
-    Write-Warning "ExecutionPolicy is $p"
-} else {
-    Write-Host "ExecutionPolicy is $p"
-}
+    if ($g.Count -gt 0) {
+        $g | ForEach-Object { Write-Host "User is a member of $($_.GroupName)   $($_.SID)" }
+    } else {
+        Write-Warning "User is not a member of Organization Management."
+    }
 
-$products = Get-ChildItem Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products
-$packageFiles = $products | ForEach-Object { Get-ItemProperty -Path "Registry::$($_.Name)\InstallProperties" -ErrorAction SilentlyContinue } | ForEach-Object { $_.LocalPackage }
-$packagesMissing = @($packageFiles | Where-Object { (Test-Path $_) -eq $false })
+    $p = Get-ExecutionPolicy
+    if ($p -ne "Unrestricted" -and $p -ne "Bypass") {
+        Write-Warning "ExecutionPolicy is $p"
+    } else {
+        Write-Host "ExecutionPolicy is $p"
+    }
 
-if ($packagesMissing.Count -eq 0) {
-    Write-Host "No installer packages missing."
-} else {
-    Write-Warning "$($packagesMissing.Count) installer packages are missing. Please use this script to repair the installer folder:"
-    Write-Warning "https://gallery.technet.microsoft.com/office/Restore-the-Missing-d11de3a1"
-}
+    $products = Get-ChildItem Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Installer\UserData\S-1-5-18\Products
+    $packageFiles = $products | ForEach-Object { Get-ItemProperty -Path "Registry::$($_.Name)\InstallProperties" -ErrorAction SilentlyContinue } | ForEach-Object { $_.LocalPackage }
+    $packagesMissing = @($packageFiles | Where-Object { (Test-Path $_) -eq $false })
+
+    if ($packagesMissing.Count -eq 0) {
+        Write-Host "No installer packages missing."
+    } else {
+        Write-Warning "$($packagesMissing.Count) installer packages are missing. Please use this script to repair the installer folder:"
+        Write-Warning "https://gallery.technet.microsoft.com/office/Restore-the-Missing-d11de3a1"
+    }
 
-$powershellProcesses = @(Get-Process -IncludeUserName powershell)
+    $powershellProcesses = @(Get-Process -IncludeUserName powershell)
 
-if ($powershellProcesses.Count -gt 1) {
-    Write-Warning "More than one PowerShell process was found. Please close other instances of PowerShell."
-    Write-Host ($powershellProcesses | Format-Table -AutoSize | Out-String)
-} else {
-    Write-Host "No other PowerShell instances were detected."
+    if ($powershellProcesses.Count -gt 1) {
+        Write-Warning "More than one PowerShell process was found. Please close other instances of PowerShell."
+        Write-Host ($powershellProcesses | Format-Table -AutoSize | Out-String)
+    } else {
+        Write-Host "No other PowerShell instances were detected."
+    }
+
+    if (Test-PendingReboot) {
+        Write-Warning "Reboot pending."
+    } else {
+        Write-Host "No reboot pending."
+    }
+
+    Test-ExchangeAdSetupObjects
 }
 
-if (Test-PendingReboot) {
-    Write-Warning "Reboot pending."
-} else {
-    Write-Host "No reboot pending."
+Function Main {
+
+    if (![string]::IsNullOrEmpty($OtherWellKnownObjectsContainer)) {
+
+        ldifde -d $OtherWellKnownObjectsContainer -p Base -l otherWellKnownObjects -f ExchangeContainerOriginal.txt
+
+        [array]$content = Get-Content .\ExchangeContainerOriginal.txt
+
+        if ($null -eq $content -or
+            $content.Count -eq 0) {
+            throw "Failed to export ExchangeContainerOriginal.txt file"
+        }
+
+        $owkoLine = "otherWellKnownObjects:"
+        $inOwkoLine = $false
+        $outputLines = New-Object 'System.Collections.Generic.List[string]'
+        $outputLines.Add($content[0])
+        $outputLines.Add("changeType: modify")
+        $outputLines.Add("replace: otherWellKnownObjects")
+
+        Function Test-DeleteObject ([string]$TestLine) {
+
+            if ($TestLine.Contains("CN=Deleted Objects")) {
+                return $true
+            }
+
+            return $false
+        }
+
+        $index = 0
+        while ($index -lt $content.Count) {
+            $line = $content[$index++]
+
+            if ($line.Trim() -eq $owkoLine) {
+
+                if ($null -ne $testStringLine -and
+                    $null -ne $possibleAdd) {
+
+                    if (!(Test-DeleteObject $testStringLine)) {
+                        $outputLines.AddRange($possibleAdd)
+                    } else {
+                        Write-Host "Found object to remove: $testStringLine"
+                    }
+                }
+                $inOwkoLine = $true
+                $possibleAdd = New-Object 'System.Collections.Generic.List[string]'
+                $possibleAdd.Add($line)
+                [string]$testStringLine = $line
+                continue
+            }
+
+            if ($inOwkoLine) {
+                $possibleAdd.Add($line)
+                $testStringLine += $line
+            }
+
+            if ($index -eq $content.Count) {
+
+                if (!(Test-DeleteObject $testStringLine)) {
+                    $outputLines.AddRange($possibleAdd)
+                } else {
+                    Write-Host "Found object to remove: $testStringLine"
+                }
+            }
+        }
+
+        $outputLines | Out-File -FilePath "ExchangeContainerImport.txt"
+
+        Write-Host("`r`nVerify the results in ExchangeContainerImport.txt. Then run the following command:")
+        Write-Host("`tldifde -i -f ExchangeContainerImport.txt")
+        Write-Host("Run Setup.exe again afterwards.")
+        return
+    }
+
+    MainUse
 }
 
-Test-ExchangeAdSetupObjects
+Main