oxidized 0.24.0 → 0.25.0

data/lib/oxidized/model/model.rb

@@ -17,6 +17,7 @@ module Oxidized
 
       def comment _comment = '# '
         return @comment if @comment
+
         @comment = block_given? ? yield : _comment
       end
 
@@ -102,6 +103,7 @@ module Oxidized
       Oxidized.logger.debug "lib/oxidized/model/model.rb Executing #{string}"
       out = @input.cmd(string)
       return false unless out
+
       out = out.b unless Oxidized.config.input.utf8_encoded?
       self.class.cmds[:all].each do |all_block|
         out = instance_exec Oxidized::String.new(out), string, &all_block
@@ -155,6 +157,7 @@ module Oxidized
       self.class.cmds[:cmd].each do |command, block|
         out = cmd command, &block
         return false unless out
+
         outputs << out
       end
       procs[:pre].each do |pre_proc|

data/lib/oxidized/model/ndms.rb

@@ -11,8 +11,7 @@ class NDMS < Oxidized::Model
   end
 
   cmd 'show running-config' do |cfg|
-    cfg = cfg.each_line.to_a[1..-2]
-    cfg = cfg.reject { |line| line.match /(clock date|checksum)/ }.join
+    cfg = cfg.cut_both.each_line.reject { |line| line.match /(clock date|checksum)/ }.join
     cfg
   end
 

data/lib/oxidized/model/netgear.rb

@@ -10,18 +10,16 @@ class Netgear < Oxidized::Model
 
   cfg :telnet do
     username /^(User:|Applying Interface configuration, please wait ...)/
+    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 /^.+[#]$/
+    post_login do
+      if vars(:enable) == true
+        cmd "enable"
+      elsif vars(:enable)
+        cmd "enable", /[pP]assword:\s?$/
+        cmd vars(:enable)
       end
     end
     post_login 'terminal length 0'

data/lib/oxidized/model/netonix.rb

@@ -2,7 +2,7 @@ class Netonix < Oxidized::Model
   prompt /^[\w\s.@_\/:-]+#/
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
   cmd 'cat config.json;echo'

data/lib/oxidized/model/netscaler.rb

@@ -1,5 +1,5 @@
 class NetScaler < Oxidized::Model
-  prompt /^\>\s*$/
+  prompt /^>\s*$/
   comment '# '
 
   cmd :all do |cfg|
@@ -14,6 +14,11 @@ class NetScaler < Oxidized::Model
     comment cfg
   end
 
+  cmd :secret do |cfg|
+    cfg.gsub! /\w+\s(-encrypted)/, '<secret hidden> \\1'
+    cfg
+  end
+
   cmd 'show ns ns.conf'
 
   cfg :ssh do

data/lib/oxidized/model/nos.rb

@@ -5,11 +5,11 @@ class NOS < Oxidized::Model
   comment  '! '
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
   cmd 'show version' do |cfg|
-    comment cfg
+    comment cfg.each_line.reject { |line| line.match /([Ss]ystem [Uu]p\s?[Tt]ime|[Uu]p\s?[Tt]ime is \d)/ }.join
   end
 
   cmd 'show inventory' do |cfg|

data/lib/oxidized/model/oneos.rb

@@ -18,7 +18,7 @@ class OneOS < Oxidized::Model
   cmd :all do |cfg|
     # cfg.gsub! /\cH+\s{8}/, ''         # example how to handle pager
     # cfg.gsub! /\cH+/, ''              # example how to handle pager
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
   cmd :secret do |cfg|

data/lib/oxidized/model/openbsd.rb

@@ -24,38 +24,24 @@ class Openbsd < Oxidized::Model
     cfg = add_comment('HOSTNAME FILE')
     cfg += cmd('cat /etc/myname')
 
-    cfg += add_comment('HOSTS FILE')
-    cfg += cmd('cat /etc/hosts')
-
-    cfg += add_comment('INTERFACE FILES')
-    cfg += cmd('tail -n +1 /etc/hostname.*')
-
     cfg += add_comment('RESOLV.CONF FILE')
     cfg += cmd('cat /etc/resolv.conf')
 
     cfg += add_comment('NTP.CONF FILE')
     cfg += cmd('cat /etc/ntp.conf')
 
-    cfg += add_comment('IP ROUTES PER ROUTING DOMAIN')
-    cfg += add_small_comment('Routing Domain 0')
-    cfg += cmd('route -T0 exec netstat -rn')
-    cfg += add_small_comment('Routing Domain 1')
-    cfg += cmd('route -T1 exec netstat -rn')
-    cfg += add_small_comment('Routing Domain 2')
-    cfg += cmd('route -T2 exec netstat -rn')
-    cfg += add_small_comment('Routing Domain 3')
-    cfg += cmd('route -T3 exec netstat -rn')
-    cfg += add_small_comment('Routing Domain 4')
-    cfg += cmd('route -T4 exec netstat -rn')
-    cfg += add_small_comment('Routing Domain 5')
-    cfg += cmd('route -T5 exec netstat -rn')
+    cfg += add_comment('PF FILE')
+    cfg += cmd('cat /etc/pf.conf')
+
+    cfg += add_comment('HOSTS FILE')
+    cfg += cmd('cat /etc/hosts')
+
+    cfg += add_comment('INTERFACE FILES')
+    cfg += cmd('tail -n +1 /etc/hostname.*')
 
     cfg += add_comment('SNMP FILE')
     cfg += cmd('cat /etc/snmpd.conf')
 
-    cfg += add_comment('PF FILE')
-    cfg += cmd('cat /etc/pf.conf')
-
     cfg += add_comment('MOTD FILE')
     cfg += cmd('cat /etc/motd')
 

data/lib/oxidized/model/openwrt.rb

@@ -62,6 +62,7 @@ class OpenWrt < Oxidized::Model
     end
     @mtdpartitions.scan(/(\w+):\s+\w+\s+\w+\s+"(.*)"/).each do |partition, name|
       next unless vars(:openwrt_backup_partitions) && partitions_to_backup.include?(name)
+
       Oxidized.logger.debug "Exporting partition - #{name}(#{partition})"
       cfg << comment("#### Partition: #{name} /dev/#{partition} #####")
       cfg << comment("Decode using 'echo -en <data> | gzip -dc > #{name}'")

data/lib/oxidized/model/opnsense.rb

@@ -3,7 +3,7 @@ class OpnSense < Oxidized::Model
   # must enable SSH and password-based SSH access
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-1].join
+    cfg.cut_head
   end
 
   cmd 'cat /conf/config.xml' do |cfg|

data/lib/oxidized/model/panos.rb

@@ -3,21 +3,21 @@ class PanOS < Oxidized::Model
 
   comment '! '
 
-  prompt /^[\w.\@:\(\)-]+>\s?$/
+  prompt /^[\w.@:()-]+>\s?$/
 
   cmd :all do |cfg|
     cfg.each_line.to_a[2..-3].join
   end
 
   cmd 'show system info' do |cfg|
-    cfg.gsub! /^(up)?time:\ .*$/, ''
-    cfg.gsub! /^app-.*?:\ .*$/, ''
-    cfg.gsub! /^av-.*?:\ .*$/, ''
-    cfg.gsub! /^threat-.*?:\ .*$/, ''
-    cfg.gsub! /^wildfire-.*?:\ .*$/, ''
-    cfg.gsub! /^wf-private.*?:\ .*$/, ''
-    cfg.gsub! /^url-filtering.*?:\ .*$/, ''
-    cfg.gsub! /^global-.*?:\ .*$/, ''
+    cfg.gsub! /^(up)?time: .*$/, ''
+    cfg.gsub! /^app-.*?: .*$/, ''
+    cfg.gsub! /^av-.*?: .*$/, ''
+    cfg.gsub! /^threat-.*?: .*$/, ''
+    cfg.gsub! /^wildfire-.*?: .*$/, ''
+    cfg.gsub! /^wf-private.*?: .*$/, ''
+    cfg.gsub! /^url-filtering.*?: .*$/, ''
+    cfg.gsub! /^global-.*?: .*$/, ''
     comment cfg
   end
 

data/lib/oxidized/model/pfsense.rb

@@ -2,12 +2,13 @@ class PfSense < Oxidized::Model
   # use other use than 'admin' user, 'admin' user cannot get ssh/exec. See issue #535
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-1].join
+    cfg.cut_head
   end
 
   cmd :secret do |cfg|
     cfg.gsub! /(\s+<bcrypt-hash>)[^<]+(<\/bcrypt-hash>)/, '\\1<secret hidden>\\2'
     cfg.gsub! /(\s+<password>)[^<]+(<\/password>)/, '\\1<secret hidden>\\2'
+    cfg.gsub! /(\s+<lighttpd_ls_password>)[^<]+(<\/lighttpd_ls_password>)/, '\\1<secret hidden>\\2'
     cfg
   end
 

data/lib/oxidized/model/planet.rb

@@ -18,7 +18,7 @@ class Planet < Oxidized::Model
   cmd :all do |cfg|
     # cfg.gsub! /\cH+\s{8}/, ''         # example how to handle pager
     # cfg.gsub! /\cH+/, ''              # example how to handle pager
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
   cmd :secret do |cfg|

data/lib/oxidized/model/powerconnect.rb

@@ -1,5 +1,5 @@
 class PowerConnect < Oxidized::Model
-  prompt /^([\w\s.@-]+[#>]\s?)$/ # allow spaces in hostname..dell does not limit it.. #
+  prompt /^([\w\s.@-]+(\(\S*\))?[#>]\s?)$/ # allow spaces in hostname..dell does not limit it.. #
 
   comment '! '
 
@@ -14,6 +14,7 @@ class PowerConnect < Oxidized::Model
 
   cmd :secret do |cfg|
     cfg.gsub! /^(username \S+ password (?:encrypted )?)\S+(.*)/, '\1<hidden>\2'
+    cfg.gsub! /^(tacacs-server key) \S+/, '\\1 <secret hidden>'
     cfg
   end
 
@@ -40,9 +41,11 @@ class PowerConnect < Oxidized::Model
   end
 
   cfg :telnet, :ssh do
-    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/procurve.rb

@@ -1,7 +1,7 @@
 class Procurve < Oxidized::Model
   # some models start lines with \r
   # previous command is repeated followed by "\eE", which sometimes ends up on last line
-  prompt /^\r?([\w.-]+# )$/
+  prompt /^\r?([\w\s.-]+# )$/
 
   comment '! '
 
@@ -26,15 +26,17 @@ class Procurve < Oxidized::Model
   end
 
   cmd :all do |cfg|
-    cfg = cfg.each_line.to_a[1..-2].join
+    cfg = cfg.cut_both
     cfg = cfg.gsub /^\r/, ''
   end
 
   cmd :secret do |cfg|
-    cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
-    cfg.gsub! /^(snmp-server host).*/, '\\1 <configuration removed>'
-    cfg.gsub! /^(radius-server host).*/, '\\1 <configuration removed>'
+    cfg.gsub! /^(snmp-server community) \S+(.*)/, '\\1 <secret hidden> \\2'
+    cfg.gsub! /^(snmp-server host \S+) \S+(.*)/, '\\1 <secret hidden> \\2'
+    cfg.gsub! /^(radius-server host \S+ key) \S+(.*)/, '\\1 <secret hidden> \\2'
     cfg.gsub! /^(radius-server key).*/, '\\1 <configuration removed>'
+    cfg.gsub! /^(tacacs-server host \S+ key) \S+(.*)/, '\\1 <secret hidden> \\2'
+    cfg.gsub! /^(tacacs-server key).*/, '\\1 <secret hidden>'
     cfg
   end
 

data/lib/oxidized/model/routeros.rb

@@ -20,7 +20,7 @@ class RouterOS < Oxidized::Model
       cfg.gsub! /\x1B\[([0-9]{1,3}((;[0-9]{1,3})*)?)?[m|K]/, '' # strip ANSI colours
       cfg.gsub! /\\\r\n\s+/, '' # strip new line
       cfg.gsub! /# inactive time\r\n/, '' # Remove time based system comment
-      cfg = cfg.split("\n").reject { |line| line[/^\#\s\w{3}\/\d{2}\/\d{4}.*$/] }
+      cfg = cfg.split("\n").reject { |line| line[/^#\s\w{3}\/\d{2}\/\d{4}.*$/] }
       cfg.join("\n") + "\n"
     end
   end

data/lib/oxidized/model/saos.rb

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

data/lib/oxidized/model/screenos.rb

@@ -3,7 +3,7 @@ class ScreenOS < Oxidized::Model
 
   comment '! '
 
-  prompt /^[\w.:\(\)-]+->\s?$/
+  prompt /^[\w.:()-]+->\s?$/
 
   cmd :all do |cfg|
     cfg.each_line.to_a[2..-2].join
@@ -17,8 +17,8 @@ class ScreenOS < Oxidized::Model
   end
 
   cmd 'get system' do |cfg|
-    cfg.gsub! /^Date\ .*\n/, ''
-    cfg.gsub! /^Up\ .*\n/, ''
+    cfg.gsub! /^Date .*\n/, ''
+    cfg.gsub! /^Up .*\n/, ''
     cfg.gsub! /(current bw ).*/, '\\1 <removed>'
     comment cfg
   end

data/lib/oxidized/model/sros.rb

@@ -6,11 +6,11 @@ class SROS < Oxidized::Model
 
   comment  '# '
 
-  prompt /^([-\w\.:>\*]+\s?[#>]\s?)$/
+  prompt /^([-\w.:>*]+\s?[#>]\s?)$/
 
   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
 
   #

data/lib/oxidized/model/stoneos.rb

@@ -10,7 +10,7 @@ class StoneOS < Oxidized::Model
   end
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
   cmd 'show configuration running'

data/lib/oxidized/model/tmos.rb

@@ -42,6 +42,8 @@ class TMOS < Oxidized::Model
     comment cfg
   end
 
+  cmd('[ -d "/config/zebos" ] && cat /config/zebos/*/ZebOS.conf') { |cfg| comment cfg }
+
   cmd('cat /config/partitions/*/bigip.conf') { |cfg| comment cfg }
 
   cfg :ssh do

data/lib/oxidized/model/tplink.rb

@@ -18,6 +18,8 @@ class TPLink < Oxidized::Model
   end
 
   cmd :all do |cfg|
+    # remove unwanted paging line
+    cfg.gsub! /^Press any key to contin.*/, ''
     # normalize linefeeds
     cfg.gsub! /(\r|\r\n|\n\r)/, "\n"
     # remove empty lines
@@ -25,6 +27,8 @@ class TPLink < Oxidized::Model
   end
 
   cmd :secret do |cfg|
+    cfg.gsub! /^enable password (\S+)/, 'enable password <secret hidden>'
+    cfg.gsub! /^user (\S+) password (\S+) (.*)/, 'user \1 password <secret hidden> \3'
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
     cfg.gsub! /secret (\d+) (\S+).*/, '<secret hidden>'
     cfg

data/lib/oxidized/model/viptela.rb

@@ -0,0 +1,29 @@
+class Viptela < Oxidized::Model
+  # Cisco Vipetla
+
+  prompt /[-\w]+#\s$/
+  comment  '! '
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /(^\s+secret-key|password|auth-password|priv-password)\s+.*$/, '\\1 <secret hidden>'
+    cfg.gsub! /(^\s+community)\s.*$/, '\\1 <secret hidden>'
+    cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  cfg :ssh do
+    post_login 'paginate false'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/voltaire.rb

@@ -3,7 +3,7 @@ class VOLTAIRE < 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 VOLTAIRE < 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