winrm-elevated 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e4916b2c5b46182c68c2e5e8a360fe34a7f580cc9664a93391e2e827d17eda9
-  data.tar.gz: 17b6a1f2bd0253e1b9bdd605fea6412f8afed2e0131b14f00b359f98191eb002
+  metadata.gz: 0a697d6786acdc942c9144e8c726d3727ee22983bb21351f7a19be530873ec6a
+  data.tar.gz: cfa396d8c5a62a3a3174d996dc7f30347a4c8f9913468f3d27323067ac1f12e4
 SHA512:
-  metadata.gz: 80fff66d02742310cccc2cedfb04f73610583f05240279a4b83508566aa732bd81838ab18b374f714323315f6758fabaf8913767fba6b5559874e3105f656331
-  data.tar.gz: cd94f9e5cdb2ca9ae6b8d66f0a8b05db4e94b036b6ffe309d1418d52a0fb0eb8e6ac5c512d7d4754e15f3bd67beffb7d7caa312b99cbdaf810d5a81f6f2808b1
+  metadata.gz: c76b27bacedf07dd2f525cb98e04ddbb4a045b821eff0d97575e865ade5b980e28c062d5007c39201cd8cf1ed590f9cb6db5b8d4061b721617236afbfabe2f6c
+  data.tar.gz: 79a05661830ddb4b7bcf5423c67891368dc78cdd479278b30d56bd30493f9518e0fc92b3219f8d18ef5e45ece98d05af2595047b4b7f9006ab2f4256adebf1c7

data/lib/winrm-elevated.rb

@@ -13,5 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'winrm'
+require 'winrm' unless defined?(WinRM::Connection)
 require_relative 'winrm/shells/elevated'

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

@@ -119,7 +119,17 @@ try { Remove-Item $script_file -ErrorAction Stop } catch {}
 
 $exit_code = $registered_task.LastTaskResult
 
-try { Unregister-ScheduledTask -TaskName $task_name -Confirm:$false } catch {}
+try {
+  # Clean current task
+  $folder.DeleteTask($task_name, 0)
+  # Clean old tasks if required
+  $old_tasks_filter_date = [datetime]::Now.AddSeconds(<%= -1 * execution_timeout %>)
+  $old_tasks_to_kill = $folder.GetTasks(0) | Select Name,LastRunTime | Where-Object {
+    ($_.Name -like "WinRM_Elevated_Shell*") -and ($_.LastRunTime -le $old_tasks_filter_date) -and ($_.Name -ne $task_name)
+  }
+  $old_tasks_to_kill | ForEach-Object { try { $folder.DeleteTask($_.Name, 0) } catch {} }
+}
+catch {}
 
 [System.Runtime.Interopservices.Marshal]::ReleaseComObject($schedule) | Out-Null
 

data/lib/winrm/shells/elevated.rb

@@ -14,9 +14,10 @@
 # limitations under the License.
 
 require 'erubi'
-require 'winrm'
+require 'winrm' unless defined?(WinRM::Connection)
 require 'winrm-fs'
-require 'securerandom'
+require 'securerandom' unless defined?(SecureRandom)
+require 'stringio'
 
 module WinRM
   module Shells
@@ -72,24 +73,11 @@ module WinRM
 
       def upload_elevated_shell_script(script_text)
         elevated_shell_path = 'c:/windows/temp/winrm-elevated-shell-' + SecureRandom.uuid + '.ps1'
-        with_temp_file(script_text) do |temp_file|
-          @winrm_file_transporter.upload(temp_file, elevated_shell_path)
-        end
+        script_text_with_exit = "#{script_text}\r\n$Host.SetShouldExit($LASTEXITCODE)"
+        @winrm_file_transporter.upload(StringIO.new(script_text_with_exit), elevated_shell_path)
         elevated_shell_path
       end
 
-      def with_temp_file(script_text)
-        file = Tempfile.new(%w[winrm-elevated-shell ps1])
-        file.write(script_text)
-        file.write("\r\n$Host.SetShouldExit($LASTEXITCODE)")
-        file.fsync
-        file.close
-        yield file.path
-      ensure
-        file.close
-        file.unlink
-      end
-
       def elevated_shell_script_content
         IO.read(File.expand_path('../../winrm-elevated/scripts/elevated_shell.ps1', __dir__))
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: winrm-elevated
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Shawn Neal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -134,8 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby library for running commands as elevated