spectre-ssh 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 774fafd0f95bfcbac2c96ffbb732918f1d7beb56c4045fcd5e0468c429664ff2
-  data.tar.gz: 280800cbaf572c48ded2db30090484bed91df9605ed3f3d046e366d21ff42552
+  metadata.gz: 180b0db0cfa9d88522b4f4147f5b2e2e2bdb2c9da4743d6fac85599f71769ea6
+  data.tar.gz: 7b65847ee82c04053f4ad6d1bc91aab8aa92aada3703505027bb3167a35bd5fd
 SHA512:
-  metadata.gz: 45c553eaeaaf6334e3ce12cae5a0c56fa022564436ea5368d7a94a61d35c4f0d8c09ee9972c5f36706ad85975984ce92ae4c489997790ec9a97911c8b1865241
-  data.tar.gz: caf6aacbc8313f0a1d9e500ffe7861b39a423b61a873af078aff96262b5a95aea69ffb0b6d300a2b736ca5ae1706739f6771a8489d9b544c36b96adc6c6a8059
+  metadata.gz: 907a71a63ac527f78b981c5dde110ce5914361685195d7827d23e6d716dbeea7402dadbbe849e0cb13c3b63ebcb01a5c26a76fac3be14109d99ddca20858147e
+  data.tar.gz: 1b9031c4c95d3773fe1b8fe83f310149a3c07226cc66ddce63efffabae98c27b745d54db774e80cb7801c98db298cc8139ce184508dd7ec685d767a2b5f5eb29

data/lib/spectre/ssh.rb

@@ -7,6 +7,12 @@ module Spectre
   module SSH
     @@cfg = {}
 
+    class SSHError < Exception
+      def initialize message
+        super message
+      end
+    end
+
     class SSHConnection < Spectre::DslClass
       def initialize host, username, opts, logger
         opts[:non_interactive] = true
@@ -32,7 +38,13 @@ module Spectre
 
       def connect!
         return unless @__session == nil or @__session.closed?
-        @__session = Net::SSH.start(@__host, @__username, @__opts)
+        begin
+          @__session = Net::SSH.start(@__host, @__username, @__opts)
+        rescue SocketError
+          raise SSHError.new("Unable to connect to #{@__host} with user #{@__username}")
+        rescue Net::SSH::AuthenticationFailed
+          raise SSHError.new("Authentication failed for #{@__username}@#{@__host}. Please check password, SSH keys and passphrases.")
+        end
       end
 
       def close
@@ -106,24 +118,26 @@ module Spectre
 
 
     class << self
-      def ssh name, config = {}, &block
-        raise "SSH connection '#{name}' not configured" unless @@cfg.key?(name) or config.count > 0
+      def ssh name, options = {}, &block
+        raise "SSH connection '#{name}' not configured" unless @@cfg.key?(name) or options.count > 0
 
         cfg = @@cfg[name] || {}
 
         host = cfg['host'] || name
-        username = config[:username] || cfg['username']
-        password = config[:password] || cfg['password']
+        username = options[:username] || cfg['username']
+        password = options[:password] || cfg['password']
 
         opts = {}
         opts[:password] = password
-        opts[:port] = config[:port] || cfg['port'] || 22
-        opts[:keys] = [cfg['key']] if cfg.key? 'key'
-        opts[:passphrase] = cfg['passphrase'] if cfg.key? 'passphrase'
+        opts[:port] = options[:port] || cfg['port'] || 22
+
+        ssh_key = options[:key] || cfg['key']
+        opts[:keys] = [ssh_key] unless ssh_key.nil?
+        opts[:passphrase] = options[:passphrase] || cfg['passphrase']
 
         opts[:auth_methods] = []
-        opts[:auth_methods].push 'publickey' if opts[:keys]
-        opts[:auth_methods].push 'password' if opts[:password]
+        opts[:auth_methods].push 'publickey' unless opts[:keys].nil? or opts[:keys].empty?
+        opts[:auth_methods].push 'password' unless opts[:password].nil?
 
         ssh_con = SSHConnection.new(host, username, opts, @@logger)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spectre-ssh
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Christian Neubauer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2022-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: openssl
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -44,31 +44,59 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: ed25519
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: bcrypt_pbkdf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: Adds SSH access functionality to the spectre framework
 email:
-- me@christianneubauer.de
+- christian.neubauer@ionos.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/spectre/ssh.rb
-homepage: https://github.com/cneubauer/spectre-ssh
+homepage: https://github.com/ionos-spectre/spectre-ssh
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org/
-  homepage_uri: https://github.com/cneubauer/spectre-ssh
-  source_code_uri: https://github.com/cneubauer/spectre-ssh
-  changelog_uri: https://github.com/cneubauer/spectre-ssh/blob/master/CHANGELOG.md
-post_install_message: 
+  homepage_uri: https://github.com/ionos-spectre/spectre-ssh
+  source_code_uri: https://github.com/ionos-spectre/spectre-ssh
+  changelog_uri: https://github.com/ionos-spectre/spectre-ssh/blob/master/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -83,8 +111,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: SSH module for spectre
 test_files: []