cucumber-sshd 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de014d741ac9657008dd20dc78819a6e2e3fc1d1
-  data.tar.gz: 6de8ac4f78669f835b8e3047c4254d2f09f64c52
+  metadata.gz: f56e971d95f3760c3b7fc55e9dae3e329d7b4931
+  data.tar.gz: f0e4c1ad873b771f9c60a2663da310cafce911d5
 SHA512:
-  metadata.gz: be64c575b41756ddac5f06518a58f365ad14f19f787cd198e4d2f1e262dc58f4917d40fba5f0d7e2ece78100d2cbc63c9603e05279ff4274256541e609c08a57
-  data.tar.gz: af0db945ece516ebf8f50a5bec5de48ded86baf8b40566929077e50b4a153f9aadf62cf67241b2e6d1ff806289b75110c6ae8eb1c4caab89e0a051cab2bb87e1
+  metadata.gz: f91d36d8c6c61d9856dd8851f1736d2243371dfbb98981e108f9124a437e4857875d4df4363787de9bcad55494e88c0c2934261bb63bc3083d0baf4975dacf78
+  data.tar.gz: 160eb4ca89a9d7bf3c489f122c7794d7cad97d59b2a087820d85b69cdd7ac34efdcaa379f6564d2b66c73e2900b5f65c01b4abb0baa1ba6ccca2f8c2380fa059

data/.travis.yml

@@ -0,0 +1,13 @@
+sudo: false
+language: ruby
+cache: bundler
+rvm:
+  - 2.2
+  - ruby-head
+  - 2.1
+before_script:
+  - ssh-keygen -f ~/.ssh/id_rsa -t rsa -N ''
+  - cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
+  - chmod 600 ~/.ssh/authorized_keys
+  - eval `ssh-agent -s`
+  - ssh-add ~/.ssh/id_rsa

data/Rakefile

@@ -0,0 +1,5 @@
+require 'cucumber/rake/task'
+
+task default: :features
+
+Cucumber::Rake::Task.new(:features)

data/lib/cucumber/sshd/server.rb

@@ -5,15 +5,19 @@ module Cucumber
     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'
-
+      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'
+      SFTP_SERVER_PATHS     = %w[
+        /usr/libexec/sftp-server
+        /usr/lib/openssh/sftp-server
+      ]
       class << self
         def start(*args)
           server = new(args.shift, *args)
@@ -65,9 +69,9 @@ module Cucumber
       end
 
       def make_env
-        %w[etc .ssh].map { |e| create_dir e }
+        %w[etc .ssh].map { |e| create_dir_secure e }
 
-        write_file KEY_PATH, <<-eoh
+        write_file_secure KEY_PATH, <<-eoh
 -----BEGIN RSA PRIVATE KEY-----
 MIIEpAIBAAKCAQEA7EVDKeM7NYCGGVJw0wWLGCoptMFSR7DobhbEx2bAQbWDLFBF
 7S9bXpW/ddebFA4GBkHVriNPwu/IGjIgO3tivVcy6iguNKdYRABlSfpeAs+OdCzK
@@ -97,11 +101,11 @@ iDjcFK8S1e5vnlZAh9xH1WMCEsaz1WNqWm7CZOayN2LFn6Ed9seYYg==
 -----END RSA PRIVATE KEY-----
         eoh
 
-        write_file KEY_PUB_PATH, <<-eoh
+        write_file_secure KEY_PUB_PATH, <<-eoh
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsRUMp4zs1gIYZUnDTBYsYKim0wVJHsOhuFsTHZsBBtYMsUEXtL1telb9115sUDgYGQdWuI0/C78gaMiA7e2K9VzLqKC40p1hEAGVJ+l4Cz450LMqHIRaGYqcUxmzYyE+ImD8pR6naAVkugRyz2+STfv5wty5RWRdU5I9eVgK4eOCTBo32KP8q8Jws/i3Dzcfc/KHVaf9jiTX7edY3ZLdGBEcX1GMTHuebYWZdxmrXDKA97kbZtA29krKQv7CUogfAqIzgBalUKVzM6KWM2/0pE6EZZqchk00EgNOeKTEW9jQXKg/Wq9GsTwGWrE17Ib+9g2Zey/zGk7Qw4XrnPd3Z
         eoh
 
-        write_file SSHD_CONFIG_PATH, <<-eoh
+        write_file_secure SSHD_CONFIG_PATH, <<-eoh
 Port #{port}
 ListenAddress ::1
 
@@ -109,16 +113,38 @@ Protocol 2
 HostKey #{File.expand_path base_path}/#{KEY_PATH}
 PidFile /dev/null
 UsePrivilegeSeparation no
-Subsystem sftp /usr/libexec/sftp-server
+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 SSH_CONFIG_PATH, <<-eoh
-Host        #{host}
-  HostName  localhost
-  Port      #{port}
+        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
+
+
+      private
+
+      def write_file_secure(path, content)
+        write_file path, content
+        filesystem_permissions 0600, path
+      end
+
+      def create_dir_secure(path)
+        create_dir path
+        filesystem_permissions 0700, path
+      end
+
+      def sftp_server_path
+        SFTP_SERVER_PATHS.detect { |e| File.exist? e } or SFTP_SERVER_PATHS.first
+      end
     end
   end
 end

data/lib/cucumber/sshd/version.rb

@@ -1,5 +1,5 @@
 module Cucumber
   module SSHD
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-sshd
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Thibault Jouan
@@ -59,9 +59,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
+- Rakefile
 - cucumber-sshd.gemspec
 - features/sshd_tag.feature
 - features/steps/output_steps.rb