oxidized 0.24.0 → 0.25.0

data/lib/oxidized/model/dlink.rb

@@ -1,7 +1,7 @@
 class Dlink < Oxidized::Model
   # D-LINK Switches
 
-  prompt /^(\r*[\w.@():-]+[#>]\s?)$/
+  prompt /^(\r*[\w.@()\/:-]+[#>]\s?)$/
   comment '# '
 
   cmd :secret do |cfg|
@@ -15,7 +15,7 @@ class Dlink < Oxidized::Model
   end
 
   cmd 'show switch' do |cfg|
-    cfg.gsub! /^System\ Uptime\s.+/, '' # Omit constantly changing uptime info
+    cfg.gsub! /^System Uptime\s.+/, '' # Omit constantly changing uptime info
     comment cfg
   end
 

data/lib/oxidized/model/dnos.rb

@@ -5,13 +5,15 @@ class DNOS < Oxidized::Model
 
   cmd :all do |cfg|
     cfg.gsub! /^% Invalid input detected at '\^' marker\.$|^\s+\^$/, ''
-    cfg.gsub! /^Dell Networking OS uptime is\s.+/, '' # Omit constantly changing uptime info
+    cfg.gsub! /(uptime is)(\s.+)/, '\\1 <removed>' # Omit changing uptime info
     cfg.each_line.to_a[2..-2].join
   end
 
   cmd :secret do |cfg|
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
     cfg.gsub! /secret (\d+) (\S+).*/, '<secret hidden>'
+    cfg.gsub! /password (\d+) (\S+).*/, '<secret hidden>'
+    cfg.gsub! /^(tacacs-server key \d+) (\S+).*/, '\\1 <secret hidden>'
     cfg
   end
 

data/lib/oxidized/model/eciapollo.rb

@@ -0,0 +1,34 @@
+# ECI Telecom Apollo
+# Tested on OPT9608 systems via SSH and telnet
+
+class ECIapollo < Oxidized::Model
+  prompt /^([\w.@()-]+[#>]\s?)$/
+  comment '# '
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub!(/community (\S+) {/, 'community <hidden> {')
+    cfg.gsub!(/ "\$\d\$\S+; ## SECRET-DATA/, ' <secret removed>;')
+    cfg
+  end
+
+  cfg :telnet do
+    username(/^login:/)
+    password(/^Password:/)
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'set cli screen-length 0'
+    post_login 'set cli screen-width 0'
+    pre_logout 'exit'
+  end
+
+  cmd('show version')           { |cfg| comment cfg }
+  cmd('show system licenses')   { |cfg| comment cfg }
+  cmd('show configuration')     { |cfg| comment cfg }
+  cmd('show configuration | display-set') { |cfg| cfg }
+  cmd('show chassis inventory') { |cfg| comment cfg }
+end

data/lib/oxidized/model/edgecos.rb

@@ -15,6 +15,7 @@ class EdgeCOS < Oxidized::Model
 
   cmd 'show system' do |cfg|
     cfg.gsub! /^\s*System Up Time\s*:.*\n/i, ''
+    cfg.gsub! /^\s*(Temperature \d*:).*\n/i, '\\1 <removed>'
     comment cfg
   end
 

data/lib/oxidized/model/edgeos.rb

@@ -1,7 +1,7 @@
 class Edgeos < Oxidized::Model
   # EdgeOS #
 
-  prompt /\@.*?\:~\$\s/
+  prompt /@.*?:~\$\s/
 
   cmd :all do |cfg|
     cfg = cfg.lines.to_a[1..-2].join
@@ -16,6 +16,11 @@ class Edgeos < Oxidized::Model
     cfg
   end
 
+  cmd 'show version | no-more' do |cfg|
+    cfg.gsub! /^Uptime:\s.+/, ''
+    comment cfg
+  end
+
   cmd 'show configuration commands | no-more'
 
   cfg :telnet do

data/lib/oxidized/model/eos.rb

@@ -6,12 +6,13 @@ class EOS < Oxidized::Model
   comment  '! '
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
   cmd :secret do |cfg|
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
-    cfg.gsub! /username (\S+) privilege (\d+) (\S+).*/, '<secret hidden>'
+    cfg.gsub! /(secret \w+) (\S+).*/, '\\1 <secret hidden>'
+    cfg.gsub! /(password \d+) (\S+).*/, '\\1 <secret hidden>'
     cfg.gsub! /^(enable secret).*/, '\\1 <configuration removed>'
     cfg.gsub! /^(tacacs-server key \d+).*/, '\\1 <configuration removed>'
     cfg

data/lib/oxidized/model/fiberdriver.rb

@@ -3,7 +3,7 @@ class FiberDriver < Oxidized::Model
   comment "! "
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
   cmd 'show inventory' do |cfg|
     comment cfg

data/lib/oxidized/model/firebrick.rb

@@ -0,0 +1,31 @@
+class Firebrick < Oxidized::Model
+  # Firebrick #
+  prompt /\x0a\x1b\x5b\x32\x4b\x0d.*>\s/
+
+  cmd :all do |cfg|
+    # remove arbitrary whitespace after commands.
+    cfg.each_line.to_a[1..-2].drop_while { |e| e.match /^\s+$/ }.join
+  end
+
+  cmd 'show status' do |cfg|
+    cfg.gsub! /Status/, ''
+    cfg.gsub! /------/, ''
+    cfg.gsub! /Uptime.*/, ''
+    cfg.gsub! /Current time.*/, ''
+    cfg.gsub! /RAM.*/, ''
+    cfg.gsub! /Warranty.*/, ''
+
+    comment cfg
+  end
+
+  cmd 'show configuration'
+
+  cfg :telnet do
+    username /Username:\s?/
+    password /Password:\s?/
+  end
+
+  cfg :telnet, :ssh do
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/firewareos.rb

@@ -3,7 +3,7 @@ class FirewareOS < Oxidized::Model
   comment  '-- '
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
   # Handle Logon Disclaimer added in XTM 11.9.3

data/lib/oxidized/model/fortios.rb

@@ -1,7 +1,7 @@
 class FortiOS < Oxidized::Model
   comment '# '
 
-  prompt /^([-\w\.\~]+(\s[\(\w\-\.\)]+)?\~?\s?[#>$]\s?)$/
+  prompt /^([-\w.~]+(\s[(\w\-.)]+)?~?\s?[#>$]\s?)$/
 
   expect /^--More--\s$/ do |data, re|
     send ' '
@@ -19,9 +19,10 @@ class FortiOS < Oxidized::Model
     cfg.gsub! /(set .*secret) .+/, '\\1 <configuration removed>'
     # A number of other statements also contains sensitive strings
     cfg.gsub! /(set (?:passwd|password|key|group-password|auth-password-l1|auth-password-l2|rsso|history0|history1)) .+/, '\\1 <configuration removed>'
-    cfg.gsub! /(set private-key).*-+END ENCRYPTED PRIVATE KEY-*"$/m, '\\1 <configuration removed>'
-    cfg.gsub! /(set ca ).*-+END CERTIFICATE-*"$/m, '\\1 <configuration removed>'
-    cfg.gsub! /(set csr ).*-+END CERTIFICATE REQUEST-*"$/m, '\\1 <configuration removed>'
+    cfg.gsub! /(set md5-key [0-9]+) .+/, '\\1 <configuration removed>'
+    cfg.gsub! /(set private-key ).*?-+END (ENCRYPTED|RSA) PRIVATE KEY-*"$/m, '\\1<configuration removed>'
+    cfg.gsub! /(set ca ).*?-+END CERTIFICATE-*"$/m, '\\1<configuration removed>'
+    cfg.gsub! /(set csr ).*?-+END CERTIFICATE REQUEST-*"$/m, '\\1<configuration removed>'
     cfg.gsub! /(Cluster uptime:).*/, '\\1 <stripped>'
     cfg
   end

data/lib/oxidized/model/ftos.rb

@@ -9,7 +9,10 @@ class FTOS < Oxidized::Model
 
   cmd :secret do |cfg|
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
-    cfg.gsub! /secret (\d+) (\S+).*/, '<secret hidden>'
+    cfg.gsub! /(secret \d* {0,1})\S+(.*)/, '\\1<secret hidden>\\2'
+    cfg.gsub! /(password \d+) \S+(.*)/, '\\1 <hash hidden>\\2'
+    cfg.gsub! /(^snmp-server.*version \S+) \S+(.*)/, '\\1 <community removed>\\2'
+    cfg.gsub! /(^radius-server.*key \d )\S+/, '\\1<hash hidden>\\2'
     cfg
   end
 

data/lib/oxidized/model/fujitsupy.rb

@@ -1,9 +1,9 @@
 class FujitsuPY < Oxidized::Model
-  prompt /^(\([\w.-]*\)\s#|^\S+\#\s)$/
+  prompt /^(\([\w.-]*\)\s#|^\S+#\s)$/
   comment  '! '
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
   # 1Gbe switch
@@ -16,7 +16,7 @@ class FujitsuPY < Oxidized::Model
   cmd 'show system information' do |cfg|
     cfg.gsub! /^Current-time : [\w\s:]*$/, ''
     cfg.gsub! /^(\s{33}\^)$/, ''
-    cfg.gsub! /^(\% Invalid input detected at '\^' marker.)$/, ''
+    cfg.gsub! /^(% Invalid input detected at '\^' marker.)$/, ''
     comment cfg
   end
 

data/lib/oxidized/model/gaiaos.rb

@@ -8,7 +8,7 @@ class GaiaOS < Oxidized::Model
   comment  '# '
 
   cmd :all do |cfg|
-    cfg = cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
   cmd :secret do |cfg|

data/lib/oxidized/model/gcombnps.rb

@@ -22,7 +22,7 @@ class GcomBNPS < Oxidized::Model
 
   cmd :all do |cfg|
     cfg = cfg.gsub " \e[73D\e[K", '' # remove garbage remaining from the pager
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
   cmd :secret do |cfg|
@@ -42,6 +42,7 @@ class GcomBNPS < Oxidized::Model
       next if line.match /^  Bias Current\(mA\)/
       next if line.match /^  RX Power\(dBM\)/
       next if line.match /^  TX Power\(dBM\)/
+
       out << line
     end
 
@@ -57,6 +58,7 @@ class GcomBNPS < Oxidized::Model
     cfg.each_line do |line|
       next if line.match /^system run time        :/
       next if line.match /^switch temperature     :/
+
       out << line
     end
 

data/lib/oxidized/model/hatteras.rb

@@ -17,7 +17,7 @@ class Hatteras < Oxidized::Model
   end
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
   cmd "show switch\r" do |cfg|

data/lib/oxidized/model/hirschmann.rb

@@ -1,5 +1,5 @@
 class Hirschmann < Oxidized::Model
-  prompt /^[\(\w\s\w\)]+\s[>|#]+?$/
+  prompt /^[(\w\s)]+\s[>|#]+?$/
 
   comment '## '
 
@@ -10,7 +10,7 @@ class Hirschmann < Oxidized::Model
   end
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
   cmd 'show sysinfo' do |cfg|

data/lib/oxidized/model/hpebladesystem.rb

@@ -11,7 +11,7 @@ class HPEBladeSystem < Oxidized::Model
 
   cmd :all do |cfg|
     cfg = cfg.delete("\r").each_line.to_a[0..-1].map { |line| line.rstrip }.join("\n") + "\n"
-    cfg.each_line.to_a[0..-2].join
+    cfg.cut_tail
   end
 
   cmd :secret do |cfg|

data/lib/oxidized/model/ios.rb

@@ -20,21 +20,27 @@ class IOS < Oxidized::Model
     # cfg.gsub! /\cH+/, ''              # example how to handle pager
     # get rid of errors for commands that don't work on some devices
     cfg.gsub! /^% Invalid input detected at '\^' marker\.$|^\s+\^$/, ''
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
   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! /^(username \S+ privilege \d+) (\S+).*/, '\\1 <secret hidden>'
-    cfg.gsub! /^(username \S+ password \d) (\S+)/, '\\1 <secret hidden>'
-    cfg.gsub! /^(username \S+ secret \d) (\S+)/, '\\1 <secret hidden>'
-    cfg.gsub! /^(enable (password|secret) \d) (\S+)/, '\\1 <secret hidden>'
+    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>'
     cfg.gsub! /^(.*wpa-psk ascii \d) (\S+)/, '\\1 <secret hidden>'
     cfg.gsub! /^(.*key 7) (\d.+)/, '\\1 <secret hidden>'
-    cfg.gsub! /^(tacacs-server key \d) (\S+)/, '\\1 <secret hidden>'
+    cfg.gsub! /^(tacacs-server (.+ )?key) .+/, '\\1 <secret hidden>'
     cfg.gsub! /^(crypto isakmp key) (\S+) (.*)/, '\\1 <secret hidden> \\3'
+    cfg.gsub! /^(\s+ip ospf message-digest-key \d+ md5) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^(\s+ip ospf authentication-key) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^(\s+neighbor \S+ password) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^(\s+vrrp \d+ authentication text) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^(\s+standby \d+ authentication) .{1,8}$/, '\\1 <secret hidden>'
+    cfg.gsub! /^(\s+standby \d+ authentication md5 key-string) .+?( timeout \d+)?$/, '\\1 <secret hidden> \\2'
+    cfg.gsub! /^(\s+key-string) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^((tacacs|radius) server [^\n]+\n(\s+[^\n]+\n)*\s+key) [^\n]+$/m, '\1 <secret hidden>'
     cfg
   end
 
@@ -97,7 +103,7 @@ class IOS < Oxidized::Model
         comments << "CPU:#{slave} #{cpu}#{cpuxtra}#{slaveslot}";
       end
 
-      if line.match /^System image file is "([^\"]*)"$/
+      if line.match /^System image file is "([^"]*)"$/
         comments << "Image: #{$1}"
       end
     end
@@ -119,9 +125,9 @@ class IOS < Oxidized::Model
     cfg = cfg.each_line.to_a[3..-1]
     cfg = cfg.reject { |line| line.match /^ntp clock-period / }.join
     cfg.gsub! /^Current configuration : [^\n]*\n/, ''
-    cfg.gsub! /^\ tunnel\ mpls\ traffic-eng\ bandwidth[^\n]*\n*(
-                  (?:\ [^\n]*\n*)*
-                  tunnel\ mpls\ traffic-eng\ auto-bw)/mx, '\1'
+    cfg.gsub! /^ tunnel mpls traffic-eng bandwidth[^\n]*\n*(
+                  (?: [^\n]*\n*)*
+                  tunnel mpls traffic-eng auto-bw)/mx, '\1'
     cfg
   end
 
@@ -132,9 +138,11 @@ class IOS < Oxidized::Model
 
   cfg :telnet, :ssh do
     # preferred way to handle additional passwords
-    if vars :enable
-      post_login do
-        send "enable\n"
+    post_login do
+      if vars(:enable) == true
+        cmd "enable"
+      elsif vars(:enable)
+        cmd "enable", /^[pP]assword:/
         cmd vars(:enable)
       end
     end

data/lib/oxidized/model/ipos.rb

@@ -6,15 +6,15 @@ class IPOS < Oxidized::Model
   comment '! '
 
   cmd 'show chassis' do |cfg|
-    comment cfg.each_line.to_a[0..-2].join
+    comment cfg.cut_tail
   end
 
   cmd 'show hardware' do |cfg|
-    comment cfg.each_line.to_a[0..-2].join
+    comment cfg.cut_tail
   end
 
   cmd 'show release' do |cfg|
-    comment cfg.each_line.to_a[0..-2].join
+    comment cfg.cut_tail
   end
 
   cmd 'show configuration' do |cfg|

data/lib/oxidized/model/ironware.rb

@@ -1,5 +1,5 @@
 class IronWare < Oxidized::Model
-  prompt /^.*(telnet|ssh)\@.+[>#]\s?$/i
+  prompt /^.*(telnet|ssh)@.+[>#]\s?$/i
   comment  '! '
 
   # to handle pager without enable
@@ -30,8 +30,8 @@ class IronWare < Oxidized::Model
   cmd 'show chassis' do |cfg|
     cfg.encode!("UTF-8", :invalid => :replace, :undef => :replace) # sometimes ironware returns broken encoding
     cfg.gsub! /(^((.*)Current temp(.*))$)/, '' # remove unwanted lines current temperature
-    cfg.gsub! /Speed = [A-Z-]{2,6} \(\d{2,3}\%\)/, '' # remove unwanted lines Speed Fans
-    cfg.gsub! /current speed is [A-Z]{2,6} \(\d{2,3}\%\)/, ''
+    cfg.gsub! /Speed = [A-Z-]{2,6} \(\d{2,3}%\)/, '' # remove unwanted lines Speed Fans
+    cfg.gsub! /current speed is [A-Z]{2,6} \(\d{2,3}%\)/, ''
     cfg.gsub! /Fan \d* - STATUS: OK \D*\d*./, '' # Fix for ADX Fan speed reporting
     cfg.gsub! /\d* deg C/, '' # Fix for ADX temperature reporting
     cfg.gsub! /([\[]*)1([\]]*)<->([\[]*)2([\]]*)(<->([\[]*)3([\]]*))*/, ''

data/lib/oxidized/model/isam.rb

@@ -5,7 +5,7 @@ class ISAM < Oxidized::Model
   comment '# '
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
   cfg :telnet do

data/lib/oxidized/model/junos.rb

@@ -6,7 +6,7 @@ class JunOS < Oxidized::Model
   end
 
   cmd :all do |cfg|
-    cfg = cfg.lines.to_a[1..-2].join if screenscrape
+    cfg = cfg.cut_both if screenscrape
     cfg.gsub!(/  scale-subscriber (\s+)(\d+)/, '  scale-subscriber                <count>')
     cfg.lines.map { |line| line.rstrip }.join("\n") + "\n"
   end

data/lib/oxidized/model/masteros.rb

@@ -10,13 +10,12 @@ class MasterOS < Oxidized::Model
   end
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
     cfg.gsub /^(! Configuration ).*/, '!'
   end
 
   cmd 'show inventory' do |cfg|
-    cfg = cfg.each_line.to_a[0..-2].join
-    comment cfg
+    comment cfg.cut_tail
   end
 
   cmd 'show plugins' do |cfg|

data/lib/oxidized/model/mlnxos.rb

@@ -3,7 +3,7 @@ class MLNXOS < Oxidized::Model
   comment '## '
 
   # Pager Handling
-  expect /.+lines\s\d+\-\d+([\s]|\/\d+\s\(END\)\s).+$/ do |data, re|
+  expect /.+lines\s\d+-\d+([\s]|\/\d+\s\(END\)\s).+$/ do |data, re|
     send ' '
     data.sub re, ''
   end
@@ -12,10 +12,10 @@ class MLNXOS < Oxidized::Model
     cfg.gsub! /\[\?1h=\r/, '' # Pager Handling
     cfg.gsub! /\r\[K/, '' # Pager Handling
     cfg.gsub! /\s/, '' # Linebreak Handling
-    cfg.gsub! /^CPU\ load\ averages\:\s.+/, '' # Omit constantly changing CPU info
-    cfg.gsub! /^System\ memory\:\s.+/, '' # Omit constantly changing memory info
-    cfg.gsub! /^Uptime\:\s.+/, '' # Omit constantly changing uptime info
-    cfg.gsub! /.+Generated\ at\s\d+.+/, '' # Omit constantly changing generation time info
+    cfg.gsub! /^CPU load averages:\s.+/, '' # Omit constantly changing CPU info
+    cfg.gsub! /^System memory:\s.+/, '' # Omit constantly changing memory info
+    cfg.gsub! /^Uptime:\s.+/, '' # Omit constantly changing uptime info
+    cfg.gsub! /.+Generated at\s\d+.+/, '' # Omit constantly changing generation time info
     cfg = cfg.lines.to_a[2..-3].join
   end