From e208ca2a6eaf26ee316b32c64aff4105427394c8 Mon Sep 17 00:00:00 2001
From: Rob Reynolds <ferventcoder@gmail.com>
Date: Tue, 3 Jan 2017 22:05:38 -0600
Subject: [PATCH] (GH-1126) Start-ChocolateyProcess no elevate when admin

When calling Start-ChocolateyProcessAsAdmin from an already elevated
process, there is no reason to attempt to elevate the process.
---
 .../Start-ChocolateyProcessAsAdmin.ps1        | 47 ++++++++++++++-----
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/src/chocolatey.resources/helpers/functions/Start-ChocolateyProcessAsAdmin.ps1 b/src/chocolatey.resources/helpers/functions/Start-ChocolateyProcessAsAdmin.ps1
index 9294b317b0..b131677756 100644
--- a/src/chocolatey.resources/helpers/functions/Start-ChocolateyProcessAsAdmin.ps1
+++ b/src/chocolatey.resources/helpers/functions/Start-ChocolateyProcessAsAdmin.ps1
@@ -115,7 +115,17 @@ param(
 
   Write-FunctionCallLogMessage -Invocation $MyInvocation -Parameters $PSBoundParameters
 
-  try{
+  $alreadyElevated = $false
+  if (Test-ProcessAdminRights) {
+    $alreadyElevated = $true  
+  }
+
+  $dbMessagePrepend = "Elevating permissions and running"
+  if (!$elevated) {
+    $dbMessagePrepend = "Running"
+  }
+
+  try {
     if ($exeToRun -ne $null) { $exeToRun = $exeToRun -replace "`0", "" }
     if ($statements -ne $null) { $statements = $statements -replace "`0", "" }
   } catch {
@@ -126,6 +136,24 @@ param(
   if ($wrappedStatements -eq $null) { $wrappedStatements = ''}
 
   if ($exeToRun -eq 'powershell') {
+  if ($alreadyElevated) {
+        $block = @"
+      try {
+        $statements
+      } catch {
+       throw
+      }
+"@
+  
+      & $block
+      $scriptSuccess = $?
+      if (-not $scriptSuccess) {
+        return 1
+      }
+
+      return 0
+    }
+
     $exeToRun = "$($env:SystemRoot)\System32\WindowsPowerShell\v1.0\powershell.exe"
     $importChocolateyHelpers = "& import-module -name '$helpersPath\chocolateyInstaller.psm1' -Verbose:`$false | Out-Null;"
     $block = @"
@@ -144,23 +172,18 @@ param(
       }
 "@
     $encoded = [Convert]::ToBase64String([System.Text.Encoding]::Unicode.GetBytes($block))
-    $wrappedStatements = "-NoProfile -ExecutionPolicy bypass -EncodedCommand $encoded"
+    $wrappedStatements = "-NoLogo -NonInteractive -NoProfile -ExecutionPolicy Bypass -InputFormat Text -OutputFormat Text -EncodedCommand $encoded"
     $dbgMessage = @"
-Elevating Permissions and running powershell block:
+$dbMessagePrepend powershell block:
 $block
 This may take a while, depending on the statements.
 "@
+
   }
   else
   {
     $dbgMessage = @"
-Elevating Permissions and running [`"$exeToRun`" $wrappedStatements]. This may take a while, depending on the statements.
-"@
-  }
-
-  if (!$elevated) {
-  $dbgMessage = @"
-Running [`"$exeToRun`" $wrappedStatements]. This may take a while, depending on the statements.
+$dbMessagePrepend [`"$exeToRun`" $wrappedStatements]. This may take a while, depending on the statements.
 "@
   }
 
@@ -225,7 +248,7 @@ Running [`"$exeToRun`" $wrappedStatements]. This may take a while, depending on
   $process.StartInfo.UseShellExecute = $false
   $process.StartInfo.WorkingDirectory = $workingDirectory
 
-  if ($elevated -and [Environment]::OSVersion.Version -ge (New-Object 'Version' 6,0)){
+  if ($elevated -and -not $alreadyElevated -and [Environment]::OSVersion.Version -ge (New-Object 'Version' 6,0)){
     # this doesn't actually currently work - because we are not running under shell execute
     Write-Debug "Setting RunAs for elevation"
     $process.StartInfo.Verb = "RunAs"
@@ -266,7 +289,7 @@ Running [`"$exeToRun`" $wrappedStatements]. This may take a while, depending on
     }
   }
 
-  Write-Debug "Finishing 'Start-ChocolateyProcessAsAdmin'"
+  Write-Debug "Finishing '$($MyInvocation.InvocationName)'"
 
   return $exitCode
 }