Skip to content

Do Admin Check in Troubleshoot-ModernSearch #937

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
Mar 15, 2022
Merged

Do Admin Check in Troubleshoot-ModernSearch #937

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
b7c19c7
Removed old comment link in Confirm-Administrator
dpaulson45 Mar 15, 2022
b464bda
Added Check for Administrator in Troubleshoot-ModernSearch
dpaulson45 Mar 15, 2022
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
6 changes: 6 additions & 0 deletions Search/Troubleshoot-ModernSearch.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ $BuildVersion = ""
. $PSScriptRoot\Troubleshoot-ModernSearch\Write\Write-Verbose.ps1
. $PSScriptRoot\Troubleshoot-ModernSearch\Write\Write-Warning.ps1

. $PSScriptRoot\..\Shared\Confirm-Administrator.ps1

$Script:ScriptLogging = "$PSScriptRoot\Troubleshoot-ModernSearchLog_$(([DateTime]::Now).ToString('yyyyMMddhhmmss')).log"

try {
Expand Down Expand Up @@ -246,6 +248,10 @@ Function Main {
}

try {
if (-not (Confirm-Administrator)) {
Write-Warning "The script needs to be executed in elevated mode. Start the Exchange Management Shell as an Administrator."
exit
}
Out-File -FilePath $Script:ScriptLogging -Force | Out-Null
Write-ScriptOutput "Starting Script At: $([DateTime]::Now)" -Diagnostic
Write-ScriptOutput "Build Version: $BuildVersion" -Diagnostic
Expand Down
8 changes: 1 addition & 7 deletions Shared/Confirm-Administrator.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.

#https://github.com/dpaulson45/PublicPowerShellFunctions/blob/master/src/Common/Confirm-Administrator/Confirm-Administrator.ps1
#v21.01.22.2212
Function Confirm-Administrator {
$currentPrincipal = New-Object Security.Principal.WindowsPrincipal( [Security.Principal.WindowsIdentity]::GetCurrent() )

if ($currentPrincipal.IsInRole( [Security.Principal.WindowsBuiltInRole]::Administrator )) {
return $true
} else {
return $false
}
return $currentPrincipal.IsInRole( [Security.Principal.WindowsBuiltInRole]::Administrator )
}