smart_proxy_discovery_image 1.0.9 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aaf0f3ab7f898a908612d91c5facd39e1956112b
-  data.tar.gz: 55bdee44f8dbbd6b5431f20b34624063ab665dfc
+SHA256:
+  metadata.gz: 43314999e259f9fc1687fc4eb31dce1293010ed14a59d77e343ac0b7491cf503
+  data.tar.gz: 91f710c0e4698dc382ea2a5eda4732796b8cb2002de389d4ad0ca189179296bb
 SHA512:
-  metadata.gz: 48373330b8a7d67d78228abfb6381a3a2155f3155611f60fb08fb9ef8f306a837d1f8bae5f1e22ed3835df3cb63a8b8b02685328952f647dbcaf121779600d20
-  data.tar.gz: b18091252c9616cab41674aef1dba44eb5f4e0fd1a6f66aa24d6807c5f8a419e968cddda751095003a00698d26252c534503433e8f0f769e81c8a4ceaf148f20
+  metadata.gz: eca1ddeaefcabec8bbd22005b264bea797976c5cce1e660d04d54d48dae255d9fad0129a51f2d32b999766cde12514770d31b6b431432c687820e45b665e7afc
+  data.tar.gz: b7f5dcddcbe845fd055df2e7fb540b03691906c52f66b6d80298b84fd85055cccbcee0b029dbfa17dfbe71bc3f72116798229ee0da9baaea9dadad834c2c3097

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,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, "--debug", "--force", "--reset-vga", "--append=#{data['append']}", "--initrd=/tmp/initrd.img", "/tmp/vmlinuz", *data['extra']
+      args = ["--debug", "--force"]
+      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
 
@@ -40,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'))
@@ -57,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.9'
+    VERSION = '1.3.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_discovery_image
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.3.1
 platform: ruby
 authors:
 - Lukas Zapletal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2020-10-23 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