smart_proxy_remote_execution_ssh 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81a9638ca473014a1f61251fa81823fb907cf725ae0b56a5921c0ad96c6b39be
-  data.tar.gz: 850685e0501af25d38a42061e1422db61b28fe99d2f56aff6edcdfd5501eb69c
+  metadata.gz: edd3c4b54f9e85e4eab99273ececb03dc221e9f96dab79cc0b2a563fb9e5c938
+  data.tar.gz: f231fd22622005ab2b478a5295af4c4d7ac8f825a56f2d83b2e14f94b9892e50
 SHA512:
-  metadata.gz: ce27e71082ff1eed48c4b32bedaf6ea6f8a2998bae010e154938b24de3704ff8297e1000ca3b75a33fc76c46593f555c10236b7a9cb38389322d65d05466cd08
-  data.tar.gz: c733a1a0a5865180b3e62a9b10d2bff8e38dca375fed0acc3a0cb80202784d0dec6b185919d00e8e096d55b8c9ef4c6353d376cc06fae99c307094123dbd6255
+  metadata.gz: d4d125a98ac8c5a615ffcf5dbef8e1f966352f414b4c077e3fe96e0d85fb5280c6f53f29d956b2e055e9dc5bf4d9dc86d262ac40ab069b20bede175efeabe1db
+  data.tar.gz: 6f4f9298569ae9360ae92c0dac359902f7471d1306570c7f1f1dda25f9e9cdf78cb9181c82d83c833bf5511e4afef75fec1c65e71d35fe43a26218a69259903f

data/lib/smart_proxy_remote_execution_ssh/api.rb

@@ -1,3 +1,6 @@
+require 'net/ssh'
+require 'base64'
+
 module Proxy::RemoteExecution
   module Ssh
 
@@ -17,6 +20,23 @@ module Proxy::RemoteExecution
         session.hijack!
         101
       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
     end
   end
 end

data/lib/smart_proxy_remote_execution_ssh/cockpit.rb

@@ -9,7 +9,8 @@ module Proxy::RemoteExecution
       extend Forwardable
 
       # The list of methods taken from OpenSSL::SSL::SocketForwarder for the object to act like a socket
-      def_delegators(:@socket, :to_io, :addr, :peeraddr, :setsockopt, :getsockopt, :fcntl, :close, :closed?, :do_not_reverse_lookup=)
+      def_delegators(:@socket, :to_io, :addr, :peeraddr, :setsockopt,
+                     :getsockopt, :fcntl, :close, :closed?, :do_not_reverse_lookup=)
 
       def initialize(socket)
         @socket = socket
@@ -29,7 +30,7 @@ module Proxy::RemoteExecution
       end
 
       def self.build(socket)
-        klass = [OpenSSLBufferedSocket, StandardBufferedSocket].find do |potential_class|
+        klass = [OpenSSLBufferedSocket, MiniSSLBufferedSocket, StandardBufferedSocket].find do |potential_class|
           potential_class.applies_for?(socket)
         end
         raise "No suitable implementation of buffered socket available for #{socket.inspect}" unless klass
@@ -57,7 +58,7 @@ module Proxy::RemoteExecution
           # To drain a SSLSocket before we can go back to the event
           # loop, we need to repeatedly call read_nonblock; a single
           # call is not enough.
-          while true
+          loop do
             res += @socket.read_nonblock(n)
           end
         rescue IO::WaitReadable
@@ -79,14 +80,31 @@ module Proxy::RemoteExecution
       end
 
       def send(mesg, flags)
-        begin
-          @socket.write_nonblock(mesg)
-        rescue IO::WaitWritable
-          0
-        rescue IO::WaitReadable
-          IO.select([@socket.to_io])
-          retry
-        end
+        @socket.write_nonblock(mesg)
+      rescue IO::WaitWritable
+        0
+      rescue IO::WaitReadable
+        IO.select([@socket.to_io])
+        retry
+      end
+    end
+
+    class MiniSSLBufferedSocket < BufferedSocket
+      def self.applies_for?(socket)
+        socket.is_a? ::Puma::MiniSSL::Socket
+      end
+      def_delegators(:@socket, :read_nonblock, :write_nonblock, :close)
+
+      def recv(n)
+        @socket.read_nonblock(n)
+      end
+
+      def send(mesg, flags)
+        @socket.write_nonblock(mesg)
+      end
+
+      def closed?
+        @socket.to_io.closed?
       end
     end
 
@@ -103,8 +121,8 @@ module Proxy::RemoteExecution
 
       def hijack!
         @socket = nil
-        if @env['WEBRICK_SOCKET']
-          @socket = @env['WEBRICK_SOCKET']
+        if @env['ext.hijack!']
+          @socket = @env['ext.hijack!'].call
         elsif @env['rack.hijack?']
           begin
             @env['rack.hijack'].call
@@ -154,7 +172,7 @@ module Proxy::RemoteExecution
               ssh.listen_to(buf_socket)
 
               ch.on_process do
-                if buf_socket.available > 0
+                if buf_socket.available.positive?
                   ch.send_data(buf_socket.read_available)
                 end
                 if buf_socket.closed?
@@ -169,7 +187,7 @@ module Proxy::RemoteExecution
 
               ch.on_request('exit-status') do |ch, data|
                 code = data.read_long
-                send_start.call if code.zero?
+                send_start if code.zero?
                 err_buf += "Process exited with code #{code}.\r\n"
                 ch.close
               end
@@ -232,12 +250,12 @@ module Proxy::RemoteExecution
       end
 
       def ssh_options
-        auth_methods = %w(publickey)
+        auth_methods = %w[publickey]
         auth_methods.unshift('password') if params["ssh_password"]
 
-        ret = { }
+        ret = {}
         ret[:port] = params["ssh_port"] if params["ssh_port"]
-        ret[:keys] = [ key_file ] if key_file
+        ret[:keys] = [key_file] if key_file
         ret[:password] = params["ssh_password"] if params["ssh_password"]
         ret[:passphrase] = params[:ssh_key_passphrase] if params[:ssh_key_passphrase]
         ret[:keys_only] = true
@@ -247,6 +265,5 @@ module Proxy::RemoteExecution
         ret
       end
     end
-
   end
 end

data/lib/smart_proxy_remote_execution_ssh/version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module RemoteExecution
     module Ssh
-      VERSION = '0.2.1'
+      VERSION = '0.3.0'
     end
   end
 end

data/lib/smart_proxy_remote_execution_ssh/webrick_ext.rb

@@ -3,7 +3,13 @@ module SmartProxyRemoteExecutionSsh
     # An extension to ::WEBrick::HTTPRequest to expost the socket object for highjacking for cockpit
     module HTTPRequestExt
       def meta_vars
-        super.merge('WEBRICK_SOCKET' => @socket)
+        super.merge('ext.hijack!' => -> {
+                      # This stops Webrick from sending its own reply.
+                      @request_line = nil;
+                      # This stops Webrick from trying to read the next request on the socket.
+                      @keep_alive = false;
+                      return @socket;
+                    })
       end
     end
   end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_remote_execution_ssh
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2020-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.82.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.82.0
 - !ruby/object:Gem::Dependency
   name: smart_proxy_dynflow
   requirement: !ruby/object:Gem::Requirement
@@ -181,8 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ssh remote execution provider for Foreman Smart-Proxy