winrm-elevated 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f2b2fca8293f26ddc26ca6f68a1d2b69ced5ef8be217aed74600e2acb2857ba
-  data.tar.gz: acb00e26cab830dac9e99243b45cd2540862126cbc36fea58b291622c013e266
+  metadata.gz: e5c9bfe856756ffb48cf79dc0607bf52d9adccb9dd310220337b8410740b8993
+  data.tar.gz: 4c12a53e2641725ce24e95c60d5efed248477f6176151ec4920d9d080284d13d
 SHA512:
-  metadata.gz: f65ffee1e0df126f9a4c68477213a527c29bf5c7c220adae4dd49bb09c6d2270086a48833f532e4a320d05d0019a3968fedac2e5fa0c673962131694a053a97a
-  data.tar.gz: 51de3fab0da1486447b18c3996f7ec10640d1e9113142ccbb965da7a33c4b749d76b5965a4c1503bda11e52414d93c6f166399b156120bc141e344372bdc569d
+  metadata.gz: 642b27dfba98db6686b52869737ea9876ed6c4e002e878484277851a793d07ddd00193430f946d8141d8d90a1bbd16dd61b8eae51a183f8bb7b5cb8391853376
+  data.tar.gz: 46040a6e7f2d8004b76c4f442628776949003d718a46c41f3916ba75942a8a478ce018ab69171e3a885db00aedadb30b9b3789158026a9cb7dea7b47850a65c4

data/lib/winrm-elevated/scripts/elevated_shell.ps1

@@ -16,7 +16,7 @@ if($interactive -eq 'true') {
   $logon_type_xml = "<LogonType>InteractiveTokenOrPassword</LogonType>"
 }
 
-$task_name = "WinRM_Elevated_Shell"
+$task_name = "WinRM_Elevated_Shell_" + (New-Guid).Guid
 $out_file = [System.IO.Path]::GetTempFileName()
 $err_file = [System.IO.Path]::GetTempFileName()
 
@@ -97,11 +97,13 @@ function SlurpOutput($file, $cur_line, $out_type) {
 
 $err_cur_line = 0
 $out_cur_line = 0
+$timeout = <%= execution_timeout %>
+$startDate = Get-Date
 do {
   Start-Sleep -m 100
   $out_cur_line = SlurpOutput $out_file $out_cur_line 'out'
   $err_cur_line = SlurpOutput $err_file $err_cur_line 'err'
-} while (!($registered_task.state -eq 3))
+} while( (!($registered_task.state -eq 3)) -and ($startDate.AddSeconds($timeout) -gt (Get-Date)) )
 
 # We'll make a best effort to clean these files
 # But a reboot could possibly end the task while the process
@@ -111,6 +113,9 @@ try { Remove-Item $err_file -ErrorAction Stop } catch {}
 try { Remove-Item $script_file -ErrorAction Stop } catch {}
 
 $exit_code = $registered_task.LastTaskResult
+
+try { Unregister-ScheduledTask -TaskName $task_name -Confirm:$false } catch {}
+
 [System.Runtime.Interopservices.Marshal]::ReleaseComObject($schedule) | Out-Null
 
 exit $exit_code

data/lib/winrm/shells/elevated.rb

@@ -33,6 +33,7 @@ module WinRM
         @interactive_logon = false
         @shell = Powershell.new(connection_opts, transport, logger)
         @winrm_file_transporter = WinRM::FS::Core::FileTransporter.new(@shell)
+        @execution_timeout = 86_400
       end
 
       # @return [String] The admin user name to execute the scheduled task as
@@ -44,6 +45,9 @@ module WinRM
       # @return [Bool] Using an interactive logon
       attr_accessor :interactive_logon
 
+      # @return [Integer] Timeout for the task to be executed
+      attr_accessor :execution_timeout
+
       # Run a command or PowerShell script elevated without any of the
       # restrictions that WinRM puts in place.
       #
@@ -95,7 +99,8 @@ module WinRM
           username: username,
           password: password,
           script_path: script_path,
-          interactive_logon: interactive_logon
+          interactive_logon: interactive_logon,
+          execution_timeout: execution_timeout
         }
 
         b = binding

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: winrm-elevated
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Shawn Neal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2020-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi