smart_proxy_remote_execution_ssh 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da4cc9f46c877bbc7fc4e92db5dc13f140cbf59de86a0709749d67eaeceeaa46
-  data.tar.gz: f8192bcda0fdd9635a0616bf2668a4eac0376d5e026f07c2652d353f7b06addf
+  metadata.gz: 23a2d152196372a661f4788b593868ddeb3aaa408d1b622fbbc41c762cde2c7d
+  data.tar.gz: f6081d78eb8016ef1ad8b8a3adf7c8952b994e366fad8bc91abed23c23a75627
 SHA512:
-  metadata.gz: eb11312a369159202095cb7a3f5c215c3d83755ebd279f6d8d1eb43e3bb5cbe9c9a8cd81075a2903a4a8cd8c1475b0e823610a6d4c5065d2b489483240f48b5a
-  data.tar.gz: 57f7e5684a6649be4d02d51f18b4988c4826fb486fe7bb31bfa8a6ffb0b9124182dd3100148fbe3d46d771d687eaf56940d7d6b0ae8ba16ef025cb9c3d3c4056
+  metadata.gz: 01f151538512f347c78f63f00f1cdf4ce8a8b05eb37d6737ace35785f824f764d19c20df14fc2bef2b446dd4d4dd77864c4754fab09e52aa28e67552d8cce441
+  data.tar.gz: f81529cc8c157c3ac838c8235763ef80f5f1a964ba6457cde1d93bef1c376bfec3eeeaca594a516fd10e33ce7a4594a4f233428488d678954fbf8b6cc9285a1e

data/README.md

@@ -37,6 +37,9 @@ Install the dependencies
 
     $ bundle
 
+SSH push jobs and Cockpit sessions require the OpenSSH client commands `ssh` and
+`ssh-keygen`. Password and key passphrase authentication also require `sshpass`.
+
 ## Usage
 
 To configure this plugin you can use template from settings.d/remote_execution_ssh.yml.example.

data/lib/smart_proxy_remote_execution_ssh/api.rb

@@ -1,4 +1,3 @@
-require 'net/ssh'
 require 'base64'
 require 'smart_proxy_dynflow/runner'
 

data/lib/smart_proxy_remote_execution_ssh/utils.rb

@@ -4,7 +4,8 @@ module Proxy::RemoteExecution
   module Utils
     class << self
       def prune_known_hosts!(hostname, port, logger = Logger.new($stdout))
-        return if Net::SSH::KnownHosts.search_for(hostname).empty?
+        known_hosts = File.expand_path('~/.ssh/known_hosts')
+        return unless File.file?(known_hosts)
 
         target = if port == 22
                    hostname
@@ -12,12 +13,10 @@ module Proxy::RemoteExecution
                    "[#{hostname}]:#{port}"
                  end
 
-        Open3.popen3('ssh-keygen', '-R', target) do |_stdin, stdout, _stderr, wait_thr|
-          wait_thr.join
-          stdout.read
-        end
+        _stdout, stderr, status = Open3.capture3('ssh-keygen', '-R', target, '-f', known_hosts)
+        logger.warn("Could not remove #{target} from known_hosts: #{stderr.strip}") unless status.success?
       rescue Errno::ENOENT => e
-        logger.warn("Could not remove #{hostname} from know_hosts: #{e}")
+        logger.warn("Could not remove #{target} from known_hosts: #{e}")
       end
     end
   end

data/lib/smart_proxy_remote_execution_ssh/version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module RemoteExecution
     module Ssh
-      VERSION = '1.0.4'
+      VERSION = '1.0.5'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_remote_execution_ssh
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Ivan Nečas
@@ -85,54 +85,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.82.0
+        version: 1.28.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.82.0
+        version: 1.28.0
 - !ruby/object:Gem::Dependency
-  name: ed25519
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: bcrypt_pbkdf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: smart_proxy_dynflow
   requirement: !ruby/object:Gem::Requirement
@@ -153,20 +133,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: mqtt
   requirement: !ruby/object:Gem::Requirement
@@ -233,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Ssh remote execution provider for Foreman Smart-Proxy
 test_files: []