oxidized 0.29.1 → 0.37.0

data/lib/oxidized/model/fortigate.rb

@@ -0,0 +1,160 @@
+class FortiGate < Oxidized::Model
+  using Refinements
+
+  comment '# '
+
+  prompt /^(\(\w\) )?([-\w.~]+(\s[(\w\-.)]+)?~?\s?[#>$]\s?)$/
+
+  # When a post-login-banner is enabled, you have to press "a" to log in
+  expect /^\(Press\s'a'\sto\saccept\):/ do |data, re|
+    send 'a'
+    data.sub re, ''
+  end
+
+  expect /^--More--\s$/ do |data, re|
+    send ' '
+    data.sub re, ''
+  end
+
+  cmd :all do |cfg|
+    # Remove junk after --More-- pager
+    cfg = cfg.gsub(/\r +\r/, '')
+    # Remove \r\n after command echo
+    cfg = cfg.gsub("\r\n", "\n")
+    # remove command echo and prompt
+    cfg.cut_both
+  end
+
+  cmd :secret do |cfg|
+    # Remove private key for encrypted configs
+    cfg.gsub! /^(\#private-encryption-key=).+/, '\\1 <configuration removed>'
+    # ENC indicates an encrypted password, and secret indicates a secret string
+    cfg.gsub! /(set .+ ENC) .+/, '\\1 <configuration removed>'
+    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 md5-key [0-9]+) .+/, '\\1 <configuration removed>'
+    cfg.gsub! /(set private-key ).*?-+END (ENCRYPTED|RSA|OPENSSH) PRIVATE KEY-+\n?"$/m, '\\1<configuration removed>'
+    cfg.gsub! /(set privatekey ).*?-+END (ENCRYPTED|RSA|OPENSSH) PRIVATE KEY-+\n?"$/m, '\\1<configuration removed>'
+    cfg.gsub! /(set ca )"-+BEGIN.*?-+END CERTIFICATE-+"$/m, '\\1<configuration removed>'
+    cfg.gsub! /(set csr ).*?-+END CERTIFICATE REQUEST-+"$/m, '\\1<configuration removed>'
+    cfg
+  end
+
+  cmd 'get system status' do |cfg|
+    @vdom_enabled = cfg.match(/^Virtual domain configuration: (enable|multiple)/)
+    @ha_cluster = cfg.match(/^Current HA mode: a-/) # a-p or a-a
+    cfg = cfg.keep_lines [
+      "Version: ",
+      "Security Level: ",
+      "Serial-Number: ",
+      "BIOS version: ",
+      "System Part-Number: ",
+      "Hostname: ",
+      "Operation Mode: ",
+      "Current virtual domain: ",
+      "Max number of virtual domains: ",
+      "Virtual domains status:",
+      "Virtual domain configuration: ",
+      "FIPS-CC mode: ",
+      "Current HA mode: ",
+      "Private Encryption: ",
+      # Lines in FortiGate-VM64
+      "License Expiration Date: ",
+      "License Status: ",
+      "VM Resources: "
+    ]
+    comment cfg + "\n"
+  end
+
+  cmd 'config global', if: -> { @vdom_enabled } do |_cfg|
+    ''
+  end
+
+  cmd 'get system ha status', if: -> { @ha_cluster } do |cfg|
+    cfg = cfg.keep_lines [
+      "HA Health Status:",
+      "Model: ",
+      "Mode: ",
+      "number of member: ",
+      /^(Master|Slave|Primary|Secondary): /
+    ]
+    comment cfg + "\n"
+  end
+
+  cmd 'get hardware status' do |cfg|
+    comment cfg
+  end
+
+  cmd "diagnose hardware deviceinfo psu" do |cfg|
+    skip_patterns = [
+      /Command fail\./,      # The device doesn't support this command
+      /Power Supply +Status/ # We only get a status, but no serial numbers
+    ]
+    if skip_patterns.any? { |p| cfg.match?(p) }
+      logger.debug "No PSU serial numbers available"
+      ''
+    else
+      comment cfg
+    end
+  end
+
+  cmd "get system interface transceiver" do |cfg|
+    cfg = cfg.keep_lines [
+      /^Interface \w/,
+      "Vendor Name",
+      "Part No.",
+      "Serial No."
+    ]
+    cfg = cfg.reject_lines ["Transceiver is not detected"]
+    comment cfg + "\n"
+  end
+
+  cmd 'diagnose autoupdate version', if: -> { vars(:fortios_autoupdate) || vars(:fortigate_autoupdate) } do |cfg|
+    if vars(:fortios_autoupdate)
+      logger.warn("The variable fortios_autoupdate is deprecated. Migrate to fortigate_autoupdate")
+    end
+
+    cfg = cfg.sub(/FDS Address\n---------\n.*\n/, '')
+    comment cfg.reject_lines ["Last Update", "Result :"]
+  end
+
+  cmd 'end', if: -> { @vdom_enabled } do |_cfg|
+    ''
+  end
+
+  def clean_config(cfg)
+    cfg = cfg.reject_lines ['#conf_file_ver=']
+    cfg.gsub!(/(set comments "Error \(No order found for account ID \d+\) on).*/,
+              '\\1 <stripped>')
+    cfg
+  end
+
+  # If vars fullconfig is set to true, we get the full config (including default
+  # values)
+  cmd "show full-configuration | grep .", if: -> { vars(:fullconfig) } do |cfg|
+    clean_config cfg
+  end
+  # else backup as in Fortigate GUI
+  cmd "show | grep .", if: -> { !vars(:fullconfig) } do |cfg|
+    clean_config cfg
+  end
+
+  cmd :significant_changes do |cfg|
+    cfg = cfg.reject_lines [
+      /^ +set \S+ ENC \S+$/
+    ]
+    cfg.gsub!(/(config firewall internet-service-name\n).*?(\nend\n)/m, '')
+    cfg.gsub!(/set private-key .*?-+END \S+ PRIVATE KEY-+\n?"$/m, '')
+    cfg
+  end
+
+  cfg :telnet do
+    username /^[lL]ogin:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    pre_logout "exit"
+  end
+end

data/lib/oxidized/model/fortios.rb

@@ -3,19 +3,31 @@ class FortiOS < Oxidized::Model
 
   comment '# '
 
-  prompt /^([-\w.~]+(\s[(\w\-.)]+)?~?\s?[#>$]\s?)$/
+  prompt /^(\(\w\) )?([-\w.~]+(\s[(\w\-.)]+)?~?\s?[#>$]\s?)$/
+
+  # When a post-login-banner is enabled, you have to press "a" to log in
+  expect /^\(Press\s'a'\sto\saccept\):/ do |data, re|
+    send 'a'
+    data.sub re, ''
+  end
 
   expect /^--More--\s$/ do |data, re|
     send ' '
     data.sub re, ''
   end
 
-  cmd :all do |cfg, cmdstring|
-    new_cfg = comment "COMMAND: #{cmdstring}\n"
-    new_cfg << cfg.each_line.to_a[1..-2].map { |line| line.gsub(/(conf_file_ver=)(.*)/, '\1<stripped>\3') }.join
+  cmd :all do |cfg|
+    # Remove junk after --More-- pager
+    cfg = cfg.gsub(/\r +\r/, '')
+    # Remove \r\n after command echo
+    cfg = cfg.gsub("\r\n", "\n")
+    # remove command echo and prompt
+    cfg.cut_both
   end
 
   cmd :secret do |cfg|
+    # Remove private key for encrypted configs
+    cfg.gsub! /^(\#private-encryption-key=).+/, '\\1 <configuration removed>'
     # ENC indicates an encrypted password, and secret indicates a secret string
     cfg.gsub! /(set .+ ENC) .+/, '\\1 <configuration removed>'
     cfg.gsub! /(set .*secret) .+/, '\\1 <configuration removed>'
@@ -23,58 +35,36 @@ class FortiOS < Oxidized::Model
     cfg.gsub! /(set (?:passwd|password|key|group-password|auth-password-l1|auth-password-l2|rsso|history0|history1)) .+/, '\\1 <configuration removed>'
     cfg.gsub! /(set md5-key [0-9]+) .+/, '\\1 <configuration removed>'
     cfg.gsub! /(set private-key ).*?-+END (ENCRYPTED|RSA|OPENSSH) PRIVATE KEY-+\n?"$/m, '\\1<configuration removed>'
+    cfg.gsub! /(set privatekey ).*?-+END (ENCRYPTED|RSA|OPENSSH) PRIVATE KEY-+\n?"$/m, '\\1<configuration removed>'
     cfg.gsub! /(set ca )"-+BEGIN.*?-+END CERTIFICATE-+"$/m, '\\1<configuration removed>'
     cfg.gsub! /(set csr ).*?-+END CERTIFICATE REQUEST-+"$/m, '\\1<configuration removed>'
     cfg
   end
 
   cmd 'get system status' do |cfg|
-    @vdom_enabled = cfg.match /Virtual domain configuration: (enable|multiple)/
-    cfg.gsub! /(System time:).*/, '\\1 <stripped>'
-    cfg.gsub! /(Cluster (?:uptime|state change time):).*/, '\\1 <stripped>'
-    cfg.gsub! /(Current Time\s+:\s+)(.*)/, '\1<stripped>'
-    cfg.gsub! /(Uptime:\s+)(.*)/, '\1<stripped>\3'
-    cfg.gsub! /(Last reboot:\s+)(.*)/, '\1<stripped>\3'
-    cfg.gsub! /(Disk Usage\s+:\s+)(.*)/, '\1<stripped>'
-    cfg.gsub! /(^\S+ (?:disk|DB):\s+)(.*)/, '\1<stripped>\3'
-    cfg.gsub! /(VM Registration:\s+)(.*)/, '\1<stripped>\3'
-    cfg.gsub! /(Virus-DB|Extended DB|IPS-DB|IPS-ETDB|APP-DB|INDUSTRIAL-DB|Botnet DB|IPS Malicious URL Database|AV AI\/ML Model|IoT-Detect).*/, '\\1 <db version stripped>'
-    comment cfg
+    cfg = cfg.reject_lines [
+      "Current Time",
+      "Disk Usage",
+      "Release Version Information",
+      "Branch Point",
+      "Daylight Time Saving",
+      "Time Zone",
+      "x86-64 Applications",
+      "File System",
+      "Image Signature"
+    ]
+    comment cfg + "\n"
   end
 
-  post do
-    cfg = []
-    cfg << cmd('config global') if @vdom_enabled
-
-    cfg << cmd('get system ha status') do |cfg_ha|
-      cfg_ha = cfg_ha.each_line.select { |line| line.match /^(HA Health Status|Mode|Model|Master|Slave|Primary|Secondary|# COMMAND)(\s+)?:/ }.join
-      comment cfg_ha
-    end
-
-    cfg << cmd('get hardware status') do |cfg_hw|
-      comment cfg_hw
-    end
-
-    # default behaviour: include autoupdate output (backwards compatibility)
-    # do not include if variable "show_autoupdate" is set to false
-    if defined?(vars(:fortios_autoupdate)).nil? || vars(:fortios_autoupdate)
-      cfg << cmd('diagnose autoupdate version') do |cfg_auto|
-        cfg_auto.gsub! /(FDS Address\n---------\n).*/, '\\1IP Address removed'
-        comment cfg_auto.each_line.reject { |line| line.match /Last Update|Result/ }.join
-      end
-    end
-
-    cfg << cmd('end') if @vdom_enabled
-
-    ['show full-configuration | grep .', 'show full-configuration', 'show'].each do |fullcmd|
-      fullcfg = cmd(fullcmd)
-      next if fullcfg.lines[1..3].join =~ /(Parsing error at|command parse error)/ # Don't show for unsupported devices (e.g. FortiAnalyzer, FortiManager, FortiMail)
-
-      cfg << fullcfg
-      break
-    end
+  cmd "show" do |cfg|
+    cfg.reject_lines ['#config-version=']
+  end
 
-    cfg.join
+  cmd :significant_changes do |cfg|
+    cfg = cfg.reject_lines [
+      /^ +set \S+ ENC \S+$/
+    ]
+    cfg.gsub(/set private-key .*?-+END \S+ PRIVATE KEY-+\n?"$/m, '')
   end
 
   cfg :telnet do
@@ -83,6 +73,6 @@ class FortiOS < Oxidized::Model
   end
 
   cfg :telnet, :ssh do
-    pre_logout "exit\n"
+    pre_logout "exit"
   end
 end

data/lib/oxidized/model/fsos.rb

@@ -0,0 +1,46 @@
+class FSOS < Oxidized::Model
+  # Fiberstore / fs.com
+  using Refinements
+  comment '! '
+  prompt /^([\w.@()-]+[#>]\s?)$/
+
+  # Handle paging
+  expect /^ --More--.*$/ do |data, re|
+    send ' '
+    data.sub re, ''
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /(secret \w+) (\S+).*/, '\\1 <secret hidden>'
+    cfg.gsub! /(password \d+) (\S+).*/, '\\1 <secret hidden>'
+    cfg.gsub! /(snmp-server community \d+) (\S+).*/, '\\1 <secret hidden>'
+    cfg.gsub! /^(snmp-server host \S+( udp-port \d+)?( permit|deny \d+)?( informs?)?( traps?)?(( version v3 (priv|auth|noauth))|( version (v1|v2c))?)) +\S+( .*)?$*/, '\\1 <secret hidden>'
+    cfg.gsub! /^(snmp-server user \S+ \S+ v3( priv (des|aes128|aes256|aes256-c))?( auth (md5|sha|sha256) \d+)) +\S+( .*)?$*/, '\\1 <secret hidden>'
+    cfg.gsub! /^(.*key \d+) (\S+).*/, '\\1 <secret hidden>'
+    cfg
+  end
+
+  cmd 'show version' do |cfg|
+    # Remove uptime so the result doesn't change every time
+    comment cfg.reject_lines ['uptime is', 'System uptime']
+  end
+
+  cmd 'show running-config' do |cfg|
+    # Remove "Building configuration..." message
+    cfg.gsub! /^Building configuration.*\n/, ''
+    cfg.cut_head
+  end
+
+  cfg :telnet do
+    username /^Username:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'enable'
+    post_login 'terminal length 0'
+    post_login 'terminal width 0'
+    pre_logout 'exit'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/gaiaos.rb

@@ -26,7 +26,7 @@ class GaiaOS < Oxidized::Model
   # check for vsx / multiple context
   cmd 'show vsx' do |cfg|
     @is_vsx = cfg.include? 'VSX Enabled'
-    Oxidized.logger.debug cfg
+    logger.debug cfg
   end
 
   cmd 'show asset all' do |cfg|
@@ -46,7 +46,7 @@ class GaiaOS < Oxidized::Model
   end
 
   def single_context
-    Oxidized.logger.debug 'Single context tasks'
+    logger.debug 'Single context tasks'
     cmd 'show configuration' do |cfg|
       cfg.gsub! /^# Exported by \S+ on .*/, '# '
       cfg
@@ -54,7 +54,7 @@ class GaiaOS < Oxidized::Model
   end
 
   def multiple_context
-    Oxidized.logger.debug 'Multi context tasks'
+    logger.debug 'Multi context tasks'
     cmd 'show virtual-system all' do |systems|
       vs_items = systems.scan(/^(?<VSID>\d+)\s+(?<VSNAME>.*[^\s])/)
       allcfg = ''
@@ -62,7 +62,7 @@ class GaiaOS < Oxidized::Model
         allcfg += "\n\n\n#--------======== [ VS #{item[0]} - #{item[1]} ] ========--------\n\n"
         allcfg += "set virtual-system #{item[0]}\n\n"
         cmd "set virtual-system #{item[0]}" do |vs|
-          Oxidized.logger.debug vs
+          logger.debug vs
           cmd 'show configuration' do |vscfg|
             vscfg.gsub! /^# Exported by \S+ on .*/, '# '
             allcfg += vscfg

data/lib/oxidized/model/garderos.rb

@@ -0,0 +1,38 @@
+class Garderos < Oxidized::Model
+  using Refinements
+  # Garderos GmbH https://www.garderos.com/
+  # Routers for harsh environments
+  # grs = Garderos Router Software
+
+  prompt /[\w-]+# /
+  clean :escape_codes
+  comment '# '
+
+  cmd :all do |cfg|
+    # Remove the echo of the entered command and the prompt after it
+    cfg.cut_both
+  end
+
+  cmd 'show system version' do |cfg|
+    comment "#{cfg}\n"
+  end
+
+  cmd 'show system serial' do |cfg|
+    comment "#{cfg}\n"
+  end
+
+  # If we have a radio modem installed, we'd like to list the SIM Card
+  cmd 'show hardware wwan wwan0 sim' do |cfg|
+    if cfg.start_with? 'Unknown command'
+      String.new('')
+    else
+      comment "#{cfg}\n"
+    end
+  end
+
+  cmd 'show configuration running'
+
+  cfg :ssh do
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/grandstreamht8xx.rb

@@ -0,0 +1,19 @@
+class GrandstreamHT8xx < Oxidized::Model
+  using Refinements
+
+  # Anchored prompt to avoid matching XML content
+  prompt /^(GS|CONFIG)>\s?$/
+  comment '# '
+
+  cfg :ssh do
+    # After login go to configuration submenu (looks like enabled in other devices)
+    post_login 'config'
+    # When logout use double exit - first from configuration submenu, and second to disconnect from device
+    pre_logout 'exit'
+    pre_logout 'exit'
+  end
+
+  cmd 'export' do |cfg|
+    cfg.cut_both
+  end
+end

data/lib/oxidized/model/h3c.rb

@@ -3,7 +3,7 @@ class H3C < Oxidized::Model
 
   # H3C
 
-  prompt /^.*(<[\w.-]+>)$/
+  prompt /^[<\[][\w.-]+[>\]]$/
   comment '# '
 
   cmd :secret do |cfg|

data/lib/oxidized/model/ibos.rb

@@ -22,6 +22,7 @@ class IBOS < Oxidized::Model
 
     # radius server 10.1.1.1 secret public
     cfg.gsub! /^radius server (\S+) secret (\S+)(.*)/, 'radius server \\1 secret <hidden> \\3'
+    cfg
   end
 
   cmd 'show version' do |cfg|

data/lib/oxidized/model/ingate.rb

@@ -0,0 +1,47 @@
+class Ingate < Oxidized::Model
+  using Refinements
+
+  cfg_cb = lambda do
+    cfg = @m.post(
+      @main_url,
+      {
+        'page'                                      => 'save',
+        'db.webgui.testmode/1/timelimit'            => '30',
+        'db.webgui.testmode/__KEEP_ROWS_ALIVE'      => '1',
+        'db.webgui.pending_apply/1/verbosity'       => 'always',
+        'db.webgui.pending_apply/__KEEP_ROWS_ALIVE' => '1',
+        'action.admin.download_config_cli'          => 'Save config to CLI file',
+        'upload.config_file;filename=type'          => 'application/octet-stream',
+        'upload.clicmd_file;filename;type'          => 'application/octet-stream',
+        'security'                                  => '',
+        'got_complete_form'                         => 'yes'
+      },
+      'Accept' => 'application/x-config-database'
+    )
+    cfg.body
+  end
+
+  cmd cfg_cb do |cfg|
+    cfg.gsub! /^# Timestamp:.*$/, ''
+    cfg
+  end
+
+  cfg :http do
+    @secure = true
+    @main_page = "/"
+    define_singleton_method :login do
+      @main_url = URI::HTTP.build host: @node.ip, path: @main_page
+      @m.post(
+        @main_url,
+        {
+          'security_user'     => @node.auth[:username],
+          'security_password' => @node.auth[:password],
+          'page'              => 'login',
+          'goal'              => 'save',
+          'got_complete_form' => 'yes',
+          'security'          => ''
+        }
+      )
+    end
+  end
+end

data/lib/oxidized/model/ios.rb

@@ -27,26 +27,40 @@ class IOS < Oxidized::Model
 
   cmd :secret do |cfg|
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
-    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! /^(snmp-server host \S+( vrf \S+)?( informs?)?( version (1|2c))?) +\S+( .*)?$*/, '\\1 <secret hidden>\\6'
     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! /^( +(?: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) .+/, '\\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.gsub! /^(\s+ppp (chap|pap) password \d) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^( +ip ospf message-digest-key \d+ md5) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^( +ip ospf authentication-key) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^( +neighbor \S+ password) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^( +vrrp \d+ authentication text) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^( +standby \d+ authentication) .{1,8}$/, '\\1 <secret hidden>'
+    cfg.gsub! /^( +standby \d+ authentication md5 key-string) .+?( timeout \d+)?$/, '\\1 <secret hidden> \\2'
+    cfg.gsub! /^( +key-string) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^((tacacs|radius) server [^\n]+\n( +[^\n]+\n)* +key) [^\n]+$/m, '\1 <secret hidden>'
+    cfg.gsub! /^( +ppp (chap|pap) password \d) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^( +security wpa psk set-key (?:ascii|hex) \d) (.*)$/, '\\1 <secret hidden>'
+    cfg.gsub! /^( +dot1x username \S+ password \d) (.*)$/, '\\1 <secret hidden>'
+    cfg.gsub! /^( +mgmtuser username \S+ password \d) (.*) (secret \d) (.*)$/, '\\1 <secret hidden> \\3 <secret hidden>'
+    cfg.gsub! /^( +client \S+ server-key \d) (.*)$/, '\\1 <secret hidden>'
+    cfg.gsub! /^( +domain-password) \S+ ?(.*)/, '\\1 <secret hidden> \\2'
+    cfg.gsub! /^( +pre-shared-key).*/, '\\1 <configuration removed>'
+    cfg.gsub! /^(.*server-key(?: \d)?) \S+/, '\\1 <secret hidden>'
     cfg
   end
 
+  cmd :significant_changes do |cfg|
+    cfg.reject_lines [
+      /^! (Last|No) configuration change (at|since)/,
+      '! NVRAM config last updated at'
+    ]
+  end
+
   cmd 'show version' do |cfg|
     comments = []
     comments << cfg.lines.first
@@ -62,19 +76,27 @@ class IOS < Oxidized::Model
 
       comments << "Image:#{slave} Compiled: #{Regexp.last_match(1)}" if line =~ /^Compiled (.*)$/
 
-      comments << "Image:#{slave} Software: #{Regexp.last_match(1)}, #{Regexp.last_match(2)}" if line =~ /^(?:Cisco )?IOS .* Software,? \(([A-Za-z0-9_-]*)\), .*Version\s+(.*)$/
+      if line =~ /^(?:Cisco )?IOS .* Software,? \(([A-Za-z0-9_-]*)\), .*Version\s+(.*)$/
+        comments << "Image:#{slave} Software: #{Regexp.last_match(1)}, #{Regexp.last_match(2)}"
+      end
 
-      comments << "ROM Bootstrap: #{Regexp.last_match(3)}" if line =~ /^ROM: (IOS \S+ )?(System )?Bootstrap.*(Version.*)$/
+      if line =~ /^ROM: (IOS \S+ )?(System )?Bootstrap.*(Version.*)$/
+        comments << "ROM Bootstrap: #{Regexp.last_match(3)}"
+      end
 
       comments << "BOOTFLASH: #{Regexp.last_match(1)}" if line =~ /^BOOTFLASH: .*(Version.*)$/
 
       comments << "Memory: nvram #{Regexp.last_match(1)}" if line =~ /^(\d+[kK]) bytes of (non-volatile|NVRAM)/
 
-      comments << "Memory: flash #{Regexp.last_match(1)}" if line =~ /^(\d+[kK]) bytes of (flash memory|flash internal|processor board System flash|ATA CompactFlash)/i
+      if line =~ /^(\d+[kK]) bytes of (flash memory|flash internal|processor board System flash|ATA CompactFlash)/i
+        comments << "Memory: flash #{Regexp.last_match(1)}"
+      end
 
-      comments << "Memory: pcmcia #{Regexp.last_match(2)} #{Regexp.last_match(3)}#{Regexp.last_match(4)} #{Regexp.last_match(1)}" if line =~ /^(\d+[kK]) bytes of (Flash|ATA)?.*PCMCIA .*(slot|disk) ?(\d)/i
+      if line =~ /^(\d+[kK]) bytes of (Flash|ATA)?.*PCMCIA .*(slot|disk) ?(\d)/i
+        comments << "Memory: pcmcia #{Regexp.last_match(2)} #{Regexp.last_match(3)}#{Regexp.last_match(4)} #{Regexp.last_match(1)}"
+      end
 
-      if line =~ /(\S+(?:\sseries)?)\s+(?:\((\S+)\)\s+processor|\(revision[^)]+\)).*\s+with (\S+k) bytes/i
+      if line =~ /(\S+(?:\sseries)?)\s+(?:\(([\S ]+)\)\s+processor|\(revision[^)]+\)).*\s+with (\S+k) bytes/i
         sproc = Regexp.last_match(1)
         cpu = Regexp.last_match(2)
         mem = Regexp.last_match(3)
@@ -85,11 +107,13 @@ class IOS < Oxidized::Model
         comments << "Processor ID: #{Regexp.last_match(1)}" if cfg.lines[i + 1] =~ /processor board id (\S+)/i
         if cfg.lines[i + 2] =~ /(cpu at |processor: |#{cpu} processor,)/i
           # change implementation to impl and prepend comma
-          cpuxtra = cfg.lines[i + 2].gsub(/implementation/, 'impl').gsub(/^/, ', ').chomp
+          cpuxtra = cfg.lines[i + 2].gsub("implementation", 'impl').gsub(/^/, ', ').chomp
         end
         comments << "CPU:#{slave} #{cpu}#{cpuxtra}#{slaveslot}"
       end
 
+      comments << line.chomp if line.start_with?('Motherboard')
+
       comments << "Image: #{Regexp.last_match(1)}" if line =~ /^System image file is "([^"]*)"$/
     end
     comments << "\n"
@@ -111,13 +135,22 @@ class IOS < Oxidized::Model
     cmd_line = 'show running-config'
     cmd_line += ' view full' if vars(:ios_rbac)
     cmd cmd_line do |cfg|
-      cfg = cfg.each_line.to_a[3..-1]
-      cfg = cfg.reject { |line| line.match /^ntp clock-period / }.join
-      cfg = cfg.each_line.reject { |line| line.match /^! (Last|No) configuration change (at|since).*/ unless line =~ /\d+\sby\s\S+$/ }.join
-      cfg.gsub! /^Current configuration : [^\n]*\n/, ''
+      cfg = cfg.cut_head(3)
+      cfg = cfg.reject_lines [
+        /^ntp clock-period /,
+        /^Current configuration : \S+/
+      ]
+      unless vars("output_store_mode") == "on_significant"
+        cfg = cfg.reject_lines [
+          # Only store the line "configuration change" when a user is specified
+          /^! (Last|No) configuration change (at|since)(?!.*\d+ by \S+$)/
+        ]
+      end
       cfg.gsub! /^ tunnel mpls traffic-eng bandwidth[^\n]*\n*(
                     (?: [^\n]*\n*)*
                     tunnel mpls traffic-eng auto-bw)/mx, '\1'
+      # get rid of values of custom SNMP OID's
+      cfg.gsub! /^(\s+expression) \d+$/, '\\1 <value removed>'
       cfg
     end
   end
@@ -128,17 +161,11 @@ class IOS < Oxidized::Model
   end
 
   cfg :telnet, :ssh do
-    # preferred way to handle additional passwords
-    post_login do
-      if vars(:enable) == true
-        cmd "enable"
-      elsif vars(:enable)
-        cmd "enable", /^[pP]assword:/
-        cmd vars(:enable)
-      end
-    end
     post_login 'terminal length 0'
     post_login 'terminal width 0'
     pre_logout 'exit'
   end
+
+  # preferred way to handle additional passwords (enable)
+  macro :enable
 end

data/lib/oxidized/model/iosxr.rb

@@ -16,7 +16,7 @@ class IOSXR < Oxidized::Model
     cfg
   end
 
-  cmd 'show inventory' do |cfg|
+  cmd 'show inventory all' do |cfg|
     comment cfg
   end
 
@@ -25,7 +25,7 @@ class IOSXR < Oxidized::Model
   end
 
   cmd 'show running-config' do |cfg|
-    cfg = cfg.each_line.to_a[3..-1].join
+    cfg = cfg.each_line.to_a[1..-1].join
     cfg
   end