smart_proxy_discovery_image 1.1.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33b1e050b42bfdaa738931d647c63a8a57ba82d264770fe3713a377ee8d26761
-  data.tar.gz: 3c7f7b8d0ec6a82eff559184537c1d207fd317d0e83ea4e91f86cac2100758b2
+  metadata.gz: 06fb066da89eca96661970388bb0588b3076f00689879ff7ece68105b30fcc85
+  data.tar.gz: 187d75b1483efebe1bdae04712313feb6f3476d881c6e090274f676ad930e55d
 SHA512:
-  metadata.gz: 79c394795be0c33935ef82f2396f77fefe8158a151501235544ae5ec6781cb7b31431477e1daa96ede830e8a8dd7a3deed9375b17a44b0c8c7336bfc683ea60c
-  data.tar.gz: c11681c80e5381cc7a0494497dd9e19337b768b404cd47395f77e81503e38ec4d527ddafe6c7d68dc8881fa1da2079dc35485cc84408bd7f847050a087ae3de3
+  metadata.gz: b34e23f7f4feef89fa9ddbd02614e3bab7c1e14fc54a5ea204ac0b430b27855e1ac4bda0bbf1b94fcf55c8599c74a2103e4b48644f58be97cc8564b8c0a481ed
+  data.tar.gz: f07f7622707f201e003f65f3e98b0cbb94aa380115d05ca08561b44d16820570dc47409a3db12e4dda6a7509601de200666ad91713d598720f29640ae2e65398

data/lib/smart_proxy_discovery_image/power_api.rb

@@ -17,6 +17,8 @@ module Proxy::DiscoveryImage
       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
@@ -24,15 +26,18 @@ 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!"
+      args = ["--debug", "--force"]
+      extra = data['extra']
+      if extra && extra.is_a?(String)
+        args << extra
+      elsif extra && extra.is_a?(Array)
+        args.concat(extra)
       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, "--debug", "--force", "--append=#{data['append']}", "--initrd=/tmp/initrd.img", "/tmp/vmlinuz", *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
 
@@ -40,9 +45,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'))
@@ -57,5 +62,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.1.0'
+    VERSION = '1.3.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_discovery_image
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Lukas Zapletal
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-03 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Smart Proxy plugin providing Image API on discovered nodes. This plugin is only
@@ -34,7 +34,7 @@ homepage: https://github.com/theforeman/smart_proxy_discovery_image
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -49,8 +49,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: FDI API for Foreman Smart-Proxy
 test_files: []