smart_proxy_discovery_image 1.0.7 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e4dc7cb1398ac217438e11f78f53d58526a2c295
-  data.tar.gz: 1724af6417967817b778f7529996ab85a6d6650b
+SHA256:
+  metadata.gz: 249769da7939f13c7cf220e3b347613d5999a4f06ee68f81d0c930ed1494ce59
+  data.tar.gz: b746dcd6207df3f11c666d55dd215a1d14da5d8ae6b7bf710ad65f6438a971a9
 SHA512:
-  metadata.gz: b8ee13bb9505903bff9c0c989ccd2daaf6d4cec08f8efccf4b7e52759f03c4b1cd8814276c32e812d95b06831a800cc97c00f4d625482ca524c2d30e14bbc68e
-  data.tar.gz: 738479e7aebcdd9a8e2f8cc653cdc231c2bd3b9e4c112446ff2d7993fd90242eef3de427d6389021efde1d0943ec660a76078acfac0dd0a29c530ed92ed0f5eb
+  metadata.gz: 6a85568d2bb0b3ef030f413c197a7d3c04f6c168e15890c968250fc04b79a47024e2e8c3ff4c4b4f213f0b2684313301bd580eeb1b53d9ac9fa03f506ab2642e
+  data.tar.gz: 8d0e231d24fc81b5df213585b67c5ded6b64ee4f9af3cbd1e72b4fdf65ffc15c8f6375414ab83ca14fcf081aacda4b4d00f11cf35b54abca3ce1640aabfdd8fc

data/lib/smart_proxy_discovery_image/power_api.rb

@@ -15,6 +15,10 @@ module Proxy::DiscoveryImage
 
     put "/kexec" do
       body_data = request.body.read
+      # change virtual terminal out of newt screen
+      system("chvt", "2")
+      is_secureboot = system('mokutil --sb-state|grep enabled')
+      logger.debug "Secure boot is #{is_secureboot}"
       logger.debug "Initiated kexec provisioning with #{body_data}"
       log_halt(500, "kexec binary was not found") unless (kexec = which('kexec'))
       begin
@@ -22,15 +26,13 @@ module Proxy::DiscoveryImage
       rescue JSON::ParserError
         log_halt 500, "Unable to parse kexec JSON input: #{body_data}"
       end
-      logger.debug "Downloading: #{data['kernel']}"
-      if ::Proxy::HttpDownload.new(data['kernel'], '/tmp/vmlinuz').start.join != 0
-        log_halt 500, "cannot download kernel for kexec!"
-      end
-      logger.debug "Downloading: #{data['initram']}"
-      if ::Proxy::HttpDownload.new(data['initram'], '/tmp/initrd.img').start.join != 0
-        log_halt 500, "cannot download initram for kexec!"
-      end
-      run_after_response 2, kexec, "--force", "--reset-vga", "--append=#{data['append']}", "--initrd=/tmp/initrd.img", "/tmp/vmlinuz", *data['extra']
+      args = ["--debug", "--force", "--reset-vga"]
+      args << data['extra'] if data['extra']
+      args << "--kexec-file-syscall" if is_secureboot
+      args << "--append=#{data['append']}"
+      args << "--initrd=/tmp/initrd.img"
+      download_and_run_after_response data, 2, kexec, *args, "/tmp/vmlinuz"
+
       { :result => true }.to_json
     end
 
@@ -38,9 +40,9 @@ module Proxy::DiscoveryImage
     # Execute command in a separate thread after 5 seconds to give the server some
     # time to finish the request. Does *not* execute via a shell.
     def run_after_response(seconds, *command)
-      logger.debug "Power API scheduling in #{seconds} seconds: #{command.inspect}"
       Thread.start do
         begin
+          logger.debug "Power API scheduling in #{seconds} seconds: #{command.inspect}"
           sleep seconds
           logger.debug "Power API executing: #{command.inspect}"
           if (sudo = which('sudo'))
@@ -55,5 +57,32 @@ module Proxy::DiscoveryImage
         end
       end
     end
+
+    # Variant which also downloads kernel and initramdisk
+    def download_and_run_after_response(data, seconds, *command)
+      Thread.start do
+        begin
+          # download kernel and initramdisk
+          downloaded = download_file(data, 'kernel', 'vmlinuz', '/tmp') &&
+                         download_file(data, 'initram', 'initrd.img', '/tmp')
+          # wait few seconds just in case the download was fast and perform kexec
+          # only perform kexec when both locks were available to prevent subsequent request while downloading
+          run_after_response(seconds, *command) if downloaded
+        rescue Exception => e
+          logger.error "Error during command execution: #{e}"
+        end
+      end
+    end
+
+    def download_file(data, kind, name, prefix)
+      return unless data && (url = data[kind])
+
+      logger.debug "Downloading: #{url}"
+      download_thread = ::Proxy::HttpDownload.new(url, File.join(prefix, name)).start
+      logger.error("#{name} is still downloading, ignored") unless download_thread
+      download_success = download_thread.join.zero?
+      logger.error("cannot download #{name} for kexec") unless download_success
+      download_success
+    end
   end
 end

data/lib/smart_proxy_discovery_image/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module DiscoveryImage
-    VERSION = '1.0.7'
+    VERSION = '1.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_discovery_image
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.3.0
 platform: ruby
 authors:
 - Lukas Zapletal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2020-09-07 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Smart Proxy plugin providing Image API on discovered nodes. This plugin is only
@@ -30,7 +30,7 @@ files:
 - lib/smart_proxy_discovery_image/power_api.rb
 - lib/smart_proxy_discovery_image/version.rb
 - settings.d/discovery_image.yml.example
-homepage: http://github.com/theforeman/smart_proxy_discovery_image
+homepage: https://github.com/theforeman/smart_proxy_discovery_image
 licenses:
 - GPL-3.0
 metadata: {}
@@ -49,8 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: FDI API for Foreman Smart-Proxy