oxidized 0.27.0 → 0.28.0

data/lib/oxidized/model/ios.rb

@@ -25,7 +25,7 @@ class IOS < Oxidized::Model
 
   cmd :secret do |cfg|
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
-    cfg.gsub! /^(snmp-server host \S+( vrf \S+)?( version (1|2c|3))?)\s+\S+((\s+\S*)*)\s*/, '\\1 <secret hidden> \\5'
+    cfg.gsub! /^(snmp-server host \S+( vrf \S+)?( informs?)?( version (1|2c|3 (noauth|auth|priv)))?)\s+\S+((\s+\S*)*)\s*/, '\\1 <secret hidden> \\7'
     cfg.gsub! /^(username .+ (password|secret) \d) .+/, '\\1 <secret hidden>'
     cfg.gsub! /^(enable (password|secret)( level \d+)? \d) .+/, '\\1 <secret hidden>'
     cfg.gsub! /^(\s+(?:password|secret)) (?:\d )?\S+/, '\\1 <secret hidden>'

data/lib/oxidized/model/ironware.rb

@@ -76,7 +76,7 @@ class IronWare < Oxidized::Model
   cfg :telnet, :ssh do
     if vars :enable
       post_login do
-        send "enable\n"
+        send "enable\r\n"
         cmd vars(:enable)
       end
     end

data/lib/oxidized/model/nsxconfig.rb

@@ -0,0 +1,22 @@
+require 'net/http'
+class NSXConfig < Oxidized::Model
+  cmd "/api/4.0/edges/" do |cfg|
+    edges = JSON.parse(cfg.encode('UTF-8', { invalid: :replace, undef: :replace, replace: '?' }))["edgePage"]["data"]
+    data = []
+    edges.each do |edge|
+      firewall_config = cmd "/api/4.0/edges/#{edge['id']}"
+      json_config = JSON.parse(firewall_config.encode('UTF-8', { invalid: :replace, undef: :replace, replace: '?' }))
+      json_config["edgeInfo"] = "#{edge['id']} #{edge['name']}"
+      data.push(json_config)
+    end
+    JSON.pretty_generate(data)
+  end
+
+  cfg :http do
+    @username = @node.auth[:username]
+    @password = @node.auth[:password]
+    @headers['Content-Type'] = 'application/json'
+    @headers['Accept'] = 'application/json'
+    @secure = true
+  end
+end

data/lib/oxidized/model/nsxfirewall.rb

@@ -0,0 +1,22 @@
+require 'net/http'
+class NSXFirewall < Oxidized::Model
+  cmd "/api/4.0/edges/" do |cfg|
+    edges = JSON.parse(cfg.encode('UTF-8', { invalid: :replace, undef: :replace, replace: '?' }))["edgePage"]["data"]
+    data = []
+    edges.each do |edge|
+      firewall_config = cmd "/api/4.0/edges/#{edge['id']}/firewall/config"
+      json_config = {}
+      json_config["#{edge['id']} #{edge['name']}"] = JSON.parse(firewall_config.encode('UTF-8', { invalid: :replace, undef: :replace, replace: '?' }))
+      data.push(json_config)
+    end
+    JSON.pretty_generate(data)
+  end
+
+  cfg :http do
+    @username = @node.auth[:username]
+    @password = @node.auth[:password]
+    @headers['Content-Type'] = 'application/json'
+    @headers['Accept'] = 'application/json'
+    @secure = true
+  end
+end

data/lib/oxidized/model/os10.rb

@@ -0,0 +1,46 @@
+class OS10 < Oxidized::Model
+  # For switches running Dell EMC Networking OS10 #
+  #
+  # Tested with : Dell PowerSwitch S4148U-ON
+
+  comment  '! '
+
+  cmd :all do |cfg|
+    cfg.gsub! /^% Invalid input detected at '\^' marker\.$|^\s+\^$/, ''
+    cfg.each_line.to_a[2..-2].join
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /(password )(\S+)/, '\1<secret hidden>'
+    cfg
+  end
+
+  cmd 'show inventory' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show inventory media' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show running-configuration' do |cfg|
+    cfg.each_line.to_a[3..-1].join
+  end
+
+  cfg :telnet do
+    username /^Login:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    if vars :enable
+      post_login do
+        send "enable\n"
+        cmd vars(:enable)
+      end
+    end
+    post_login 'terminal length 0'
+    pre_logout 'exit'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/procurve.rb

@@ -1,9 +1,9 @@
 class Procurve < Oxidized::Model
   # previous command is repeated followed by "\eE", which sometimes ends up on last line
-  # ssh switches prompt may start with \r, followed by the prompt itself, regex ([\w\s.-]+# ), which ends the line
+  # ssh switches prompt may start with \r, followed by the prompt itself, regex ([\w\s.-]+[#>] ), which ends the line
   # telnet switchs may start with various vt100 control characters, regex (\e\[24;[0-9][hH]), follwed by the prompt, followed
   # by at least 3 other vt100 characters
-  prompt /(^\r|\e\[24;[0-9][hH])?([\w\s.-]+# )($|(\e\[24;[0-9][0-9]?[hH]){3})/
+  prompt /(^\r|\e\[24;[0-9][hH])?([\w\s.-]+[#>] )($|(\e\[24;[0-9][0-9]?[hH]){3})/
 
   comment '! '
 

data/lib/oxidized/model/qtech.rb

@@ -0,0 +1,41 @@
+class QTECH < Oxidized::Model
+  comment '! '
+
+  cmd :all do |cfg|
+    cfg.cut_both
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^(snmp-server community(?: r[ow])?(?: \d)?) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^(snmp-server user .+ auth \S+) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^(username .+ password \d) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^(enable password(?: level \d+)? \d) .+/, '\\1 <secret hidden>'
+    cfg
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg.each_line.reject { |line| line.match /^  (Copyright |All rights reserved$|Uptime is |Last reboot is )/ }.join
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg
+  end
+
+  cfg :telnet do
+    username /^login:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login do
+      if vars(:enable) == true
+        cmd "enable"
+      elsif vars(:enable)
+        cmd "enable", /^[pP]assword:/
+        cmd vars(:enable)
+      end
+      cmd 'terminal length 0'
+    end
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/routeros.rb

@@ -12,15 +12,15 @@ class RouterOS < Oxidized::Model
     cfg
   end
 
-  cmd '/system routerboard print' do |cfg|
+  cmd '/system routerboard print without-paging' do |cfg|
     comment cfg
   end
 
-  cmd '/system package update print' do |cfg|
+  cmd '/system package update print without-paging' do |cfg|
     comment cfg
   end
 
-  cmd '/system history print' do |cfg|
+  cmd '/system history print without-paging' do |cfg|
     comment cfg
   end
 

data/lib/oxidized/model/sonicos.rb

@@ -12,6 +12,11 @@ class SonicOS < Oxidized::Model
     cfg.gsub! /cli ftp password default \d\,(\S+)/, 'cli ftp password default <secret hidden> \2'
     cfg.gsub! /secret \d\,(\S+)/, 'secret <secret hidden> \2'
     cfg.gsub! /shared-secret \d\,(\S+)/, 'shared-secret <secret hidden> \2'
+    cfg.gsub! /password \d\,(\S+)/, 'password <secret hidden> \2'
+    cfg.gsub! /passphrase password \d\,(\S+)/, 'passphrase password <secret hidden> \2'
+    cfg.gsub! /bind-password \d\,(\S+)/, 'bind-password <secret hidden> \2'
+    cfg.gsub! /authentication sha1 \d\,(\S+)/, 'authentication sha1 <secret hidden> \2'
+    cfg.gsub! /encryption aes \d\,(\S+)/, 'encryption aes <secret hidden> \2'
     cfg
   end
 

data/lib/oxidized/model/telco.rb

@@ -0,0 +1,24 @@
+class TELCO < Oxidized::Model
+  # Telco Systems T-Marc 3306
+
+  prompt /^(\r?[\w.@_()-]+[#]\s?)$/
+  comment '! '
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[2..-2].join.delete("\n")
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg
+  end
+
+  cfg :ssh, :telnet do
+    post_login 'terminal length 0'
+    pre_logout 'exit'
+  end
+
+  cfg :telnet do
+    username /^Username:/
+    password /^Password:/
+  end
+end

data/lib/oxidized/model/xos.rb

@@ -1,7 +1,7 @@
 class XOS < Oxidized::Model
   # Extreme Networks XOS
 
-  prompt /^*?[\w .-]+# $/
+  prompt /^\*?\s?[-\w.~]+(:\d+)? [#>] $/
   comment  '# '
 
   cmd :all do |cfg|
@@ -43,7 +43,7 @@ class XOS < Oxidized::Model
   cfg :telnet, :ssh do
     post_login do
       data = cmd 'disable clipaging session'
-      match = data.match /^disable clipaging session\n\*?[\w .-]+(:\d+)? # $/m
+      match = data.match /^disable clipaging session\n\*?[\w .-]+(:\d+)? [#>] $/m
       next if match
 
       cmd 'disable clipaging'

data/lib/oxidized/node.rb

@@ -73,7 +73,7 @@ module Oxidized
           resc  = " (rescued #{resc})"
         end
         Oxidized.logger.send(level, '%s raised %s%s with msg "%s"' % [ip, err.class, resc, err.message])
-        return false
+        false
       rescue StandardError => err
         crashdir  = Oxidized.config.crash.directory
         crashfile = Oxidized.config.crash.hostnames? ? name : ip.to_s
@@ -86,7 +86,7 @@ module Oxidized
           fh.puts err.backtrace
         end
         Oxidized.logger.error '%s raised %s with msg "%s", %s saved' % [ip, err.class, err.message, crashfile]
-        return false
+        false
       end
     end
 

data/lib/oxidized/nodes.rb

@@ -164,7 +164,7 @@ module Oxidized
             node.stats = old[i].stats
             node.last  = old[i].last
           end
-        rescue Oxidized::NodeNotFound # rubocop:disable Lint/HandleExceptions
+        rescue Oxidized::NodeNotFound
         end
       end
       sort_by! { |x| x.last.nil? ? Time.new(0) : x.last.end }

data/lib/oxidized/output/git.rb

@@ -74,7 +74,7 @@ module Oxidized
       repo = Rugged::Repository.new repo
       walker = Rugged::Walker.new(repo)
       walker.sorting(Rugged::SORT_DATE)
-      walker.push(repo.head.target)
+      walker.push(repo.head.target.oid)
       i = -1
       tab = []
       walker.each do |commit|

data/lib/oxidized/version.rb

@@ -1,6 +1,6 @@
 module Oxidized
-  VERSION = '0.27.0'.freeze
-  VERSION_FULL = '0.27.0'.freeze
+  VERSION = '0.28.0'.freeze
+  VERSION_FULL = '0.28.0'.freeze
   def self.version_set
     version_full = %x(git describe --tags).chop rescue ""
     version      = %x(git describe --tags --abbrev=0).chop rescue ""

data/oxidized.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'ed25519', '~> 1.2'
   s.add_runtime_dependency 'net-ssh', '~> 5'
   s.add_runtime_dependency 'net-telnet', '~> 0.2'
-  s.add_runtime_dependency 'rugged',  '~> 0.28'
+  s.add_runtime_dependency 'rugged',  '~> 0.28.0'
   s.add_runtime_dependency 'slop',    '~> 4.6'
 
   s.add_development_dependency 'bundler', '~> 2.0'
@@ -33,6 +33,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'mocha',    '~> 1.1'
   s.add_development_dependency 'pry',      '~> 0'
   s.add_development_dependency 'rake',     '~> 10.0'
-  s.add_development_dependency 'rubocop',  '~> 0.74.0'
+  s.add_development_dependency 'rubocop',  '~> 0.80.0'
   s.add_development_dependency 'simplecov'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.28.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-27 00:00:00.000000000 Z
+date: 2020-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asetus
@@ -88,14 +88,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: 0.28.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: 0.28.0
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
@@ -200,14 +200,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: 0.80.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: 0.80.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -235,6 +235,7 @@ files:
 - ".codeclimate.yml"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/no-response.yml"
+- ".github/workflows/publishdocker.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -256,6 +257,7 @@ files:
 - docs/Model-Notes/Comware.md
 - docs/Model-Notes/Cumulus.md
 - docs/Model-Notes/EOS.md
+- docs/Model-Notes/IOS.md
 - docs/Model-Notes/JunOS.md
 - docs/Model-Notes/LinuxGeneric.md
 - docs/Model-Notes/Netgear.md
@@ -265,7 +267,6 @@ files:
 - docs/Model-Notes/VRP-Huawei.md
 - docs/Model-Notes/Viptela.md
 - docs/Model-Notes/XGS4600-Zyxel.md
-- docs/Model-Notes/ios.md
 - docs/Outputs.md
 - docs/Ruby-API.md
 - docs/Sources.md
@@ -343,6 +344,7 @@ files:
 - lib/oxidized/model/ciscosma.rb
 - lib/oxidized/model/ciscosmb.rb
 - lib/oxidized/model/ciscovpn3k.rb
+- lib/oxidized/model/cnos.rb
 - lib/oxidized/model/comnetms.rb
 - lib/oxidized/model/comtrol.rb
 - lib/oxidized/model/comware.rb
@@ -378,6 +380,7 @@ files:
 - lib/oxidized/model/hpebladesystem.rb
 - lib/oxidized/model/hpemsa.rb
 - lib/oxidized/model/hpmsm.rb
+- lib/oxidized/model/ibos.rb
 - lib/oxidized/model/icotera.rb
 - lib/oxidized/model/ios.rb
 - lib/oxidized/model/iosxe.rb
@@ -396,12 +399,15 @@ files:
 - lib/oxidized/model/netonix.rb
 - lib/oxidized/model/netscaler.rb
 - lib/oxidized/model/nos.rb
+- lib/oxidized/model/nsxconfig.rb
+- lib/oxidized/model/nsxfirewall.rb
 - lib/oxidized/model/nxos.rb
 - lib/oxidized/model/oneos.rb
 - lib/oxidized/model/openbsd.rb
 - lib/oxidized/model/opengear.rb
 - lib/oxidized/model/openwrt.rb
 - lib/oxidized/model/opnsense.rb
+- lib/oxidized/model/os10.rb
 - lib/oxidized/model/outputs.rb
 - lib/oxidized/model/panos.rb
 - lib/oxidized/model/pfsense.rb
@@ -409,6 +415,7 @@ files:
 - lib/oxidized/model/powerconnect.rb
 - lib/oxidized/model/procurve.rb
 - lib/oxidized/model/purityos.rb
+- lib/oxidized/model/qtech.rb
 - lib/oxidized/model/quantaos.rb
 - lib/oxidized/model/raisecom.rb
 - lib/oxidized/model/routeros.rb
@@ -424,6 +431,7 @@ files:
 - lib/oxidized/model/stoneos.rb
 - lib/oxidized/model/supermicro.rb
 - lib/oxidized/model/tdre.rb
+- lib/oxidized/model/telco.rb
 - lib/oxidized/model/timos.rb
 - lib/oxidized/model/tmos.rb
 - lib/oxidized/model/tplink.rb
@@ -475,7 +483,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: feeble attempt at rancid