cucumber-sshd 1.1.1 → 2.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 321a4a141c1314bef669e2deafa3204f4eb34c42
-  data.tar.gz: 8f60fe0b843ac59113362ac7acb8f4bea807dfa2
+  metadata.gz: cc37a65b387332778989833f88297ebc5de1d15d
+  data.tar.gz: 8d4b5945eb138b9720e1b8fb41037afd9c023856
 SHA512:
-  metadata.gz: 7cb263a11ea35d808abcb98f7ffd7bd79f9fa67bbb378556e8db8752595f22ce359d39d46fcae4e3b4a9454bc7e8b8eb3410afe4f15a198e455f0c250c11c4a2
-  data.tar.gz: ddb13966299aee8cf69c790c5b0628a58f951a486a7814b6aa38c180289a61c3cf382e354ee7241c0fff7c0275a82888cc2b967fbe8e4f5fe1ae5f2f5fe1af56
+  metadata.gz: d8f34e74f453dfc253501894d3fe1d1bd61dd7bc6ed4cca2faf3aebc667031b568af0ca7ff7ec81d74f596f8eb87f20bb7adc9d4e64d63c9b5467b410f68fa27
+  data.tar.gz: e59c9c431835c47046aaeb371f28af948bb71ff6e4a5cad06e102b0c15120f24151fc50b388ec809651998aa7b58ca09f1672f5779a4614c00dbaa60c373d633

data/lib/cucumber/sshd/cucumber.rb

@@ -1,21 +1,21 @@
 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 = -> home do
+    Cucumber::SSHD::Server.start home, wait_ready: @_sshd_wait_ready
   end
 
   if @_sshd_fast && !$_sshd
     unless $_sshd
-      $_sshd = start_server.call
+      $_sshd = start_server.call @_sshd_home
       at_exit { $_sshd.stop }
     end
     @_sshd = $_sshd
   else
-    @_sshd = start_server.call
+    @_sshd = start_server.call @_sshd_home
   end
 end
 
-After('@sshd') do
+After '@sshd' do
   @_sshd.stop unless @_sshd_fast
 end

data/lib/cucumber/sshd/server.rb

@@ -1,114 +1,108 @@
-require 'aruba/api'
-
 module Cucumber
   module SSHD
     class Server
-      include Aruba::Api
-
-      HOST                  = 'some_host.test'
+      BASE_PATH             = 'tmp/home'.freeze
+      HOST                  = 'some_host.test'.freeze
+      HOSTNAME              = 'localhost'.freeze
+      LISTEN_ADDR           = '::1'.freeze
       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'
+      COMMAND               = '/usr/sbin/sshd'.freeze
+      COMMAND_ARGS          = '-Deq'.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_host'.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_accessor :base_path, :host, :addr, :port, :pid
 
-      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
+      def initialize base_path, wait_ready: false
+        @base_path  = base_path || BASE_PATH
+        @host       = HOST
+        @addr       = ENV.fetch 'CUCUMBER_SSHD_LISTEN', LISTEN_ADDR
+        @port       = ENV.fetch 'CUCUMBER_SSHD_PORT', PORT
         @pid        = nil
         @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 base_path do
           @pid = fork do
-            $stderr.reopen '/dev/null'
+            $stderr.reopen '/dev/null' unless ENV.key? 'CUCUMBER_SSHD_DEBUG'
             exec command
           end
+          if ENV.key? 'CUCUMBER_SSHD_DEBUG'
+            sleep 0.05
+            fail "`#{command}` failed" if Process.waitpid pid, Process::WNOHANG
+          end
         end
 
         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
+      def command
+        [
+          COMMAND,
+          '-f',
+          SSHD_CONFIG_PATH,
+          COMMAND_ARGS
+        ].join ' '
+      end
 
-        write_file_secure KEY_PUB_PATH, <<-eoh
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsRUMp4zs1gIYZUnDTBYsYKim0wVJHsOhuFsTHZsBBtYMsUEXtL1telb9115sUDgYGQdWuI0/C78gaMiA7e2K9VzLqKC40p1hEAGVJ+l4Cz450LMqHIRaGYqcUxmzYyE+ImD8pR6naAVkugRyz2+STfv5wty5RWRdU5I9eVgK4eOCTBo32KP8q8Jws/i3Dzcfc/KHVaf9jiTX7edY3ZLdGBEcX1GMTHuebYWZdxmrXDKA97kbZtA29krKQv7CUogfAqIzgBalUKVzM6KWM2/0pE6EZZqchk00EgNOeKTEW9jQXKg/Wq9GsTwGWrE17Ib+9g2Zey/zGk7Qw4XrnPd3Z
+      def configure_client
+        write_file_secure SSH_CONFIG_PATH, <<-eoh
+Host                    #{host}
+  HostName              #{HOSTNAME}
+  Port                  #{port}
+  UserKnownHostsFile    #{File.expand_path base_path}/#{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}
 PidFile /dev/null
@@ -116,34 +110,31 @@ 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"
         eoh
-
-        write_file_secure SSH_CONFIG_PATH, <<-eoh
-Host                    #{host}
-  HostName              localhost
-  Port                  #{port}
-  UserKnownHostsFile    #{File.expand_path base_path}/#{SSH_KNOWN_HOSTS_PATH}
-        eoh
-
-        write_file_secure SSH_KNOWN_HOSTS_PATH, <<-eoh
-[localhost]:2222 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsRUMp4zs1gIYZUnDTBYsYKim0wVJHsOhuFsTHZsBBtYMsUEXtL1telb9115sUDgYGQdWuI0/C78gaMiA7e2K9VzLqKC40p1hEAGVJ+l4Cz450LMqHIRaGYqcUxmzYyE+ImD8pR6naAVkugRyz2+STfv5wty5RWRdU5I9eVgK4eOCTBo32KP8q8Jws/i3Dzcfc/KHVaf9jiTX7edY3ZLdGBEcX1GMTHuebYWZdxmrXDKA97kbZtA29krKQv7CUogfAqIzgBalUKVzM6KWM2/0pE6EZZqchk00EgNOeKTEW9jQXKg/Wq9GsTwGWrE17Ib+9g2Zey/zGk7Qw4XrnPd3Z
-        eoh
       end
 
+      def create_dir_secure path
+        FileUtils.mkdir_p File.join(base_path, path), mode: 0700
+      end
 
-      private
+      def sftp_server_path
+        SFTP_SERVER_PATHS.detect { |e| File.exist? e }
+      end
 
-      def write_file_secure(path, content)
-        write_file path, content
-        chmod 0600, path
+      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(base_path, path), ?w, 0600 do |file|
+          file.write content
+        end
       end
     end
   end

data/lib/cucumber/sshd/version.rb

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

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-sshd
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0.pre
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2017-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -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: []
@@ -77,12 +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
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Cucumber sshd helpers