oxidized 0.32.1 → 0.34.0

data/lib/oxidized/model/powerconnect.rb

@@ -5,13 +5,15 @@ class PowerConnect < Oxidized::Model
 
   comment '! '
 
-  expect /^\s*--More--\s+.*$/ do |data, re|
+  expect /\n\s*--More--\s+.*/ do |data, re| # Also grab the blank line above the --More--
     send ' '
     data.sub re, ''
   end
 
+  # Filter all command output
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-3].join
+    cfg.gsub! /\r+/, ''                     # Remove the CR characters echoed back from the commands
+    cfg.cut_tail                            # Drop the last line which is the next prompt
   end
 
   cmd :secret do |cfg|
@@ -32,7 +34,7 @@ class PowerConnect < Oxidized::Model
   end
 
   cmd 'show running-config' do |cfg|
-    cfg.sub(/^(sflow \S+ destination owner \S+ timeout )\d+$/, '! \1<timeout>')
+    cfg.sub(/^(sflow \S+ destination owner \S+ timeout )\d+$/, '! \1<timeout>') # Remove changing timeout
   end
 
   cfg :telnet, :ssh do
@@ -50,15 +52,21 @@ class PowerConnect < Oxidized::Model
       end
     end
 
-    post_login "terminal datadump"
-    post_login "terminal length 0"
-    pre_logout "logout"
-    pre_logout "exit"
+    post_login do
+      cmd "terminal datadump"
+      cmd "terminal length 0"
+    end
+    pre_logout do
+      send "exit\r"
+      sleep(0.25)
+      send "logout\r"
+    end
   end
 
   def clean(cfg)
     out = []
-    skip_blocks = 0
+    len1 = len2 = skip_blocks = 0
+
     cfg.each_line do |line|
       # If this is a stackable switch we should skip this block of information
       if line.match(/Up\sTime|Temperature|Power Suppl(ies|y)|Fans/i) && (@stackable == true)
@@ -71,9 +79,22 @@ class PowerConnect < Oxidized::Model
         skip_blocks -= 1 if /\S/ !~ line
         next
       end
-      out << line.strip
+      line = line.strip
+      # If the temps were not removed by skipping blocks, then mask them out wih XXX
+      # The most recent set of dashes has the spacing we want to match
+      if (match = line.match(/^(---+ +)(---+ +)/))
+        one, two = match.captures
+        len1 = one.length
+        len2 = two.length
+      end
+      # This can only be a temperature, right? ;-)
+      if (match = line.match(/^(\d{1,2}) {3,}\d+ (.*)$/))
+        one, two = match.captures
+        line = one.to_s + (' ' * (len1 - one.length)) + "XXX" + (' ' * (len2 - 3)) + two.to_s
+      end
+      out << line
     end
-    out = out.reject { |line| line[/Up\sTime/] }
+    out = out.reject { |line| line[/Up\sTime/] } # Filter out Up Time
     out = comment out.join "\n"
     out << "\n"
   end

data/lib/oxidized/model/procurve.rb

@@ -75,7 +75,9 @@ class Procurve < Oxidized::Model
 
   # not supported on all models
   cmd 'show system information' do |cfg|
-    cfg = cfg.each_line.reject { |line| line.match /(.*CPU.*)|(.*Up Time.*)|(.*Total.*)|(.*Free.*)|(.*Lowest.*)|(.*Missed.*)/ }
+    cfg = cfg.each_line.reject do |line|
+      line.match /(.*CPU.*)|(.*Up Time.*)|(.*Total.*)|(.*Free.*)|(.*Lowest.*)|(.*Missed.*)/
+    end
     cfg = cfg.join
     comment cfg
   end

data/lib/oxidized/model/qtech.rb

@@ -16,7 +16,9 @@ class QTECH < Oxidized::Model
   end
 
   cmd 'show version' do |cfg|
-    comment cfg.each_line.reject { |line| line.match /^  (Copyright |All rights reserved$|Uptime is |Last reboot is )/ }.join
+    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|

data/lib/oxidized/model/quantaos.rb

@@ -1,15 +1,17 @@
 class QuantaOS < Oxidized::Model
   using Refinements
 
-  prompt /^\((\w|\S)+\) (>|#)$/
+  prompt /^\(\S+\) (>|#)$/
   comment '! '
 
+  cmd :all do |cfg|
+    # Remove command echo and prompt
+    cfg.cut_both
+  end
+
   cmd 'show run' do |cfg|
-    cfg.each_line.select do |line|
-      (not line.match /^!.*$/) &&
-        (not line.match /^\((\w|\S)+\) (>|#)$/) &&
-        (not line.match /^show run$/)
-    end.join
+    # Remove commented lines
+    cfg.lines.grep_v(/^!/).join
   end
 
   cfg :telnet do

data/lib/oxidized/model/routeros.rb

@@ -11,7 +11,7 @@ class RouterOS < Oxidized::Model
       cfg.gsub! /^\r+(.+)/, '\1'
       cfg.gsub! /([^\r]*)\r+$/, '\1'
     end
-    cfg
+    cfg.lines.map { |line| line.rstrip }.join("\n") + "\n" # strip trailing whitespace
   end
 
   cmd '/system resource print' do |cfg|
@@ -30,7 +30,7 @@ class RouterOS < Oxidized::Model
   end
 
   post do
-    Oxidized.logger.debug "lib/oxidized/model/routeros.rb: running /export for routeros version #{@ros_version}"
+    logger.debug "Running /export for routeros version #{@ros_version}"
     run_cmd = if vars(:remove_secret)
                 '/export hide-sensitive'
               elsif (not @ros_version.nil?) && (@ros_version >= 7)
@@ -45,6 +45,7 @@ class RouterOS < Oxidized::Model
       cfg.gsub! "# poe-out status: short_circuit\r\n", '' # Remove intermittent POE short_circuit comment
       cfg.gsub! "# Firmware upgraded successfully, please reboot for changes to take effect!\r\n", '' # Remove transient firmware upgrade comment
       cfg.gsub! /# \S+ not ready\r\n/, '' # Remove intermittent $interface not ready comment
+      cfg.gsub! /# .+ please restart the device in order to apply the new setting\r\n/, '' # Remove intermittent restart needed comment. (e.g. for ipv6 settings)
       cfg = cfg.split("\n")
       cfg.reject! { |line| line[/^#\s\w{3}\/\d{2}\/\d{4}.*$/] } # Remove date time and 'by RouterOS' comment (v6)
       cfg.reject! { |line| line[/^#\s\d{4}-\d{2}-\d{2}.*$/] }   # Remove date time and 'by RouterOS' comment (v7)

data/lib/oxidized/model/saos10.rb

@@ -0,0 +1,38 @@
+class SAOS10 < Oxidized::Model
+  using Refinements
+  # Ciena SAOS switch
+  # used for 10.x devices
+
+  prompt /^[\w\-]+\*?> ?$/
+  comment  '# '
+
+  cmd :all do |cfg|
+    cfg.cut_both
+  end
+
+  cmd('show system hostname') { |cfg| comment cfg }
+
+  cmd('show software') { |cfg| comment cfg }
+
+  cmd('show system components') { |cfg| comment cfg }
+
+  cmd('show system health') { |cfg| comment cfg }
+
+  cmd('show system last-reset-reasons') { |cfg| comment cfg }
+
+  cmd 'show running config' do |cfg|
+    cfg.gsub! /^! Created: [^\n]*\n/, ''
+    cfg.gsub! /^! On terminal: [^\n]*\n/, ''
+    cfg
+  end
+
+  cfg :telnet do
+    username /login:/
+    password /assword:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'set session more off'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/sixwind.rb

@@ -0,0 +1,28 @@
+class SixWind < Oxidized::Model
+  using Refinements
+
+  prompt /^[\w\s\(\).@_\/:-]+[>] $/
+  comment '# '
+
+  cmd :all do |cfg|
+    cfg.cut_both
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub!(/(?<!  {1})(?:password|secret) (?:\d )?\S+/, '\\1 <secret hidden>') # double space to exclude radius password template
+    cfg
+  end
+
+  cmd 'show product version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show config' do |cfg|
+    cfg
+  end
+
+  cfg :ssh do
+    post_login 'cliconfig pager enabled false'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/sonicos.rb

@@ -56,7 +56,7 @@ class SonicOS < Oxidized::Model
       next if line =~ /date \d{4}:\d{2}:\d{2}/
       next if line =~ /time \d{2}:\d{2}:\d{2}/
       next if line =~ /system-time "\d{2}\/\d{2}\/\d{4} \d{2}:\d{2}:\d{2}.\d+"/
-      next if line =~ /system-uptime "((\s+up\s+\d+\s+)|(\d+\s\w+(,\s)?)*)"/
+      next if line =~ /system-uptime "(?:\s+up\s+\d+\s+|\d+ \w+(?:, \d+ \w+)*)"/
       next if line =~ /checksum \d+/
 
       line = line[1..-1] if line[0] == "\r"

data/lib/oxidized/model/srosmd.rb

@@ -26,7 +26,7 @@ class SROSMD < Oxidized::Model
     #
     # Strip uptime.
     #
-    cfg.sub! /^System Up Time.*\n/, ''
+    cfg.gsub! /^System Up Time.*\n/, ''
     comment cfg
   end
 

data/lib/oxidized/model/supermicro.rb

@@ -5,6 +5,6 @@ require_relative 'edgecos'
 
 Supermicro = EdgeCOS
 
-Oxidized.logger.warn "Using deprecated model supermicro, use edgecos instead."
+logger.warn "Using deprecated model supermicro, use edgecos instead."
 
 # Deprecated

data/lib/oxidized/model/timos.rb

@@ -5,6 +5,6 @@ require_relative 'sros'
 
 TiMOS = SROS
 
-Oxidized.logger.warn "Using deprecated model timos, use sros instead."
+logger.warn "Using deprecated model timos, use sros instead."
 
 # Deprecated

data/lib/oxidized/model/tmos.rb

@@ -32,6 +32,7 @@ class TMOS < Oxidized::Model
     cfg.gsub!(/^\s+bandwidth-bps (\d+)/, '')
     cfg.gsub!(/^\s+bandwidth-cps (\d+)/, '')
     cfg.gsub!(/^\s+bandwidth-pps (\d+)\n/, '')
+    cfg.gsub!(/^\s*\S*encrypted \S+\n/, '')
     cfg
   end
 

data/lib/oxidized/model/tnsr.rb

@@ -0,0 +1,53 @@
+class TNSR < Oxidized::Model
+  using Refinements
+
+  # Netgate TNSR #
+
+  # prompt examples
+  # https://docs.netgate.com/tnsr/en/latest/basics/working-cli.html#command-prompt
+  #  "<hostname> tnsr<(mode)># " <-- with trailing whitespace
+  #  tnsr-dev-25-02 tnsr#
+  #  tnsr-dev-25-02 tnsr(config)#  <-- after "configure terminal", but this is not important for oxidized
+  # prompt from debug log
+  #  received "Welcome to Netgate TNSR Version: 25.02-2\r\n\r\n\t* Documentation:  https://docs.netgate.com/tnsr/en/latest/\r\n\t* Support:        https://www.netgate.com/support\r\n\r\n   _          __________\r\n _| |_ _ __  | ___ _ __ |\r\n|_  __| '_ \\ |/ __| '__||\r\n  | |_| | | ||\\__ \\ |   |\r\n   \\__|_| |_|||___/_|   |\r\n             |__________|\r\n\r\n\r\n"
+  #  received "\r\nVersion: 25.02-2\r\n\r\nFor information see 'show documentation'\r\n\r\n"
+  #  received "\rbgp01 tnsr# "
+  # when the --More-- pager is the last line of paged output, the prompt contains \x08\x20\x08 orphans on the begin
+  #  you can look for context into spec simulation:
+  #    spec/model/data/tnsr:TNSR_24.10-3_short-config:simulation.yaml
+  #    spec/model/data/tnsr:TNSR_25.02-2_long-config-and-pager-at-last-line:simulation.yaml
+  prompt /^((\x08{8}\x20{8}\x08{8})?\r?[\w-]+\stnsr#\s?)$/
+
+  comment '! '
+
+  expect /^--More--/ do |data, re|
+    send ' '
+    data.sub re, ''
+  end
+
+  cmd :all do |cfg|
+    # remove orphans \r
+    cfg.gsub! /^\r+(.+)/, '\1'
+    # handle pager orphans ^H^H^H^H^H^H^H^H        ^H^H^H^H^H^H^H^H
+    cfg.gsub! /\x08{8}\x20{8}\x08{8}/, ''
+    cfg.cut_both
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /(password( \d+)?) (\S+).*/, '\\1 <secret hidden>'
+    cfg.gsub! /^(snmp community community-name )\S+ (.*)?/, '\\1 <configuration removed> \\2'
+    cfg
+  end
+
+  cmd 'show version all' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show configuration running cli' do |cfg|
+    cfg
+  end
+
+  cfg :telnet, :ssh do
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/trango.rb

@@ -18,7 +18,9 @@ class Trango < Oxidized::Model
       out << ("freq " + Regexp.last_match[1] + ' ' + Regexp.last_match[2]) if line =~ /\[Active Channel\] (\d+) (v|h)/
       out << ("peerid " + Regexp.last_match[1]) if line =~ /\[Peer ID\] ([A-F0-9]+)/
       out << ("utype " + Regexp.last_match[1]) if line =~ /\[Unit Type\] (\S+)/
-      comments << ('# ' + Regexp.last_match[1] + ': ' + Regexp.last_match[2]) if line =~ /\[(Hardware Version|Firmware Version|Model|S\/N)\] (\S+)/
+      if line =~ /\[(Hardware Version|Firmware Version|Model|S\/N)\] (\S+)/
+        comments << ('# ' + Regexp.last_match[1] + ': ' + Regexp.last_match[2])
+      end
       out << ("remarks " + Regexp.last_match[1]) if line =~ /\[Remarks\] (\S+)/
       out << ("rssiled " + Regexp.last_match[1]) if line =~ /\[RSSI LED\] (on|off)/
       speed = Regexp.last_match[1] if line =~ /\[Speed\] (\d+) Mbps/

data/lib/oxidized/model/unifiap.rb

@@ -0,0 +1,144 @@
+class Unifiap < Oxidized::Model
+  using Refinements
+
+  # Ubiquiti Unifi AP circa 6.x
+  # Should also work for unfi switches, and airOS, maybe they could be combined.
+  # Since it relies on exec channels, because the interactive session wouldn't
+  # capture all of the system.cfg output, you can't use telnet with this model.
+
+  # Sometimes there's a handy info command that summarizes some device attributes,
+  # but it doesn't seem to be available in exec mode. So we try to build up a similar
+  # list by extracting tidbits from various places. AirOS doesn't have some of these
+  # files, so we  # may have to fall back on other commands, or locations.
+
+  # First get the board model
+  cmd 'head -4 /etc/board.info' do |cfg|
+    @model = Regexp.last_match(1) if cfg =~ /board\.name=(\S+)/i
+    ""
+  end
+
+  # and version
+  cmd 'cat /etc/version' do |cfg|
+    @version = Regexp.last_match(1) if cfg =~ /(\S+)$/i
+    ""
+  end
+
+  # Now the Mac address
+  cmd 'ifconfig eth0' do |cfg|
+    @mac = Regexp.last_match(1) if cfg =~ /eth0\s+Link encap:Ethernet\s+HWaddr\s+(\w+:\w+:\w+:\w+:\w+:\w+)/i
+    ""
+  end
+
+  # Next see if we can get our IP and host name out of /etc/hosts
+  cmd 'cat /etc/hosts' do |cfg|
+    cfg = cfg.split("\n").reject do |line|
+      line[/^\s*(127|0000:0000:0000:0000:0000:0000:0000:0001|0:0:0:0:0:0:0:1|::1)/]
+    end
+    cfg.select do |line|
+      if (match = line.match(/(\d+\.\d+\.\d+\.\d+)\s+(\S+)/))
+        @ip, @hostname = match.captures
+      end
+    end
+    ""
+  end
+
+  # We check here to see if we succeeded with /etc/hosts. If not, then we try again with ifconfig, and /tmp/system.cfg
+  cmd 'echo' do
+    unless @ip
+      cmd 'ifconfig br0' do |cfg|
+        @ip = Regexp.last_match(1) if cfg =~ /inet addr:\s*(\d+\.\d+\.\d+\.\d+)/i
+      end
+
+      unless @ip
+        cmd 'ifconfig eth0' do |cfg|
+          @ip = Regexp.last_match(1) if cfg =~ /inet addr:\s*(\d+\.\d+\.\d+\.\d+)/i
+        end
+      end
+    end
+
+    unless @hostname
+      cmd 'cat /tmp/system.cfg' do |cfg|
+        @hostname = Regexp.last_match(1) if cfg =~ /resolv.host.1.name=(\S+)/i
+      end
+    end
+    ""
+  end
+
+  # Check if ntpclient is running
+  cmd 'ps wwww' do |cfg|
+    @ntpserver = Regexp.last_match(1) if cfg =~ /bin\/ntpclient.+-h\s*(\S+)/i
+    ""
+  end
+
+  # If it's a Unifi device it may have NTP health indication
+  # If there are other places that Ubiquiti puts these status files, add them here.
+  cmd '[ -e /tmp/run/ntp.ready ] || [ -e /var/run/ntp.ready ] && echo "File(s) exist(s)" || echo "No such file"' do |cfg|
+    if cfg =~ /No such file/i
+      if @ntpserver
+        # Ok, now lets try getting the skew from the output of ntpclient
+        cmd "ntpclient -d -n -c 2 -i0 -h #{@ntpserver}" do |ntp_out|
+          @skew = ntpskew(ntp_out)
+        end
+        @sync = !@skew.nil? && @skew.to_f.abs < 1e6 ? "Synchronized" : "FAIL"
+      end
+    else
+      @ntpserver = true
+      @sync = "Synchronized"
+    end
+    ""
+  end
+
+  # Now we can display it all as a banner
+  cmd 'echo' do
+    out = []
+    out << "*************************"
+    out << "Model:       #{@model}"
+    out << "Version:     #{@version}"
+    out << "MAC Address: #{@mac}"
+    out << "IP Address:  #{@ip}"
+    out << "Hostname:    #{@hostname}"
+    out << "NTP:         #{@sync}" if @ntpserver
+    out << "*************************"
+    comment out.join("\n") + "\n"
+  end
+
+  # Followed by the board info
+  cmd 'cat /etc/board.info' do |cfg|
+    cfg = "#\n# Board Info:\n#\n" + cfg
+    comment cfg
+  end
+
+  # Lastly the system config
+  cmd 'cat /tmp/system.cfg' do |cfg|
+    cfg = "#\n# System Config:\n#\n" + cfg
+    cfg + "\n"
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^((?:users|snmp\.(?:user|community))\.\d+\.password)=.+/, "# \\1=<hidden>"
+    cfg
+  end
+
+  cfg :ssh do
+    exec true # Don't run shell, run each command in exec channel
+  end
+
+  # NTPskew: Return the skew in micro seconds from the ntpclient output
+  def ntpskew(cfg)
+    index = skew = nil
+
+    cfg.each_line do |line|
+      # Look for the header just before the stats line, and find which number is skew
+      if line.match(/^\s*[a-z]+\s+[a-z]+\s+[a-z]+\s+[a-z]+/i)
+        words = line.split
+        index = words.map(&:downcase).index("skew")
+      end
+      # Now look for the single stats line and grab the skew
+      if !index.nil? && line.match(/^\s*[\d.]+\s+[\d.]+\s+[\d.]+\s+[\d.]+/)
+        numbers = line.split
+        skew = numbers[index]
+      end
+    end
+    skew
+  end
+end

data/lib/oxidized/model/vrp.rb

@@ -27,7 +27,9 @@ class VRP < Oxidized::Model
   end
 
   cmd 'display version' do |cfg|
-    cfg = cfg.each_line.reject { |l| l.match /uptime|^\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d(\.\d\d\d)? ?(\+\d\d:\d\d)?$/ }.join
+    cfg = cfg.each_line.reject do |l|
+      l.match /uptime|^\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d(\.\d\d\d)? ?(\+\d\d:\d\d)?$/
+    end.join
     comment cfg
   end
 

data/lib/oxidized/model/xos.rb

@@ -33,7 +33,9 @@ class XOS < Oxidized::Model
 
   cmd 'show switch' do |cfg|
     cfg.gsub! /Next periodic save on.*/, ''
-    comment cfg.each_line.reject { |line| line.match(/Time:/) || line.match(/boot/i) || line.match(/Next periodic/) }.join
+    comment cfg.each_line.reject { |line|
+      line.match(/Time:/) || line.match(/boot/i) || line.match(/Next periodic/)
+    }.join
   end
 
   cmd 'show configuration' do |cfg|

data/lib/oxidized/model/zhoneolt.rb

@@ -36,7 +36,9 @@ class ZhoneOLT < Oxidized::Model
   end
 
   cmd 'ethrpshow' do |cfg|
-    cfg = cfg.each_line.select { |line| line.match /Vendor (Name|OUI|Part|Revision)|Serial Number|Manufacturing Date/ }.join
+    cfg = cfg.each_line.select do |line|
+      line.match /Vendor (Name|OUI|Part|Revision)|Serial Number|Manufacturing Date/
+    end.join
     comment cfg
   end
 

data/lib/oxidized/model/zynos.rb

@@ -1,9 +1,9 @@
 class ZyNOS < Oxidized::Model
   using Refinements
 
-  prompt /^([\w.@()-<]+[#>]\s?)$/
+  prompt /^([\w.@()\-<]+[#>]\s?)$/
   # if there is something you can not identify after prompt, uncomment next line and comment previous line
-  # prompt /^([\w.@()-<]+[#>]\s?).*$/
+  # prompt /^([\w.@()\-<]+[#>]\s?).*$/
 
   comment '! '
 
@@ -21,7 +21,7 @@ class ZyNOS < Oxidized::Model
   end
 
   # ignore copyright motd
-  expect /^(Copyright .*)\n^([\w.@()-<]+[#>]\s?)$/ do
+  expect /^(Copyright .*)\n^([\w.@()\-<]+[#>]\s?)$/ do
     send '\n'
     ""
   end