xlogin 0.5.13 → 0.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28fe38cadeb9382c1dca21cc77a8cc5d5233ea2b
-  data.tar.gz: 4d9075c3216fb035d8c8b0407e99f67b35e0dd0d
+  metadata.gz: 0e757e206fe886bf5b5f4ed56e8b7a47cf6837c9
+  data.tar.gz: 43ea824dfd4a8131b795b81bc1fd342de46155e9
 SHA512:
-  metadata.gz: cc38702bc86c7b0f416a4688f7b0a3b8d8d949dfa59371e255198dac36edb09a497b321ab8242b766dbd9f9c1313d566ae18aaeaf567f15737ca6aa02f3cb9aa
-  data.tar.gz: 4a7f58d4699f7a70941d1cc32ccdff906791f3ad820676fefe403e4ecb935acc7e28c42feb7ea1b7efe75f1134e42505bb95d5b7d9c7434afddde626d23a3460
+  metadata.gz: 235201b50907672f266709c6036802d3c3fbbdfa96436f4eb0ee24b40268bb273ceba8ac77598c3bbf01faa242ae12fc889524bc658edefb1c3968f5933a3e4f
+  data.tar.gz: 4851153be8d9c4208daf7283e35646f1d557830a2bb82540d031ce479589d6f56040035d43ad62e206c26df9c50bbab9bb9ea46cdc1160c266eeab8120c64791

data/README.md

@@ -4,7 +4,7 @@ rancid clogin alternative.
 ## Usage
 
 ネットワークデバイスへのログインを自動化するツール群。  
-`xlogin/firmares`にファームウェア仕様を記述することで対象機器を拡大可能。
+`~/.xlogin.d/`へファームウェア毎の仕様を記述することで対象機器を拡大可能。
 
 
 各個別装置毎のログインのための認証情報は`~/.xloginrc`へ記述しておく。  

data/lib/xlogin/cli.rb

@@ -36,7 +36,7 @@ module Xlogin
       parser.on('-l [DIRECTORY]', '--log',        String, 'The DIRECTORY to the output log file (default: $PWD/log).') { |v| config.logdir = v || Dir.pwd }
 
       parser.on('-p NUM', '--parallels',  Integer,   'The NUM of the threads. (default: 5).') { |v| config.parallels  = v }
-      parser.on('-e',     '--enable',     TrueClass, 'Try to gain enable priviledge.')        { |v| config.enable     = v }
+      parser.on('-e',     '--enable',     TrueClass, 'Try to gain enable priviledge.')        { |v| config.autoenable = v }
       parser.on('-y',     '--assume-yes', TrueClass, 'Always answer "yes" if confirmed.')     { |v| config.assume_yes = v }
       parser.on('-h',     '--help', 'Show this message.') { Xlogin::CLI.usage }
 
@@ -128,13 +128,15 @@ module Xlogin
           loggers << $stdout if config.parallels == 1
           loggers << File.join(config.logdir, "#{hostname}.log") if config.logdir
 
-          session = Xlogin.get(hostname, enable: config.enable, log: loggers)
+          session = Xlogin.get(hostname, log: loggers)
+          session.enable(session.enable_password) if config.autoenable && session.respond_to?(:enable)
           block.call(session)
 
           if config.parallels > 1
             output = buffer.string.lines.map { |line| "#{hostname}: #{line}" }.join
             display.synchronize { $stdout.puts output }
           end
+
         rescue => e
           if config.parallels > 1
             output = "\n#{hostname}: [Error] #{e}"

data/lib/xlogin/firmware.rb

@@ -7,43 +7,41 @@ module Xlogin
 
     def initialize
       @timeout = 5
-      @cmdhook = nil
       @prompts = Array.new
-      @methods = Hash.new
+
+      @hook = nil
+      @bind = Hash.new
     end
 
     def timeout(val)
       @timeout = val.to_i
     end
 
-    def hook(&block)
-      @cmdhook = block
-    end
-
     def prompt(expect, &block)
       @prompts << [Regexp.new(expect.to_s), block]
     end
 
+    def hook(&block)
+      @hook = block
+    end
+
     def bind(name, &block)
-      @methods[name] = block
+      @bind[name] = block
     end
 
     def run(uri, opts = {})
       uri   = URI(uri.to_s)
       klass = Class.new(Xlogin.const_get(uri.scheme.capitalize))
-      klass.class_exec(@methods) do |methods|
-        methods.each { |m, _| undef_method(m) if method_defined?(m) }
-      end
 
-      @methods.each do |name, block|
-        klass.class_exec(name, block) do |name, block|
-          undef_method(name) if respond_to?(name)
+      @bind.each do |name, block|
+        klass.class_exec(name.to_sym, block) do |name, block|
+          undef_method(name) if method_defined?(name)
           define_method(name, &block)
         end
       end
 
-      if @cmdhook
-        klass.class_exec(@cmdhook) do |cmdhook|
+      if @hook
+        klass.class_exec(@hook) do |cmdhook|
           alias_method :pass, :puts
           define_method(:puts) do |command|
             instance_exec(command, &cmdhook)
@@ -51,25 +49,6 @@ module Xlogin
         end
       end
 
-      if grant = opts.delete(:grant)
-        mod_open, password, mod_close= grant.split(':')
-        klass.class_exec(mod_open.to_sym, password, mod_close) do |mod_open, password, mod_close|
-          if method_defined?(mod_open)
-            alias_method "__#{mod_open}".to_sym, mod_open
-            alias_method :enable, mod_open unless mod_open == :enable
-          end
-
-          define_method(mod_open) do |*args, &block|
-            args = [*args, password] unless password.empty?
-            send("__#{mod_open}", *args)
-            if block
-              block.call
-              cmd(mod_close)
-            end
-          end
-        end
-      end
-
       session = klass.new(
         {
           host:     uri.host,
@@ -79,9 +58,6 @@ module Xlogin
           prompts:  @prompts,
         }.merge(opts)
       )
-
-      session.enable if session.respond_to?(:enable) && opts[:enable]
-      session
     end
 
   end

data/lib/xlogin/firmware_factory.rb

@@ -52,7 +52,7 @@ module Xlogin
 
     def list(name = nil)
       keys = @database.keys
-      keys = keys.select { |key| key =~ /^#{name}(:|$)/ } unless name.nil?
+      keys = keys.select { |key| key =~ /^#{name}(:|$)/ } unless name.nil? || name.to_s == 'all'
       @database.values_at(*keys)
     end
 

data/lib/xlogin/session.rb

@@ -23,6 +23,15 @@ module Xlogin
       @logger   = update_logger
     end
 
+    def enable(*args)
+      # do nothing here.
+      # write bind(:enable) proc in the firmware template to override.
+    end
+
+    def enable_password
+      opts[:enablepw]
+    end
+
     def waitfor(*expect, &block)
       if expect.compact.empty?
         super(Regexp.union(*@prompts.map(&:first))) do |recvdata|
@@ -44,8 +53,8 @@ module Xlogin
       end
     end
 
-    def dup(opts = @opts)
-      self.class.new(opts)
+    def dup(**args)
+      self.class.new(**@opts.merge(args))
     end
 
     def lock(timeout: @timeout)

data/lib/xlogin/templates/ios.rb

@@ -8,8 +8,13 @@ bind(:login) do |password|
   waitfor
 end
 
-bind(:enable) do |password|
+bind(:enable) do |password, &block|
   puts('enable')
   waitfor(/Password: /) && puts(password)
   waitfor
+
+  if block
+    block.call
+    cmd('disable')
+  end
 end

data/lib/xlogin/templates/iosxr.rb

@@ -8,11 +8,10 @@ bind(:login) do |*args|
 end
 
 hook do |command|
-  if command =~ /^(?:adm |admi |admin )?\s*(?:con|rel|red|cle|hw|ro)/
-    # commands: configure, reload, redundancy, clear, hw-module, rollback
-    #   with or without admin prefix is prihibited if not authorized.
+  case command.strip
+  when /^conf/, /^ro/
     raise Xlogin::AuthorizationError.new("prohibited command: #{command}") unless Xlogin.authorized?
+  else
+    pass(command)
   end
-
-  pass(command)
 end

data/lib/xlogin/templates/sros.rb

@@ -10,7 +10,7 @@ bind(:login) do |*args|
   waitfor
 end
 
-bind(:enable_admin) do |password|
+bind(:enable) do |password|
   puts('enable-admin')
   waitfor(/Password:\s?/) && puts(password)
   waitfor

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.5.13"
+  VERSION = "0.5.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.5.14
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2017-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: rancid clogin alternative