xlogin 0.13.5 → 0.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75345512c27d1e136bad7cd663f47bc04d7c9cfbcc9f56005b5636a0ea88105a
-  data.tar.gz: 94c5599750f2d81b7ee583ae059f6d6e288c873c6a1d3a853a2ba2255c4931d9
+  metadata.gz: 7e8e95c3307d7a6db59fd189391fcbb4b5d4d16237ab91adf5dffe6978bcb138
+  data.tar.gz: 64c577eacd569e25369f46c67cfc4fa2d6df87aea0fe02da16ff1fe259178448
 SHA512:
-  metadata.gz: ff6903e3c6c4fd36b98bba454af9e69fba4e1434511a19e8a5ce92b1a84138dd754be57949285fda1043c470d3c810ff720896e6652451e82cffa5178b4b0958
-  data.tar.gz: 1b28f2a76abd6e09dc9995a483775c2dc5b56123b7121d4738c9173b84c39ca6cb6c7f89389826476658e1e8c95d6adf090a1cffbb33bba4e07105b2fed5f10e
+  metadata.gz: 3cc3b522a7583d8dccf0d7f6878cf73be466c8c36727a51636027c5eba304afb31fc8853634757bf18b90b96df390fec5a987948848ded5b97bf3d2cf2847f84
+  data.tar.gz: 71491640cb15ee2eb2e7709ac4bc430c228d19c4bd1dcc80503c6acaf57ade71aa54e166dfdb8736c980d6970c55e36d787cf735d36928af85e3c3dbcbfde245

data/lib/xlogin/session.rb

@@ -25,22 +25,28 @@ module Xlogin
       @template = template
       @username, @password = uri.userinfo.to_s.split(':')
 
-      ssh_tunnel(@config.via) if @config.via
+      forward = @config.forward || @config.via
+      ssh_tunnel(forward) if forward
       max_retry = @config.retry || 1
 
       @mutex   = Mutex.new
       @loggers = [@config.log].flatten.uniq.reduce({}) { |a, e| a.merge(e => build_logger(e)) }
 
       begin
-        super(
-          'Host'     => @host,
-          'Port'     => @port,
-          'Username' => @username,
-          'Password' => @password,
-          'Timeout'  => @config.timeout || @template.timeout || false,
-          'Prompt'   => prompt_pattern,
-          'FailEOF'  => true,
-        )
+        args = Hash.new
+        args['Timeout'] = @config.timeout || @template.timeout || false
+        args['Prompt' ] = prompt_pattern
+        args['FailEOF'] = true
+        if @config.proxy
+          args['Proxy'   ] = @config.proxy
+        else
+          args['Host'    ] = @host
+          args['Port'    ] = @port
+          args['Username'] = @username
+          args['Password'] = @password
+        end
+
+        super(args)
       rescue => e
         retry if (max_retry -= 1) > 0
         raise e
@@ -60,8 +66,9 @@ module Xlogin
       Regexp.union(*@template.prompt.map(&:first))
     end
 
-    def duplicate
-      @template.build(@uri, **@config.to_h)
+    def duplicate(type: @template.name, **args)
+      template = Xlogin::Factory.instance.get_template(type)
+      template.build(@uri, **@config.to_h.merge(args))
     end
 
     def puts(*args, &block)

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-	VERSION = "0.13.5"
+	VERSION = "0.13.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.13.5
+  version: 0.13.6
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-17 00:00:00.000000000 Z
+date: 2019-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet
@@ -157,7 +157,6 @@ files:
 - bin/xlogin
 - lib/xlogin.rb
 - lib/xlogin/cli.rb
-- lib/xlogin/delegator.rb
 - lib/xlogin/factory.rb
 - lib/xlogin/rake_task.rb
 - lib/xlogin/session.rb

data/lib/xlogin/delegator.rb

@@ -1,53 +0,0 @@
-require 'addressable/uri'
-require 'uri'
-
-module Xlogin
-  class Template
-
-    module RelayTemplate
-      def build(uri, **params)
-        target_host = params.delete(:relay)
-        return super(uri, **params) unless target_host
-
-        target_info = Xlogin.factory.get_inventory(target_host)
-        target_temp = Xlogin.factory.get_template(target_info[:type])
-        target_uri  = Addressable::URI.parse(target_info[:uri])
-
-        login    = @methods.fetch(:login)
-        delegate = @methods.fetch(:delegate)
-        raise Xlogin::Error.new("'login' and 'delegate' methods must be defined in the #{target_info[:type]} template.") unless login && delegate
-
-        relay_uri = Addressable::URI.parse(uri.to_s)
-        userinfo_cache = relay_uri.userinfo.dup
-        relay_uri.userinfo = ''
-
-        session = target_temp.build(relay_uri, **params)
-        session.instance_exec(*userinfo_cache.split(':'), &login)
-        session.instance_exec(target_uri, **params, &delegate)
-        session
-      end
-    end
-
-    prepend RelayTemplate
-
-
-    ### Usage:
-    ## Write xloginrc file
-    #
-    # vyos      'vyos01',        'telnet://user:pass@host:port'
-    # relay_srv 'vyos01::relay', 'telnet://relay_user:relay_pass@relay_host:relay_port', relay: 'vyos01'
-    #
-    ## Write firmware template for 'relay_srv'
-    #
-    # login do |username, password|
-    #   waitfor(/login:\s*\z/)    && puts(username)
-    #   waitfor(/Password:\s*\z/) && puts(password)
-    # end
-    #
-    # delegate do |uri, **opts|
-    #   puts("telnet #{uri.host}")
-    #   login(*uri.userinfo.split(':'))
-    # end
-
-  end
-end