RubyGems - cucumber-sshd - Versions diffs - 1.1.1 → 2.0.0.pre4 - Mend

cucumber-sshd 1.1.1 → 2.0.0.pre4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

checksums.yaml +5 -5
data/lib/cucumber/sshd/cucumber.rb +18 -12
data/lib/cucumber/sshd/server.rb +108 -96
data/lib/cucumber/sshd/version.rb +1 -1
metadata +27 -14

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 321a4a141c1314bef669e2deafa3204f4eb34c42
-  data.tar.gz: 8f60fe0b843ac59113362ac7acb8f4bea807dfa2
+SHA256:
+  metadata.gz: 8e13ed3049d6552756a9416a4ea6273b152045a0685cc47c8e571301dbd65676
+  data.tar.gz: dbdd82943fc074916e47a1863c889cf8169185c42658026ee5f43cade2b99337
 SHA512:
-  metadata.gz: 7cb263a11ea35d808abcb98f7ffd7bd79f9fa67bbb378556e8db8752595f22ce359d39d46fcae4e3b4a9454bc7e8b8eb3410afe4f15a198e455f0c250c11c4a2
-  data.tar.gz: ddb13966299aee8cf69c790c5b0628a58f951a486a7814b6aa38c180289a61c3cf382e354ee7241c0fff7c0275a82888cc2b967fbe8e4f5fe1ae5f2f5fe1af56
+  metadata.gz: c88bdb30b7fa9d598bc325e3e220217b187e498d523960a3b424afa83feec0285c45db317082654d62adbb6ef25e01ebe1c09cca40ea51d17c9dc3bcf433049c
+  data.tar.gz: 3056bf120c760512aca97f1d2f038f4e16180d1fef2de886d257994046e23ad96db0584c2619f983ab4917cb45b527b90a3bdb46327d9130db7344473c9f82e4

data/lib/cucumber/sshd/cucumber.rb CHANGED Viewed

@@ -1,21 +1,27 @@
 require 'cucumber/sshd/server'
-Before('@sshd') do
-  start_server = proc do
-    Cucumber::SSHD::Server.start(expand_path('.'), wait_ready: @_sshd_wait_ready)
+Before '@sshd' do
+  start_server = -> do
+    Cucumber::SSHD::Server.start \
+      home:       ENV.fetch('CUCUMBER_SSHD_HOME', 'tmp/home'),
+      addr:       ENV.fetch('CUCUMBER_SSHD_LISTEN', '::1'),
+      port:       ENV.fetch('CUCUMBER_SSHD_PORT', 2222),
+      debug:      ENV.key?('CUCUMBER_SSHD_DEBUG'),
+      persist:    ENV.key?('CUCUMBER_SSHD_PERSIST'),
+      wait_ready: ENV.key?('CUCUMBER_SSHD_WAIT_READY')
   end
-  if @_sshd_fast && !$_sshd
-    unless $_sshd
-      $_sshd = start_server.call
-      at_exit { $_sshd.stop }
-    end
-    @_sshd = $_sshd
+  if !$_sshd && ENV.key?('CUCUMBER_SSHD_PERSIST')
+    $_sshd = start_server.call
+    at_exit { $_sshd.stop }
+  elsif !$_sshd
+    $_sshd = start_server.call
   else
-    @_sshd = start_server.call
+    $_sshd.configure
+    $_sshd.start unless ENV.key? 'CUCUMBER_SSHD_PERSIST'
   end
 end
-After('@sshd') do
-  @_sshd.stop unless @_sshd_fast
+After '@sshd' do
+  $_sshd.stop unless ENV.key? 'CUCUMBER_SSHD_PERSIST'
 end

data/lib/cucumber/sshd/server.rb CHANGED Viewed

@@ -1,149 +1,161 @@
-require 'aruba/api'
 module Cucumber
   module SSHD
     class Server
-      include Aruba::Api
-      HOST                  = 'some_host.test'
-      PORT                  = 2222
-      COMMAND               = '/usr/sbin/sshd'
-      COMMAND_ARGS          = '-Deq'
-      KEY_PATH              = 'etc/ssh_host_rsa_key'
-      KEY_PUB_PATH          = KEY_PATH.dup << '.pub'
-      SSHD_CONFIG_PATH      = 'etc/sshd_config'
-      SSH_CONFIG_PATH       = '.ssh/config'
-      SSH_KNOWN_HOSTS_PATH  = '.ssh/known_host'
+      HOST                  = 'some_host.test'.freeze
+      HOSTNAME              = 'localhost'.freeze
+      COMMAND               = '/usr/sbin/sshd'.freeze
+      COMMAND_ARGS          = '-Deq'.freeze
+      COMMAND_ARGS_DEBUG    = '-De'.freeze
+      KEY_PATH              = 'etc/ssh_host_rsa_key'.freeze
+      KEY_PUB_PATH          = [KEY_PATH, '.pub'].join.freeze
+      SSHD_CONFIG_PATH      = 'etc/sshd_config'.freeze
+      SSH_CONFIG_PATH       = '.ssh/config'.freeze
+      SSH_KNOWN_HOSTS_PATH  = '.ssh/known_hosts'.freeze
       SFTP_SERVER_PATHS     = %w[
         /usr/libexec/sftp-server
         /usr/lib/openssh/sftp-server
-      ]
+      ].freeze
+      KEY = <<-eoh.freeze
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIJbQy3yg9iU4xFvia9DWKWuhMzI5QGncR6OUldAOSIe7oAoGCCqGSM49
+AwEHoUQDQgAEJpS8Sknl2X6PNurToQCNu5lX/scaJLr3FkiufD+p67epbwIjiyzo
+qnLMVQddVitzQP7LEhXbNUuUAzEMfA6rAA==
+-----END EC PRIVATE KEY-----
+      eoh
+      KEY_PUB =
+        'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNT' \
+        'YAAABBBCaUvEpJ5dl+jzbq06EAjbuZV/7HGiS69xZIrnw/qeu3qW8CI4ss6KpyzFUH' \
+        'XVYrc0D+yxIV2zVLlAMxDHwOqwA='
       class << self
-        def start(*args)
-          server = new(args.shift, *args)
-          server.make_env
+        def start *args
+          server = new args.shift, *args
+          server.configure
           server.start
           server
         end
       end
-      attr_accessor :base_path, :host, :port, :pid
+      attr_reader :home
-      def initialize(base_path, wait_ready: false)
-        @base_path  = base_path
-        @host       = ENV['SSHD_TEST_HOST'] ? ENV['SSHD_TEST_HOST'] : HOST
-        @port       = ENV['SSHD_TEST_PORT'] ? ENV['SSHD_TEST_PORT'] : PORT
-        @pid        = nil
+      def initialize(
+        home:, addr:, port:, debug: false, persist: false, wait_ready: false
+      )
+        @home       = home
+        @addr       = addr
+        @port       = port
+        @debug      = debug
+        @persist    = persist
         @wait_ready = wait_ready
       end
-      def command
-        "#{COMMAND} -f #{SSHD_CONFIG_PATH} #{COMMAND_ARGS}"
-      end
-      def wait_ready?
-        !!@wait_ready
+      def configure
+        %w[etc .ssh].map { |e| create_dir_secure e }
+        configure_server
+        configure_client
       end
       def start
-        cd '.' do
+        Dir.chdir home do
           @pid = fork do
-            $stderr.reopen '/dev/null'
+            $stderr.reopen '/dev/null' unless debug?
             exec command
           end
+          if debug?
+            sleep 0.05
+            fail "`#{command}` failed" if Process.waitpid pid, Process::WNOHANG
+          end
         end
+        print_server_info if debug?
         wait_ready! if wait_ready?
       end
-      def wait_ready!
-        TCPSocket.new 'localhost', port
-      rescue Errno::ECONNREFUSED
-        sleep 0.05
-        retry
-      end
       def stop
-        Process.kill('TERM', pid)
-        Process.wait(pid)
+        Process.kill 'TERM', pid
+        Process.wait pid
       end
-      def make_env
-        %w[etc .ssh].map { |e| create_dir_secure e }
+    private
-        write_file_secure KEY_PATH, <<-eoh
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA7EVDKeM7NYCGGVJw0wWLGCoptMFSR7DobhbEx2bAQbWDLFBF
-7S9bXpW/ddebFA4GBkHVriNPwu/IGjIgO3tivVcy6iguNKdYRABlSfpeAs+OdCzK
-hyEWhmKnFMZs2MhPiJg/KUep2gFZLoEcs9vkk37+cLcuUVkXVOSPXlYCuHjgkwaN
-9ij/KvCcLP4tw83H3Pyh1Wn/Y4k1+3nWN2S3RgRHF9RjEx7nm2FmXcZq1wygPe5G
-2bQNvZKykL+wlKIHwKiM4AWpVClczOiljNv9KROhGWanIZNNBIDTnikxFvY0FyoP
-1qvRrE8BlqxNeyG/vYNmXsv8xpO0MOF65z3d2QIDAQABAoIBAHL8dmZxX0R3i0vR
-knUwsnQNOQTuPPQFBelmDViaCiEwjGlJm+6F6KrMqERarO+Cr63l5m98YfoWJkWR
-dZxdPT22rWHGMk6PzuYxZxoszgoCJ2skzWAcW1EFvBjhROHwAr0Qk1Ssut4NX/DB
-B04FS2X5HS2QCOuwNymqnpejtmk+A2hv9bGVzj0X614gX3h5+0dImGrYE0Lu+Abf
-5fvWhN5nxgK5CVlU7WM09WxyHj9lBXI+W2dgTl6w3QJfBBQTkarLmDpwIeErq9xc
-al2qHj60nYC+RdFopuLfJWKiObdKRFpuPFYKbTA9nJz9T61zAF+LaDZ1mvdTuQmz
-jJEJ0nECgYEA+o2uJcDOCD2LBp2LqeQcGk1PrFLpSQ5921B10SxDWhygs2+UlBCW
-7t/qurqjEUZ91l3TAlUM7ViB/EkXk/xWJRJCzlmWRXfht9LPQTWlnDox/w8uSV2g
-3VwPx1xpju2PHO7Vsk6dsQsyoro14qNhYa9m1lBHA1TtJ/RLWauvnmUCgYEA8WgZ
-MthPXi/clDg2DlROGOEWd7WgaErEz578HWnegcMrHb8RV/XW21CO2UegHykzUlxz
-vJxAqhQeKJbP7T8uzuCZnkZqBqPh5PJT1XqxZibTeQvqYLzbIiKqmDrZWuRJvbLL
-kPxwYEG8R8nl9Dk1tLHuTQWWa5Q49he1cDss4GUCgYEA7WMBRZnIW3xb1Xe9VMjg
-a3cmbqHbj7FgQ0OXbQigA6euBnRIdITHTCnxDtw4Fe0Q2uLoQoRsjA/YkDx8T2S8
-BcGodDPjMYxk2rKsVR9L+poUtpEejLpd6H0KIhwHkzi26HXNGHRt6ckvP4hn94RO
-hqwWJiXHMnvrenh2T85fxRUCgYEA7m06NhWejhAHc/zwpsZtO/VUE3e3rknqiIUl
-zIc71D3G3+JOZunQA1xVOhSb+SrgHYBibu6Ej3a/MqeBRXkZ6gm6r7AsF9LU0SLl
-2fsMKzA9vVgfbNwaMmS6yQ+WjUbb7hghJlmtQ+So6N5n2AaJHKaADmJuZmJGwAg6
-k1ZexGECgYAFc+GjjFOPxC+Qg6z8261PnDffBK0o+0/EIq3cGA7Cp5pEo/hhMjDl
-W7CLjAGkok9W+rr9XwwXWCBuJmPh2jYeNaQljrHt9hIAOAxoYdbweb9oSo5SkcHv
-iDjcFK8S1e5vnlZAh9xH1WMCEsaz1WNqWm7CZOayN2LFn6Ed9seYYg==
------END RSA PRIVATE KEY-----
-        eoh
+      attr_reader :addr, :port, :debug, :persist, :wait_ready, :pid
-        write_file_secure KEY_PUB_PATH, <<-eoh
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsRUMp4zs1gIYZUnDTBYsYKim0wVJHsOhuFsTHZsBBtYMsUEXtL1telb9115sUDgYGQdWuI0/C78gaMiA7e2K9VzLqKC40p1hEAGVJ+l4Cz450LMqHIRaGYqcUxmzYyE+ImD8pR6naAVkugRyz2+STfv5wty5RWRdU5I9eVgK4eOCTBo32KP8q8Jws/i3Dzcfc/KHVaf9jiTX7edY3ZLdGBEcX1GMTHuebYWZdxmrXDKA97kbZtA29krKQv7CUogfAqIzgBalUKVzM6KWM2/0pE6EZZqchk00EgNOeKTEW9jQXKg/Wq9GsTwGWrE17Ib+9g2Zey/zGk7Qw4XrnPd3Z
+      def command
+        [
+          COMMAND,
+          '-f',
+          SSHD_CONFIG_PATH,
+          (debug? ? COMMAND_ARGS_DEBUG : COMMAND_ARGS)
+        ].join ' '
+      end
+      def configure_client
+        write_file_secure SSH_CONFIG_PATH, <<-eoh
+Host                    #{HOST}
+  HostName              #{HOSTNAME}
+  Port                  #{port}
+  UserKnownHostsFile    #{File.expand_path home}/#{SSH_KNOWN_HOSTS_PATH}
         eoh
+        write_file_secure SSH_KNOWN_HOSTS_PATH, "[#{HOSTNAME}]:2222 #{KEY_PUB}"
+      end
+      def configure_server
+        write_file_secure KEY_PATH, KEY
+        write_file_secure KEY_PUB_PATH, KEY_PUB
         write_file_secure SSHD_CONFIG_PATH, <<-eoh
 Port #{port}
-ListenAddress ::1
+ListenAddress #{addr}
 Protocol 2
-HostKey #{File.expand_path base_path}/#{KEY_PATH}
+HostKey #{File.expand_path home}/#{KEY_PATH}
 PidFile /dev/null
 UsePrivilegeSeparation no
 Subsystem sftp #{sftp_server_path}
-ForceCommand HOME=#{File.expand_path base_path} sh -c "cd ~; [ -f .ssh/rc ] && . .ssh/rc; $SSH_ORIGINAL_COMMAND"
+ForceCommand HOME=#{File.expand_path home} sh -c "cd ~; [ -f .ssh/rc ] && . .ssh/rc; $SSH_ORIGINAL_COMMAND"
         eoh
+      end
-        write_file_secure SSH_CONFIG_PATH, <<-eoh
-Host                    #{host}
-  HostName              localhost
-  Port                  #{port}
-  UserKnownHostsFile    #{File.expand_path base_path}/#{SSH_KNOWN_HOSTS_PATH}
-        eoh
+      def create_dir_secure path
+        FileUtils.mkdir_p File.join(home, path), mode: 0700
+      end
-        write_file_secure SSH_KNOWN_HOSTS_PATH, <<-eoh
-[localhost]:2222 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsRUMp4zs1gIYZUnDTBYsYKim0wVJHsOhuFsTHZsBBtYMsUEXtL1telb9115sUDgYGQdWuI0/C78gaMiA7e2K9VzLqKC40p1hEAGVJ+l4Cz450LMqHIRaGYqcUxmzYyE+ImD8pR6naAVkugRyz2+STfv5wty5RWRdU5I9eVgK4eOCTBo32KP8q8Jws/i3Dzcfc/KHVaf9jiTX7edY3ZLdGBEcX1GMTHuebYWZdxmrXDKA97kbZtA29krKQv7CUogfAqIzgBalUKVzM6KWM2/0pE6EZZqchk00EgNOeKTEW9jQXKg/Wq9GsTwGWrE17Ib+9g2Zey/zGk7Qw4XrnPd3Z
-        eoh
+      def debug?
+        !!debug
       end
+      def persist?
+        !!persist
+      end
-      private
+      def print_server_info
+        puts <<-eoh
+CUCUMBER SSHD STARTING ---------------------------------------------------------
+HOME:       #{home}
+LISTEN:     #{addr}:#{port}
+PERSIST:    #{persist}
+WAIT_READY: #{wait_ready}
+--------------------------------------------------------------------------------
+        eoh
+      end
-      def write_file_secure(path, content)
-        write_file path, content
-        chmod 0600, path
+      def sftp_server_path
+        SFTP_SERVER_PATHS.detect { |e| File.exist? e }
+      end
+      def wait_ready!
+        TCPSocket.new HOSTNAME, port
+      rescue Errno::ECONNREFUSED
+        sleep 0.05
+        retry
       end
-      def create_dir_secure(path)
-        create_directory path
-        chmod 0700, path
+      def wait_ready?
+        !!wait_ready
       end
-      def sftp_server_path
-        SFTP_SERVER_PATHS.detect { |e| File.exist? e } or SFTP_SERVER_PATHS.first
+      def write_file_secure path, content
+        File.open File.join(home, path), ?w, 0600 do |file|
+          file.write content
+        end
       end
     end
   end

data/lib/cucumber/sshd/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Cucumber
   module SSHD
-    VERSION = '1.1.1'
+    VERSION = '2.0.0.pre4'.freeze
   end
 end

metadata CHANGED Viewed

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-sshd
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0.pre4
 platform: ruby
 authors:
 - Thibault Jouan
-autorequire:
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2021-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.4'
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
 description: Run an sshd server for scenarios tagged with @sshd
 email: tj@a13.fr
 executables: []
@@ -66,7 +80,7 @@ homepage: https://rubygems.org/gems/cucumber-sshd
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message:
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -77,13 +91,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.5
-signing_key:
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Cucumber sshd helpers
 test_files: []