smart_proxy_remote_execution_ssh 0.10.6 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 524c8e78e1750ce728c124861bfb6b011b93b270dc9937866c54031fe8403a16
-  data.tar.gz: 3a67985ff45e4d81b993bdba3b0f849ab4dd25588452ad97799f3b152c36ee26
+  metadata.gz: db736b4bf0a21a18f335774778041f20480f18b886669d87c9d0f902e749eb14
+  data.tar.gz: 49741c279188b7371c212949d77cb8ebe488eccde6198018c41853bdad673f33
 SHA512:
-  metadata.gz: fee698f670f8d5c7e350a05407e38be6ce7c48c492d03c1cdaccbe896fb49ea54227f672e2ae46ebc34cd142507b72b9f49ee6285b3e0a1b669398e9d37c2b1c
-  data.tar.gz: 8da52396e057f78ddaee30d67d9d8aff50306ec49d7c20b7ba5d506f806494ecc8868ff2233db9285d4e799d21202a5491108fd7a974c97de00fdf8a15821462
+  metadata.gz: 92b94f0e609c6f5485f1519a6f853f74b75de8e1efec6f93bcf52519af8f585eb6a1189c547ce606434bdccf16764704d06c4d7bf0aa42b83a990a599585cce7
+  data.tar.gz: 4b0bc9999579dda06bcbdee9d0e6e422e67441e8fc82af6ea9064d8aec843a505a8a6505ba267bfdea514f8ba6ceb772ac06db5d4b0b2db27a1268a37033231f

data/lib/smart_proxy_remote_execution_ssh/actions/pull_script.rb

@@ -22,7 +22,6 @@ module Proxy::RemoteExecution::Ssh::Actions
 
     def plan(action_input)
       super(action_input)
-      input[:with_mqtt] = Proxy::RemoteExecution::Ssh::Plugin.settings.mode == :'pull-mqtt'
     end
 
     def run(event = nil)
@@ -48,10 +47,6 @@ module Proxy::RemoteExecution::Ssh::Actions
     end
 
     def init_run
-      otp_password = if input[:with_mqtt]
-                       ::Proxy::Dynflow::OtpManager.generate_otp(execution_plan_id)
-                     end
-
       plan_event(PickupTimeout, input[:time_to_pickup], optional: true) if input[:time_to_pickup]
 
       input[:job_uuid] = 
@@ -60,14 +55,13 @@ module Proxy::RemoteExecution::Ssh::Actions
       output[:state] = READY_FOR_PICKUP
       output[:result] = []
 
-      mqtt_start(otp_password) if input[:with_mqtt]
+      mqtt_start if with_mqtt?
       suspend
     end
 
     def cleanup(_plan = nil)
       job_storage.drop_job(execution_plan_id, run_step_id)
-      Proxy::Dynflow::OtpManager.passwords.delete(execution_plan_id)
-      Proxy::RemoteExecution::Ssh::MQTT::Dispatcher.instance.done(input[:job_uuid])
+      Proxy::RemoteExecution::Ssh::MQTT::Dispatcher.instance.done(input[:job_uuid]) if with_mqtt?
     end
 
     def process_external_event(event)
@@ -131,7 +125,7 @@ module Proxy::RemoteExecution::Ssh::Actions
         # Client was notified or is already running, dealing with this situation
         # is only supported if mqtt is available
         # Otherwise we have to wait it out
-        if input[:with_mqtt]
+        if with_mqtt?
           mqtt_cancel 
           fail_msg += ', notifying the host over MQTT'
         else
@@ -144,14 +138,12 @@ module Proxy::RemoteExecution::Ssh::Actions
       suspend unless exit_code
     end
 
-    def mqtt_start(otp_password)
+    def mqtt_start
       payload = mqtt_payload_base.merge(
         content: "#{input[:proxy_url]}/ssh/jobs/#{input[:job_uuid]}",
         metadata: {
           'event': 'start',
           'job_uuid': input[:job_uuid],
-          'username': execution_plan_id,
-          'password': otp_password,
           'return_url': "#{input[:proxy_url]}/ssh/jobs/#{input[:job_uuid]}/update",
           'version': 'v1',
           'effective_user': input[:effective_user]
@@ -207,5 +199,9 @@ module Proxy::RemoteExecution::Ssh::Actions
 
       kill_run 'The job was not picked up in time'
     end
+
+    def with_mqtt?
+      ::Proxy::RemoteExecution::Ssh.with_mqtt?
+    end
   end
 end

data/lib/smart_proxy_remote_execution_ssh/api.rb

@@ -25,26 +25,9 @@ module Proxy::RemoteExecution
         end
       end
 
-      delete '/known_hosts/:name' do |name|
-        do_authorize_any
-        keys = Net::SSH::KnownHosts.search_for(name)
-        return [204] if keys.empty?
-        ssh_keys = keys.map { |key| Base64.strict_encode64 key.to_blob }
-        Net::SSH::KnownHosts.hostfiles({}, :user)
-          .map { |file| File.expand_path file }
-          .select { |file| File.readable?(file) && File.writable?(file) }
-          .each do |host_file|
-            lines = File.foreach(host_file).reject do |line|
-              ssh_keys.any? { |key| line.end_with? "#{key}\n" }
-            end
-            File.open(host_file, 'w') { |f| f.write lines.join }
-          end
-        204
-      end
-
       # Payload is a hash where
       # exit_code: Integer | NilClass
-      # output: String
+      # output: any, depends on the action consuming the data
       post '/jobs/:job_uuid/update' do |job_uuid|
         do_authorize_with_ssl_client
 
@@ -64,9 +47,11 @@ module Proxy::RemoteExecution
         do_authorize_with_ssl_client
 
         with_authorized_job(job_uuid) do |job_record|
-          Proxy::RemoteExecution::Ssh::MQTT::Dispatcher.instance.running(job_record[:uuid])
+          if Proxy::RemoteExecution::Ssh.with_mqtt?
+            Proxy::RemoteExecution::Ssh::MQTT::Dispatcher.instance.running(job_record[:uuid])
+          end
           notify_job(job_record, Actions::PullScript::JobDelivered)
-          response.headers['X-Foreman-Effective-User'] = job_record[:effective_user]
+          response.headers['X-Foreman-Effective-User'] = job_record[:effective_user] if job_record[:effective_user]
           job_record[:job]
         end
       end
@@ -94,9 +79,7 @@ module Proxy::RemoteExecution
       end
 
       def authorized_job(uuid)
-        job_record = Proxy::RemoteExecution::Ssh.job_storage.find_job(uuid) || {}
-        return job_record if authorize_with_token(clear: false, task_id: job_record[:execution_plan_uuid]) ||
-                             job_record[:hostname] == https_cert_cn
+        Proxy::RemoteExecution::Ssh.job_storage.find_job(uuid, https_cert_cn)
       end
     end
   end

data/lib/smart_proxy_remote_execution_ssh/job_storage.rb

@@ -16,8 +16,8 @@ module Proxy::RemoteExecution::Ssh
       end
     end
 
-    def find_job(uuid)
-      jobs.where(uuid: uuid).first
+    def find_job(uuid, hostname)
+      jobs.where(uuid: uuid, hostname: hostname).first
     end
 
     def job_uuids_for_host(hostname)

data/lib/smart_proxy_remote_execution_ssh/plugin.rb

@@ -40,7 +40,6 @@ module Proxy::RemoteExecution::Ssh
       require 'smart_proxy_remote_execution_ssh/api'
       require 'smart_proxy_remote_execution_ssh/actions'
       require 'smart_proxy_remote_execution_ssh/dispatcher'
-      require 'smart_proxy_remote_execution_ssh/log_filter'
       require 'smart_proxy_remote_execution_ssh/runners'
       require 'smart_proxy_remote_execution_ssh/utils'
       require 'smart_proxy_remote_execution_ssh/job_storage'
@@ -48,7 +47,7 @@ module Proxy::RemoteExecution::Ssh
       Proxy::RemoteExecution::Ssh.validate!
 
       Proxy::Dynflow::TaskLauncherRegistry.register('ssh', Proxy::Dynflow::TaskLauncher::Batch)
-      if settings.mode == :'pull-mqtt'
+      if Proxy::RemoteExecution::Ssh.with_mqtt?
         require 'smart_proxy_remote_execution_ssh/mqtt'
         # Force initialization
         Proxy::RemoteExecution::Ssh::MQTT::Dispatcher.instance

data/lib/smart_proxy_remote_execution_ssh/version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module RemoteExecution
     module Ssh
-      VERSION = '0.10.6'
+      VERSION = '0.11.0'
     end
   end
 end

data/lib/smart_proxy_remote_execution_ssh.rb

@@ -44,7 +44,7 @@ module Proxy::RemoteExecution
       end
 
       def validate_mqtt_settings!
-        return unless Plugin.settings.mode == :'pull-mqtt'
+        return unless with_mqtt?
 
         raise 'mqtt_broker has to be set when pull-mqtt mode is used' if Plugin.settings.mqtt_broker.nil?
         raise 'mqtt_port has to be set when pull-mqtt mode is used' if Plugin.settings.mqtt_port.nil?
@@ -110,6 +110,10 @@ module Proxy::RemoteExecution
       def job_storage
         @job_storage ||= Proxy::RemoteExecution::Ssh::JobStorage.new
       end
+
+      def with_mqtt?
+        Proxy::RemoteExecution::Ssh::Plugin.settings.mode == :'pull-mqtt'
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_remote_execution_ssh
 version: !ruby/object:Gem::Version
-  version: 0.10.6
+  version: 0.11.0
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-18 00:00:00.000000000 Z
+date: 2024-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -174,7 +174,6 @@ files:
 - lib/smart_proxy_remote_execution_ssh/dispatcher.rb
 - lib/smart_proxy_remote_execution_ssh/http_config.ru
 - lib/smart_proxy_remote_execution_ssh/job_storage.rb
-- lib/smart_proxy_remote_execution_ssh/log_filter.rb
 - lib/smart_proxy_remote_execution_ssh/mqtt.rb
 - lib/smart_proxy_remote_execution_ssh/mqtt/dispatcher.rb
 - lib/smart_proxy_remote_execution_ssh/multiplexed_ssh_connection.rb

data/lib/smart_proxy_remote_execution_ssh/log_filter.rb

@@ -1,14 +0,0 @@
-module Proxy::RemoteExecution::Ssh
-  class LogFilter < ::Logger
-    def initialize(base_logger)
-      @base_logger = base_logger
-    end
-
-    def add(severity, *args, &block)
-      severity ||= ::Logger::UNKNOWN
-      return true if @base_logger.nil? || severity < @level
-
-      @base_logger.add(severity, *args, &block)
-    end
-  end
-end