oxidized-ssh 0.1.3.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcc185b0420ff278b2b9782255b0036beb264fce
-  data.tar.gz: 868d41499ff0babbdd678874be8642bf23a8a5ba
+  metadata.gz: 71b59442e6764a1a33fc672f7c88eebdcf3554ea
+  data.tar.gz: 101b3ee28e337a24b5e19a8cdd2de9cb458fa804
 SHA512:
-  metadata.gz: 743a57863c231902ab82a4cadefe21c1c7d6412c23cf1638c0e0ed0e63d9cae533b9ba7fdfdf20d97fc32cce2674fa5d190dcafca2b56b2e6a7181f92e417611
-  data.tar.gz: 23f23c7bcfc4fd3d5f4c41c1902aa0f9d7301d081c9a14fd92d96f44066cbabdb83c4b0d334853e35fd06f7f808b29b6390393caf7c24f1639882ec3b37a03d9
+  metadata.gz: 85f572b4a3e433b5a44035d90072e25a005dea807697e3ffcf47cb2e2b3c25562e862a9720c1e25a06c6a5a40913750dbd7444b40ca6dd804b1ed5889a3ae58d
+  data.tar.gz: 8b03eb5281370825808abc64d3d1c3e1f51d6ea0ae2281e8bdcb8b583548e1a0d534175cfc31af746ec81e84bd3aa0df7ab327d3fc7c1268587d8f6b21a70a48

data/lib/oxidized/ssh/version.rb

@@ -1,5 +1,6 @@
-module Oxidized
-  module Ssh
-    VERSION = "0.1.3.1"
-  end
-end
+module Oxidized
+  class SSHWrapper
+    VERSION = "0.2"
+  end
+end
+

data/lib/oxidized/{ssh.rb → sshwrapper.rb}

@@ -1,148 +1,181 @@
-require_relative "ssh/version"
-require 'net/ssh'
-require 'timeout'
-require 'awesome_print'
-
-module Oxidized
-  class SSH
-
-      attr_reader :connection, :ip, :username, :password
-      attr_reader :prompt, :debug, :exec, :pty_options
-      attr_reader :port, :output, :session
-      
-      def initialize(options)
-        @ip = options[:ip]
-        @username = options[:username]
-        @password = options[:password]
-        @verbose = options[:verbose]
-        @debug = options[:debug]
-        @prompt = options[:prompt]
-        @exec = options[:exec]
-        @pty_options = options[:pty_options] ||= { term: "vt100" }
-        @port = options[:port] ||= 22
-        @output = String.new
-        @logger = options[:logger] ||= Logger.new(STDOUT)
-        @auth_methods = options[:auth_methods] ||= ["publickey", "hostbased", "password"]
-        @expectation_handler = options[:expectation_handler]
-      end
-      
-      def start
-        raise "MissingSSHLibrary" if !defined? Net::SSH
-        @connection = Net::SSH.start(@ip, @username, password: @password, verbose: @verbose, port: @port, auth_methods: @auth_methods)
-        return yield self if block_given?
-        return (@connection and not @connection.closed?)
-      end
-      
-      def exec!(params, expect = @prompt)
-        check_for_connection
-        exec(params, expect)
-        sanitize_output_buffer("\n", /\r\n/)
-        sanitize_output_buffer('', params)
-        @output
-      end
-      
-      def check_for_connection
-        prep_connection unless @session
-      end
-      
-      def exec(params, expectation)
-        if @exec
-          @logger.debug "sending exec command #{params}" if @debug
-          @output  = @connection.exec!(params)
-        else
-          @logger.debug "sending command #{params} with expectation of #{expectation}" if @debug
-          collect_output(params, expectation)
-        end
-      end
-      
-      def collect_output(params, expectation)
-        send_data((params + "\n"), expectation)
-        return @output
-      end
-      
-      def send_data(params, expectation)
-        expect expectation
-        reset_output_buffer
-        send(params)
-        @session.process
-        expect expectation
-        @output
-      end
-      
-      def send(params)
-        @session.send_data params
-      end
-      
-      def expect *regexps
-        regexps = [regexps].flatten
-        @logger.debug "expecting #{regexps.inspect} at #{@ip}" if @debug
-        @connection.loop(0.1) do
-          sleep 0.1
-          match = regexps.find { |regexp| @output.match regexp }
-          return match if match
-          true
-        end
-      end
-      
-      def prep_connection
-        return true if @exec
-        start_channel_requests
-      end
-      
-      def start_channel_requests
-        create_session
-      end
-      
-      def create_session
-        @session = @connection.open_channel do |channel|
-          setup_channels(channel)
-        end
-      end
-      
-      def setup_channels(ch)
-        set_data_hook(ch)
-        request_channels(ch)
-      end
-      
-      def set_data_hook(ch)
-        ch.on_data do |_ch, data|
-          @logger.debug "received #{data}" if @debug
-          @output << data
-          @output = expectation_list_handler(@output) if @expectation_handler
-        end
-      end
-      
-      def expectation_list_handler(data)
-        @expectation_handler.each_slice(2) do |handler, meth|
-          handler.method(meth.to_sym).call(self, data)
-        end
-        @output
-      end
-      
-      def request_channels(ch)
-        ch.request_pty @pty_options do |_ch, success_pty|
-          raise NoShell, "Can't get PTY" unless success_pty
-          ch.send_channel_request 'shell' do |_ch, success_shell|
-            raise NoShell, "Can't get shell" unless success_shell
-          end
-        end
-      end
-      
-      def reset_output_buffer
-        @output = ''
-      end
-      
-      def sanitize_output_buffer sub, *regexs
-        @logger.debug "sanitizing #{regexs.join("|")} with #{sub}" if @debug
-        @output.gsub!(/#{regexs.join("|")}/, sub)
-      end
-      
-      def disconnect
-        Timeout::timeout(5) { @connection.loop }
-        rescue Errno::ECONNRESET, Net::SSH::Disconnect, IOError
-        ensure
-        (@connection.close rescue true) unless @connection.closed?
-      end
-      
-  end
-end
+require_relative "ssh/version"
+require 'net/ssh'
+require 'timeout'
+require 'awesome_print'
+require 'pry'
+
+module Oxidized
+  class SSHWrapper
+
+      attr_reader :connection, :ip, :username, :password
+      attr_reader :prompt, :debug, :exec
+      attr_reader :port, :output, :session
+
+      attr_writer :login, :username_prompt, :password_prompt
+      attr_writer :pty_options
+      
+      def initialize(options)
+        @ip = options[:ip]
+        @username = options[:username]
+        @password = options[:password]
+        @verbose = options[:verbose]
+        @debug = options[:debug]
+        @prompt = options[:prompt]
+        @exec = options[:exec] || false
+        @pty_options = options[:pty_options] ||= { term: "vt100" }
+        @port = options[:port] ||= 22
+        @output = String.new
+        @logger = options[:logger] ||= Logger.new(STDOUT)
+        @auth_methods = options[:auth_methods] ||= ["publickey", "hostbased", "password"]
+        @expectation_handler = options[:expectation_handler]
+	@proxy = prep_proxy(options[:proxy])
+      end
+      
+      def prep_proxy(proxy)
+        if proxy_host = proxy
+          proxy_command = "ssh "
+          proxy_command += "-o StrictHostKeyChecking=no " #unless secure
+          proxy_command += "#{proxy_host} -W %h:%p"
+          return Net::SSH::Proxy::Command.new(proxy_command)
+        end
+      end
+
+      def start
+        raise "MissingSSHLibrary" if !defined? Net::SSH
+        @connection = Net::SSH.start(@ip, @username, password: @password, verbose: @verbose, port: @port, auth_methods: @auth_methods, proxy: @proxy)
+        return yield self if block_given?
+        return (@connection and not @connection.closed?)
+      end
+      
+      def exec!(params, expect = @prompt)
+        check_for_connection
+        exec(params, expect)
+        sanitize_output_buffer("\n", /\r\n/)
+        sanitize_output_buffer('', params)
+        @logger.debug params if @debug
+        @output
+      end
+      
+      def check_for_connection
+        prep_connection unless @session
+      end
+      
+      def exec(params, expectation)
+        if @exec
+          @logger.debug "sending exec command #{params}" if @debug
+          @output  = @connection.exec!(params)
+        else
+          @logger.debug "sending command #{params} with expectation of #{expectation}" if @debug
+          collect_output(params, expectation)
+        end
+      end
+      
+      def collect_output(params, expectation)
+        send_data((params + "\n"), expectation)
+        return @output
+      end
+      
+      def send_data(params, expectation)
+	reset_output_buffer
+        send(params)
+        @session.process
+        expect expectation if expectation
+        @output
+      end
+      
+      def send(params)
+        @session.send_data params
+      end
+      
+      def expect *regexps
+        regexps = [regexps].flatten
+        @logger.debug "expecting #{regexps.inspect} at #{@ip}" if @debug
+        @connection.loop(0.1) do
+	  @logger.debug @output if @debug
+          sleep 0.1
+          match = regexps.find { |regexp| @output.match regexp }
+          return match if match
+          true
+        end
+      end
+      
+      def prep_connection
+        return true if @exec
+        start_channel_requests
+	login
+      end
+      
+      def login
+	if @login
+          match = expect @username_prompt, @prompt
+	  if match == @login_prompt
+  	    exec @username, @password_prompt
+	    exec @password
+          end
+        else
+	  expect @prompt
+	end
+	
+      end
+
+      def start_channel_requests
+        create_session
+      end
+      
+      def create_session
+        @session = @connection.open_channel do |channel|
+          setup_channels(channel)
+	end
+      end
+      
+      def setup_channels(ch)
+	set_data_hook(ch)
+        request_channels(ch)
+      end
+      
+      def set_data_hook(ch)
+        ch.on_data do |_ch, data|
+          #@logger.debug "received #{data}" if @debug
+          @output << data
+          @output = expectation_list_handler(@output) if @expectation_handler
+        end
+      end
+      
+      def expectation_list_handler(data)
+        @expectation_handler.each_slice(2) do |handler, meth|
+          handler.method(meth.to_sym).call(self, data)
+        end
+        @output
+      end
+      
+      def request_channels(ch)
+        ch.request_pty @pty_options do |_ch, success_pty|
+          raise NoShell, "Can't get PTY" unless success_pty
+          ch.send_channel_request 'shell' do |_ch, success_shell|
+            raise NoShell, "Can't get shell" unless success_shell
+          end
+        end
+      end
+      
+      def reset_output_buffer
+        @output = ''
+      end
+      
+      def sanitize_output_buffer sub, *regexs
+        @logger.debug "sanitizing #{regexs.join("|")} with #{sub}" if @debug
+        @output.gsub!(/#{regexs.join("|")}/, sub)
+      end
+      
+      def disconnect
+        Timeout::timeout(5) { @connection.loop }
+        rescue Errno::ECONNRESET, Net::SSH::Disconnect, IOError
+        ensure
+        (@connection.close rescue true) unless @connection.closed?
+      end
+	
+      def connected?
+        @connection.closed?
+      end
+      
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oxidized-ssh
 version: !ruby/object:Gem::Version
-  version: 0.1.3.1
+  version: '0.2'
 platform: ruby
 authors:
 - Schylar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.2
+- !ruby/object:Gem::Dependency
+  name: net-telnet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -101,8 +115,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/oxidized/ssh.rb
 - lib/oxidized/ssh/version.rb
+- lib/oxidized/sshwrapper.rb
 homepage: http://github.com/MajesticFalcon/oxidized-ssh
 licenses:
 - Apache-2.0
@@ -123,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: oxidized-ssh
-rubygems_version: 2.6.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Robust SSH client