Skip to content

Release 2-28-23 #1521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dpaulson45 merged 2 commits into from
Feb 28, 2023
Merged

Release 2-28-23 #1521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12c2d21
Confirm-ExchangeShell function improved
lusassl-msft Feb 20, 2023
3baa470
Merge pull request #1512 from microsoft/lusassl-ConfirmExchangeShellS…
lusassl-msft Feb 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Shared/Confirm-ExchangeManagementShell.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ function Confirm-ExchangeManagementShell {
}

$level = Get-EventLogLevel | Select-Object -First 1
if ($level.GetType().Name -eq "EventCategoryObject") {
if (($level.GetType().Name -eq "EventCategoryObject") -or
(($level.GetType().Name -eq "PSObject") -and
($null -ne $level.SerializationData))) {
return $true
}

Expand Down
78 changes: 50 additions & 28 deletions Shared/Confirm-ExchangeShell.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,51 @@ function Confirm-ExchangeShell {
Write-Verbose "Calling: $($MyInvocation.MyCommand)"
Write-Verbose "Passed: LoadExchangeShell: $LoadExchangeShell"
$currentErrors = $Error.Count
$passed = $false
$edgeTransportKey = 'HKLM:\SOFTWARE\Microsoft\ExchangeServer\v15\EdgeTransportRole'
$setupKey = 'HKLM:\SOFTWARE\Microsoft\ExchangeServer\v15\Setup'
$remoteShell = (!(Test-Path $setupKey))
$toolsServer = (Test-Path $setupKey) -and (!(Test-Path $edgeTransportKey)) -and `
($null -eq (Get-ItemProperty -Path $setupKey -Name "Services" -ErrorAction SilentlyContinue))
$remoteShell = (-not(Test-Path $setupKey))
$toolsServer = (Test-Path $setupKey) -and
(-not(Test-Path $edgeTransportKey)) -and
($null -eq (Get-ItemProperty -Path $setupKey -Name "Services" -ErrorAction SilentlyContinue))
Invoke-CatchActionErrorLoop $currentErrors $CatchActionFunction

function IsExchangeManagementSession {
[OutputType("System.Boolean")]
param(
[ScriptBlock]$CatchActionFunction
)

$getEventLogLevelCallSuccessful = $false
$isExchangeManagementShell = $false

try {
$eventLogLevel = Get-EventLogLevel -ErrorAction Stop | Select-Object -First 1
$getEventLogLevelCallSuccessful = $true
foreach ($e in $eventLogLevel) {
if (($e.GetType().Name -eq "EventCategoryObject") -or
(($e.GetType().Name -eq "PSObject") -and
($null -ne $e.SerializationData))) {
$isExchangeManagementShell = $true
}
}
} catch {
Write-Verbose "Failed to run Get-EventLogLevel"
Invoke-CatchActionError $CatchActionFunction
}

return [PSCustomObject]@{
CallWasSuccessful = $getEventLogLevelCallSuccessful
IsManagementShell = $isExchangeManagementShell
}
}
}
process {
try {
$currentErrors = $Error.Count
$isEMS = Get-EventLogLevel -ErrorAction Stop |
Select-Object -First 1 |
ForEach-Object { if ($_.GetType().Name -eq "EventCategoryObject") { return $true } return $false }
$currentErrors = $Error.Count
$isEMS = IsExchangeManagementSession $CatchActionFunction
Invoke-CatchActionErrorLoop $currentErrors $CatchActionFunction
if ($isEMS.CallWasSuccessful) {
Write-Verbose "Exchange PowerShell Module already loaded."
$passed = $true
Invoke-CatchActionErrorLoop $currentErrors $CatchActionFunction
} catch {
Write-Verbose "Failed to run Get-EventLogLevel"
Invoke-CatchActionError $CatchActionFunction
} else {
if (-not ($LoadExchangeShell)) { return }

#Test 32 bit process, as we can't see the registry if that is the case.
Expand Down Expand Up @@ -70,16 +95,13 @@ function Confirm-ExchangeShell {
}

Write-Verbose "Imported Module. Trying Get-EventLogLevel Again"
try {
$isEMS = Get-EventLogLevel -ErrorAction Stop |
Select-Object -First 1 |
ForEach-Object { if ($_.GetType().Name -eq "EventCategoryObject") { return $true } return $false }
$passed = $true
$isEMS = IsExchangeManagementSession $CatchActionFunction
Invoke-CatchActionErrorLoop $currentErrors $CatchActionFunction
if (($isEMS.CallWasSuccessful) -and
($isEMS.IsManagementShell)) {
Write-Verbose "Successfully loaded Exchange Management Shell"
Invoke-CatchActionErrorLoop $currentErrors $CatchActionFunction
} catch {
Write-Verbose "Failed to run Get-EventLogLevel again"
Invoke-CatchActionError $CatchActionFunction
} else {
Write-Warning "Something went wrong while loading the Exchange Management Shell"
}
} catch {
Write-Warning "Failed to Load Exchange PowerShell Module..."
Expand All @@ -94,15 +116,15 @@ function Confirm-ExchangeShell {

$currentErrors = $Error.Count
$returnObject = [PSCustomObject]@{
ShellLoaded = $passed
ShellLoaded = $isEMS.CallWasSuccessful
Major = ((Get-ItemProperty -Path $setupKey -Name "MsiProductMajor" -ErrorAction SilentlyContinue).MsiProductMajor)
Minor = ((Get-ItemProperty -Path $setupKey -Name "MsiProductMinor" -ErrorAction SilentlyContinue).MsiProductMinor)
Build = ((Get-ItemProperty -Path $setupKey -Name "MsiBuildMajor" -ErrorAction SilentlyContinue).MsiBuildMajor)
Revision = ((Get-ItemProperty -Path $setupKey -Name "MsiBuildMinor" -ErrorAction SilentlyContinue).MsiBuildMinor)
EdgeServer = $passed -and (Test-Path $setupKey) -and (Test-Path $edgeTransportKey)
ToolsOnly = $passed -and $toolsServer
RemoteShell = $passed -and $remoteShell
EMS = $isEMS
EdgeServer = $isEMS.CallWasSuccessful -and (Test-Path $setupKey) -and (Test-Path $edgeTransportKey)
ToolsOnly = $isEMS.CallWasSuccessful -and $toolsServer
RemoteShell = $isEMS.CallWasSuccessful -and $remoteShell
EMS = $isEMS.IsManagementShell
}

Invoke-CatchActionErrorLoop $currentErrors $CatchActionFunction
Expand Down