oxidized 0.24.0 → 0.25.0

data/lib/oxidized/model/adtran.rb

@@ -0,0 +1,22 @@
+class Adtran < Oxidized::Model
+  # Adtran
+
+  prompt /([\w.@-]+[#>]\s?)$/
+
+  cmd :secret do |cfg|
+    cfg.gsub!(/password (\S+)/, 'password <hidden>')
+    cfg
+  end
+
+  cmd 'show running-config'
+
+  cfg :ssh do
+    post_login do
+      send "enable\n"
+      cmd vars(:enable)
+    end
+    post_login 'terminal length 0'
+    pre_logout 'exit'
+    sleep 1
+  end
+end

data/lib/oxidized/model/aen.rb

@@ -3,14 +3,14 @@ class AEN < Oxidized::Model
 
   comment '# '
 
-  prompt /^([-\w.\/:?\[\]\(\)]+:\s?)$/
+  prompt /^([-\w.\/:?\[\]()]+:\s?)$/
 
   cmd 'configuration generate-script module all' do |cfg|
     cfg
   end
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
   cfg :ssh do

data/lib/oxidized/model/aireos.rb

@@ -3,10 +3,10 @@ class Aireos < Oxidized::Model
   # Used in Cisco WLC 5500
 
   comment '# ' # this complains too, can't find real comment char
-  prompt /^\([^\)]+\)\s>/
+  prompt /^\([^)]+\)\s>/
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
   # show sysinfo?
@@ -44,6 +44,7 @@ class Aireos < Oxidized::Model
     cfg.each_line do |line|
       next if line.match /^\s*$/
       next if line.match /rogue (adhoc|client) (alert|Unknown) [\da-f]{2}:/
+
       line = line[1..-1] if line[0] == "\r"
       out << line.strip
     end

data/lib/oxidized/model/alteonos.rb

@@ -35,13 +35,13 @@ class ALTEONOS < Oxidized::Model
   end
 
   # Answer for Dispay private keys
-  expect /^Display private keys\?\s?\[y\/n\]\: $/ do |data, re|
+  expect /^Display private keys\?\s?\[y\/n\]: $/ do |data, re|
     send "n\r"
     data.sub re, ''
   end
 
   # Answer for sync to peer on exit
-  expect /^Confirm Sync to Peer\s?\[y\/n\]\: $/ do |data, re|
+  expect /^Confirm Sync to Peer\s?\[y\/n\]: $/ do |data, re|
     send "n\r"
     data.sub re, ''
   end

data/lib/oxidized/model/aos.rb

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

data/lib/oxidized/model/aos7.rb

@@ -6,7 +6,7 @@ class AOS7 < Oxidized::Model
 
   cmd :all do |cfg, cmdstring|
     new_cfg = comment "COMMAND: #{cmdstring}\n"
-    new_cfg << cfg.each_line.to_a[1..-2].join
+    new_cfg << cfg.cut_both
   end
 
   cmd 'show system' do |cfg|

data/lib/oxidized/model/aosw.rb

@@ -13,7 +13,7 @@ class AOSW < Oxidized::Model
   prompt /^\(?.+\)?\s[#>]/
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
   cmd :secret do |cfg|
@@ -25,8 +25,8 @@ class AOSW < Oxidized::Model
     cfg.gsub!(/ sha (\S+)/, ' sha <secret removed>')
     cfg.gsub!(/ des (\S+)/, ' des <secret removed>')
     cfg.gsub!(/mobility-manager (\S+) user (\S+) (\S+)/, 'mobility-manager \1 user \2 <secret removed>')
-    cfg.gsub!(/mgmt-user (\S+) (root|guest\-provisioning|network\-operations|read\-only|location\-api\-mgmt) (\S+)$/, 'mgmt-user \1 \2 <secret removed>') # MAS & Wireless Controler
-    cfg.gsub!(/mgmt-user (\S+) (\S+)( (read\-only|guest\-mgmt))?$/, 'mgmt-user \1 <secret removed> \3') # IAP
+    cfg.gsub!(/mgmt-user (\S+) (root|guest-provisioning|network-operations|read-only|location-api-mgmt) (\S+)$/, 'mgmt-user \1 \2 <secret removed>') # MAS & Wireless Controler
+    cfg.gsub!(/mgmt-user (\S+) (\S+)( (read-only|guest-mgmt))?$/, 'mgmt-user \1 <secret removed> \3') # IAP
     # MAS format: mgmt-user <username> <accesslevel> <password hash>
     # IAP format (root user): mgmt-user <username> <password hash>
     # IAP format: mgmt-user <username> <password hash> <access level>
@@ -63,6 +63,7 @@ class AOSW < Oxidized::Model
     cfg.each_line do |line|
       next if line.match /^controller config \d+$/
       next if line.match /^Building Configuration/
+
       out << line.strip
     end
     out = out.join "\n"
@@ -106,6 +107,7 @@ class AOSW < Oxidized::Model
       next if line.match /(Tachometers|Temperatures|Voltages)/
       next if line.match /((Card|CPU) Temperature|Chassis Fan|VMON1[0-9])/
       next if line.match /[0-9]+\s+(RPMS?|m?V|C)/i
+
       out << line.strip
     end
     out = comment out.join "\n"

data/lib/oxidized/model/apc_aos.rb

@@ -1,6 +1,6 @@
 class Apc_aos < Oxidized::Model
   cmd 'config.ini' do |cfg|
-    cfg.gsub! /^; Configuration file\, generated on.*/, ''
+    cfg.gsub! /^; Configuration file, generated on.*/, ''
   end
 
   cfg :ftp do

data/lib/oxidized/model/arbos.rb

@@ -5,8 +5,8 @@ class ARBOS < Oxidized::Model
   comment '# '
 
   cmd 'system hardware' do |cfg|
-    cfg.gsub! /^Boot\ time\:\s.+/, '' # Remove boot timer
-    cfg.gsub! /^Load\ averages\:\s.+/, '' # Remove CPU load info
+    cfg.gsub! /^Boot time:\s.+/, '' # Remove boot timer
+    cfg.gsub! /^Load averages:\s.+/, '' # Remove CPU load info
     cfg = cfg.each_line.to_a[2..-1].join
     comment cfg
   end

data/lib/oxidized/model/asa.rb

@@ -6,16 +6,22 @@ class ASA < 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! /enable password (\S+) (.*)/, 'enable password <secret hidden> \2'
+    cfg.gsub! /^passwd (\S+) (.*)/, 'passwd <secret hidden> \2'
     cfg.gsub! /username (\S+) password (\S+) (.*)/, 'username \1 password <secret hidden> \3'
     cfg.gsub! /(ikev[12] ((remote|local)-authentication )?pre-shared-key) (\S+)/, '\1 <secret hidden>'
-    cfg.gsub! /^(aaa-server TACACS\+? \(\S+\) host.*\n\skey) \S+$/mi, '\1 <secret hidden>'
+    cfg.gsub! /^(aaa-server TACACS\+? \(\S+\) host[^\n]*\n(\s+[^\n]+\n)*\skey) \S+$/mi, '\1 <secret hidden>'
+    cfg.gsub! /^(aaa-server \S+ \(\S+\) host[^\n]*\n(\s+[^\n]+\n)*\s+key) \S+$/mi, '\1 <secret hidden>'
     cfg.gsub! /ldap-login-password (\S+)/, 'ldap-login-password <secret hidden>'
     cfg.gsub! /^snmp-server host (.*) community (\S+)/, 'snmp-server host \1 community <secret hidden>'
+    cfg.gsub! /^(failover key) .+/, '\1 <secret hidden>'
+    cfg.gsub! /^(\s+ospf message-digest-key \d+ md5) .+/, '\1 <secret hidden>'
+    cfg.gsub! /^(\s+ospf authentication-key) .+/, '\1 <secret hidden>'
+    cfg.gsub! /^(\s+neighbor \S+ password) .+/, '\1 <secret hidden>'
     cfg
   end
 

data/lib/oxidized/model/awplus.rb

@@ -16,7 +16,7 @@ class AWPlus < Oxidized::Model
     cfg.gsub! /\e\[K/, ''         # example how to handle pager - cleareol EL0
     cfg.gsub! /\e\[7m\e\[m/, ''   # example how to handle pager - Reverse SGR7
     cfg.gsub! /\r/, '' # Filters rogue ^M - see issue #415
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
   # Remove passwords from config file.

data/lib/oxidized/model/axos.rb

@@ -0,0 +1,16 @@
+class AxOS < Oxidized::Model
+  prompt /(\x1b\[\?7h)?([\w.@()-]+[#]\s?)$/
+  comment '! '
+
+  cmd 'show running-config | nomore' do |cfg|
+    cfg.cut_head
+  end
+
+  cmd :all do |cfg|
+    cfg.cut_tail
+  end
+
+  cfg :ssh do
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/c4cmts.rb

@@ -17,9 +17,8 @@ class C4CMTS < Oxidized::Model
   end
 
   cmd 'show environment' do |cfg|
-    cfg.gsub! /\s+[\-\d]+\s+C\s+[\(\s\d]+\s+\F\)/, ''	# remove temperature readings
-    cfg.each_line.to_a[1..-2].join
-    comment cfg
+    cfg.gsub! /\s+[\-\d]+\s+C\s+[(\s\d]+\s+F\)/, ''	# remove temperature readings
+    comment cfg.cut_both
   end
 
   cmd 'show version' do |cfg|
@@ -29,8 +28,7 @@ class C4CMTS < Oxidized::Model
   end
 
   cmd 'show running-config' do |cfg|
-    cfg = cfg.each_line.to_a[1..-2].join
-    cfg
+    cfg.cut_both
   end
 
   cfg :telnet do

data/lib/oxidized/model/casa.rb

@@ -14,7 +14,7 @@ class Casa < Oxidized::Model
   end
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
   cmd 'show system' do |cfg|

data/lib/oxidized/model/catos.rb

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

data/lib/oxidized/model/ciscosma.rb

@@ -4,7 +4,7 @@ class CiscoSMA < Oxidized::Model
   comment '! '
 
   # Select passphrase display option
-  expect /using loadconfig command\. \[Y\]\>/ do |data, re|
+  expect /using loadconfig command\. \[Y\]>/ do |data, re|
     send "y\n"
     data.sub re, ''
   end

data/lib/oxidized/model/ciscosmb.rb

@@ -15,7 +15,13 @@ class CiscoSMB < Oxidized::Model
   cmd :secret do |cfg|
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
     cfg.gsub! /username (\S+) privilege (\d+) (\S+).*/, '<secret hidden>'
+    cfg.gsub! /^(username \S+ password encrypted) \S+(.*)/, '\\1 <secret hidden> \\2'
+    cfg.gsub! /^(enable password level \d+ encrypted) \S+/, '\\1 <secret hidden>'
     cfg.gsub! /^(encrypted radius-server key).*/, '\\1 <configuration removed>'
+    cfg.gsub! /^(encrypted radius-server host .+ key) \S+(.*)/, '\\1 <secret hidden> \\2'
+    cfg.gsub! /^(encrypted tacacs-server key).*/, '\\1 <secret hidden>'
+    cfg.gsub! /^(encrypted tacacs-server host .+ key) \S+(.*)/, '\\1 <secret hidden> \\2'
+    cfg.gsub! /^(encrypted sntp authentication-key \d+ md5) .*/, '\\1 <secret hidden>'
     cfg
   end
 
@@ -24,7 +30,7 @@ class CiscoSMB < Oxidized::Model
   end
 
   cmd 'show system' do |cfg|
-    cfg.gsub! /System Up Time.*/, ''
+    cfg.gsub! /System Up Time.*\n/, ''
     comment cfg
   end
 
@@ -36,9 +42,9 @@ class CiscoSMB < Oxidized::Model
     cfg = cfg.each_line.to_a[0..-1].join
     cfg.gsub! /^Current configuration : [^\n]*\n/, ''
     cfg.sub! /^(ntp clock-period).*/, '! \1'
-    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
 

data/lib/oxidized/model/comtrol.rb

@@ -0,0 +1,41 @@
+class Comtrol < Oxidized::Model
+  # Used in Comtrol Industrial Switches, such as RocketLinx ES8510
+
+  # Typical prompt "<hostname>#"
+  prompt /([#>]\s?)$/
+  comment '! '
+
+  # how to handle pager
+  expect /--More--+\s$/ do |data, re|
+    send ' '
+    data.sub re, ''
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg
+  end
+
+  cfg :telnet do
+    username /^User name:/i
+    password /^Password:/i
+  end
+
+  cfg :telnet, :ssh do
+    if vars :enable
+      post_login do
+        send "enable\n"
+        # Interpret enable: true as meaning we won't be prompted for a password
+        unless vars(:enable).is_a? TrueClass
+          expect /[pP]assword:\s?$/
+          send vars(:enable) + "\n"
+        end
+        expect /^.+[#]\s?$/
+      end
+    end
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/comware.rb

@@ -15,7 +15,7 @@ class Comware < Oxidized::Model
     # cfg.gsub! /^.*\e\[42D/, ''        # example how to handle pager
     # skip rogue ^M
     cfg = cfg.gsub /\r/, ''
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
   cmd :secret do |cfg|

data/lib/oxidized/model/coriantgroove.rb

@@ -8,21 +8,19 @@ class CoriantGroove < Oxidized::Model
   end
 
   cmd 'show inventory' do |cfg|
-    cfg = cfg.each_line.to_a[0..-2].join
-    comment cfg
+    comment cfg.cut_tail
   end
 
   cmd 'show softwareload' do |cfg|
-    cfg = cfg.each_line.to_a[0..-2].join
-    comment cfg
+    comment cfg.cut_tail
   end
 
   cmd 'show config | display commands' do |cfg|
-    cfg.each_line.to_a[1..-1].join
+    cfg.cut_head
   end
 
   cfg :ssh do
-    post_login 'set -f cli-config cli-columns 65535'
+    post_login 'set -f cli-config cli-columns 4000'
     pre_logout 'quit -f'
   end
 end

data/lib/oxidized/model/cumulus.rb

@@ -8,7 +8,7 @@ class Cumulus < Oxidized::Model
   end
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
   # show the persistent configuration
@@ -88,6 +88,19 @@ class Cumulus < Oxidized::Model
   end
 
   cfg :telnet, :ssh do
+    post_login do
+      if vars(:enable) == true
+        cmd "sudo su -", /^\[sudo\] password/
+        cmd @node.auth[:password]
+      elsif vars(:enable)
+        cmd "su -", /^Password:/
+        cmd vars(:enable)
+      end
+    end
+
+    pre_logout do
+      cmd "exit" if vars(:enable)
+    end
     pre_logout 'exit'
   end
 end

data/lib/oxidized/model/datacom.rb

@@ -7,8 +7,7 @@ class DataCom < Oxidized::Model
   end
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
-    cfg.cut_head.cut_tail
+    cfg.cut_head.cut_both.cut_tail
   end
 
   cmd 'show firmware' do |cfg|

data/lib/oxidized/model/dcnos.rb

@@ -8,7 +8,7 @@ class DCNOS < Oxidized::Model
   comment '! '
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-1].join
+    cfg.cut_head
   end
 
   cmd 'show version' do |cfg|

data/lib/oxidized/model/dellx.rb

@@ -0,0 +1,76 @@
+class DellX < Oxidized::Model
+  # Used in Dell X-Series Switches
+
+  prompt /[#>]$/
+
+  comment '! '
+
+  expect /(^.*)?+[mM]ore\:+.*$/ do |data, re|
+    send ' '
+    data.sub re, ''
+  end
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-3].join
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^(username \S+ password (?:encrypted )?)\S+(.*)/, '\1<hidden>\2'
+    cfg
+  end
+
+  cmd 'show version' do |cfg|
+    if @stackable.nil?
+      @stackable = true if cfg.match /(U|u)nit\s/
+    end
+    cfg = cfg.split("\n").reject { |line| line[/Up\sTime/] }
+    comment cfg.join("\n") + "\n"
+  end
+
+  cmd 'show system' do |cfg|
+    clean cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg.sub(/^(sflow \S+ destination owner \S+ timeout )\d+$/, '! \1<timeout>')
+  end
+
+  cfg :telnet, :ssh do
+    username /[uU]ser\s?[nN]ame:$/
+    password /[pP]assword:$/
+  end
+
+  cfg :telnet, :ssh do
+    if vars :enable
+      post_login do
+        send "enable\n"
+        cmd vars(:enable)
+      end
+    end
+
+    pre_logout "logout"
+    pre_logout "exit"
+  end
+
+  def clean cfg
+    out = []
+    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 and @stackable == true
+        skip_blocks = 1
+        # Some switches have another empty line. This is identified by this line having a colon
+        skip_blocks = 2 if line.match /:/
+      end
+      # If we have lines to skip do this until we reach and empty line
+      if skip_blocks > 0
+        skip_blocks -= 1 if /\S/ !~ line
+        next
+      end
+      out << line.strip
+    end
+    out = out.reject { |line| line[/Up\sTime/] }
+    out = comment out.join "\n"
+    out << "\n"
+  end
+end