From 81fc3a4b423d8ce9fe69def57007312a96db6f67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torbj=C3=B6rn=20L=C3=B6nnemark?= <ketl@nsc.liu.se>
Date: Tue, 19 Sep 2017 16:28:41 +0200
Subject: Add support for Supermicro SSE-G48-TG4

This model (and possibly others) runs an OS with a different set of
commands than the Supermicro model that already exists.
---
 lib/oxidized/model/supermicro2.rb | 48 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 lib/oxidized/model/supermicro2.rb

(limited to 'lib')

diff --git a/lib/oxidized/model/supermicro2.rb b/lib/oxidized/model/supermicro2.rb
new file mode 100644
index 0000000..710603c
--- /dev/null
+++ b/lib/oxidized/model/supermicro2.rb
@@ -0,0 +1,48 @@
+# Developed against:
+# #show version
+# Switch ID       Hardware Version                Firmware Version
+# 0               SSE-G48-TG4   (P2-01)           1.0.16-9
+
+class Supermicro2 < Oxidized::Model
+  prompt (/^(\e\[27m)?[ \r]*\w+# ?$/)
+
+  cfg :ssh do
+    post_login 'no cli pagignation'
+    pre_logout 'exit'
+  end
+
+  cmd :all do |cfg|
+    # * Drop first line that contains the command, and the last line that
+    #   contains a prompt
+    # * Strip carriage returns
+    cfg.delete("\r").each_line.to_a[1..-2].join
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub(/^(snmp community) .*/, '\1 <hidden>')
+  end
+
+  cmd 'show system information' do |cfg|
+    cfg.sub! /^Device Up Time.*\n/, ''
+    cfg.delete! "\r"
+    comment(cfg).gsub(/ +$/, '')
+  end
+
+  cmd 'show running-config' do |cfg|
+    comment_next = 0
+    cfg.each_line.map { |l|
+      next '' if l.match /^Building configuration/
+
+      if l.match /^Switch ID.*Hardware Version.*Firmware Version/ then
+        comment_next = 2
+      end
+
+      if comment_next > 0 then
+        comment_next -= 1
+        next comment(l)
+      end
+
+      l
+    }.join.gsub(/ +$/, '')
+  end
+end
-- 
cgit v1.2.1


From a302b12af7edb5960c9812a51fec529c132ac401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verch=C3=A8re?= <remi@verchere.fr>
Date: Tue, 17 Oct 2017 12:27:44 +0200
Subject: Handle Dell N2000 switches (dnos6)

---
 lib/oxidized/model/dnos.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'lib')

diff --git a/lib/oxidized/model/dnos.rb b/lib/oxidized/model/dnos.rb
index a44630e..5c3cd53 100644
--- a/lib/oxidized/model/dnos.rb
+++ b/lib/oxidized/model/dnos.rb
@@ -5,6 +5,7 @@ class DNOS  < Oxidized::Model
   comment  '! '
 
   cmd :all do |cfg|
+    cfg.gsub! /^% Invalid input detected at '\^' marker\.$|^\s+\^$/, ''
     cfg.each_line.to_a[2..-2].join
   end
 
@@ -22,6 +23,14 @@ class DNOS  < Oxidized::Model
     comment cfg
   end
 
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show system' do |cfg|
+    comment cfg
+  end
+
   cmd 'show running-config' do |cfg|
     cfg = cfg.each_line.to_a[3..-1].join
     cfg
-- 
cgit v1.2.1


From 38e1f4216df5751e856e11532fc894ccfbd4010d Mon Sep 17 00:00:00 2001
From: mattie47 <4696925+mattie47@users.noreply.github.com>
Date: Sun, 7 Jan 2018 10:32:52 +1300
Subject: model: Added Allied Telesis AW+ model (#936)

* Create awplus.rb

Added support for Allied Telesis AW+ switches and routers

* Add support for Allied Telesis Alliedware Plus products

* Add Allied Telesis to Supported Products

* Add Allied Telesis to supported models

Feature support included:

- Telnet and SSH
-- Enable/Secret Password
- Device info from "show system" command
-- Dynamic output e.g. Device Uptime is removed.
- Var: remove_secret
- User-defined terminal length
-- User is not required to "terminal no length" and can keep configured pager length.
---
 lib/oxidized/model/awplus.rb | 85 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 lib/oxidized/model/awplus.rb

(limited to 'lib')

diff --git a/lib/oxidized/model/awplus.rb b/lib/oxidized/model/awplus.rb
new file mode 100644
index 0000000..1d8fbcd
--- /dev/null
+++ b/lib/oxidized/model/awplus.rb
@@ -0,0 +1,85 @@
+class AWPlus < Oxidized::Model
+
+  #Allied Telesis Alliedware Plus Model#
+  #https://www.alliedtelesis.com/products/software/AlliedWare-Plus
+  
+  prompt /^(\r?[\w.@:\/-]+[#>]\s?)$/
+  comment  '! '
+
+  #Avoids needing "term length 0" to display full config file. 
+    expect /--More--/ do |data, re|
+      send ' '
+      data.sub re, ''
+    end
+
+  #Removes gibberish pager output e.g. VT100 escape codes
+  cmd :all do |cfg|
+    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
+  end
+
+  #Remove passwords from config file.
+  #Add vars "remove_secret: true" to global oxidized config file to enable. 
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
+    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! /^(\s+(?:password|secret)) (?:\d )?\S+/, '\\1 <secret hidden>'
+    cfg.gsub! /^(tacacs-server key \d) (\S+)/, '\\1 <secret hidden>'
+    cfg
+  end
+
+  #Adds "Show system" output to start of config. 
+
+  cmd 'Show System' do |cfg|
+    comment cfg.insert(0,"--------------------------------------------------------------------------------! \n")
+    #Unhash below to write a comment in the config file.
+    cfg.insert(0,"Starting: Show system cmd \n")
+    cfg << "\n \nEnding: show system cmd"
+    comment cfg << "\n--------------------------------------------------------------------------------! \n \n"
+    #Removes the following lines from "show system" in output file. This ensures oxidized diffs are meaningful. 
+    comment cfg.each_line.reject { |line| 
+                                    line.match /^$\n/ or #Remove blank lines in "sh sys"
+                                    line.match /System Status\s*.*/ or
+                                    line.match /RAM\s*:.*/ or 
+                                    line.match /Uptime\s*:.*/ or 
+                                    line.match /Flash\s*:.*/ or 
+                                    line.match /Current software\s*:.*/ or 
+                                    line.match /Software version\s*:.*/ or 
+                                    line.match /Build date\s*:.*/ }.join
+  end
+     
+  #Actually get the devices running config#
+  cmd 'show running-config' do |cfg|
+    cfg
+  end
+  
+  #Config required for telnet to detect username prompt
+  cfg :telnet do
+    username /login:\s/
+    end
+
+  #Main login config
+    cfg :telnet, :ssh do
+    post_login do
+      if vars :enable
+        send "enable\n"
+        expect /^Password:\s/
+        cmd vars(:enable) + "\r\n"
+      else
+        cmd 'enable' # Required for Priv-Exec users without enable PW to be put into "enable mode". 
+      end
+#      cmd 'terminal length 0' #set so the entire config is output without intervention.
+    end
+    pre_logout do
+#      cmd 'terminal no length' #Sets term length back to default on exit. 
+      send  "exit\r\n"
+    end
+  end  
+
+end
-- 
cgit v1.2.1


From 3d140e81a8b40ecb63704523e78bf46455b9f238 Mon Sep 17 00:00:00 2001
From: Alan Gregory <alan@opcaonet.com.br>
Date: Tue, 9 Jan 2018 09:20:29 -0200
Subject: model: Remove system comment on time based rules for RouterOS.
 (#1143)

---
 lib/oxidized/model/routeros.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/oxidized/model/routeros.rb b/lib/oxidized/model/routeros.rb
index f391fb9..6717446 100644
--- a/lib/oxidized/model/routeros.rb
+++ b/lib/oxidized/model/routeros.rb
@@ -19,6 +19,7 @@ class RouterOS < Oxidized::Model
     cmd run_cmd do |cfg|
       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").select { |line| not line[/^\#\s\w{3}\/\d{2}\/\d{4}.*$/] }
       cfg.join("\n") + "\n"
     end
-- 
cgit v1.2.1


From 4e59878052f0668f4dde2282e86882626936f6b4 Mon Sep 17 00:00:00 2001
From: KodApa85 <parsons151185@gmail.com>
Date: Thu, 25 Jan 2018 22:01:39 +0000
Subject: model: Fixed FTP Passive/Active modes & Xyzel XGS4600 series Docs
 (#1161)

* FTP Passive/Active mode added

* Documentation for Xyzel XGS4600 series
---
 lib/oxidized/config.rb    | 1 +
 lib/oxidized/input/ftp.rb | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/oxidized/config.rb b/lib/oxidized/config.rb
index 23af9c2..47544fb 100644
--- a/lib/oxidized/config.rb
+++ b/lib/oxidized/config.rb
@@ -37,6 +37,7 @@ module Oxidized
       asetus.default.input.default    = 'ssh, telnet'
       asetus.default.input.debug      = false # or String for session log file
       asetus.default.input.ssh.secure = false # complain about changed certs
+      asetus.default.input.ftp.passive= true  # ftp passive mode
 
       asetus.default.output.default = 'file'  # file, git
       asetus.default.source.default = 'csv'   # csv, sql
diff --git a/lib/oxidized/input/ftp.rb b/lib/oxidized/input/ftp.rb
index 80de257..cdf3688 100644
--- a/lib/oxidized/input/ftp.rb
+++ b/lib/oxidized/input/ftp.rb
@@ -19,7 +19,9 @@ module Oxidized
       @node       = node
       @node.model.cfg['ftp'].each { |cb| instance_exec(&cb) }
       @log = File.open(Oxidized::Config::Log + "/#{@node.ip}-ftp", 'w') if Oxidized.config.input.debug?
-      @ftp = Net::FTP.new @node.ip, @node.auth[:username], @node.auth[:password]
+      @ftp = Net::FTP.new(@node.ip)
+      @ftp.passive = Oxidized.config.input.ftp.passive
+      @ftp.login  @node.auth[:username], @node.auth[:password]
       connected?
     end
 
-- 
cgit v1.2.1


From d6456bf490e71c7e3f453497641ff5c7952a018e Mon Sep 17 00:00:00 2001
From: Adam Smith <zero1three@gmail.com>
Date: Thu, 25 Jan 2018 14:11:07 -0800
Subject: fix: Don't post diff to Slack if there are no diffs (#1151)

---
 lib/oxidized/hook/slackdiff.rb | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/oxidized/hook/slackdiff.rb b/lib/oxidized/hook/slackdiff.rb
index 728e5a7..7cd4465 100644
--- a/lib/oxidized/hook/slackdiff.rb
+++ b/lib/oxidized/hook/slackdiff.rb
@@ -30,14 +30,16 @@ class SlackDiff < Oxidized::Hook
         if diffenable == true
           gitoutput = ctx.node.output.new
           diff = gitoutput.get_diff ctx.node, ctx.node.group, ctx.commitref, nil
-          title = "#{ctx.node.name.to_s} #{ctx.node.group.to_s} #{ctx.node.model.class.name.to_s.downcase}"
-          log "Posting diff as snippet to #{cfg.channel}"
-          client.files_upload(channels: cfg.channel, as_user: true,
-                              content: diff[:patch].lines.to_a[4..-1].join,
-                              filetype: "diff",
-                              title: title,
-                              filename: "change"
-                             )
+          unless diff == "no diffs"
+            title = "#{ctx.node.name.to_s} #{ctx.node.group.to_s} #{ctx.node.model.class.name.to_s.downcase}"
+            log "Posting diff as snippet to #{cfg.channel}"
+            client.files_upload(channels: cfg.channel, as_user: true,
+                                content: diff[:patch].lines.to_a[4..-1].join,
+                                filetype: "diff",
+                                title: title,
+                                filename: "change"
+                               )
+          end
         end
         # message custom formatted - optional
         if cfg.has_key?('message') == true
-- 
cgit v1.2.1


From 9a134db581c8618c703b35960796e9b4b14c2be3 Mon Sep 17 00:00:00 2001
From: Alexandre-io <Alexandre-io@users.noreply.github.com>
Date: Thu, 12 Oct 2017 18:29:36 +0200
Subject: Fix prompt pattern for firewareos clusters and standalone

---
 lib/oxidized/model/firewareos.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/oxidized/model/firewareos.rb b/lib/oxidized/model/firewareos.rb
index f456c60..1b3d07c 100644
--- a/lib/oxidized/model/firewareos.rb
+++ b/lib/oxidized/model/firewareos.rb
@@ -1,6 +1,6 @@
 class FirewareOS < Oxidized::Model
 
-  prompt /^([\w.@-]+[#>]\s?)$/
+  prompt /^\[?\w*\]?\w*?(<\w*>)?(#|>)\s*$/
   comment  '-- '
 
   cmd :all do |cfg|
-- 
cgit v1.2.1


From 2726fff67ded963e24776e60f1e8976ae2bb037b Mon Sep 17 00:00:00 2001
From: Dave <davama@gmail.com>
Date: Wed, 31 Jan 2018 16:49:52 -0500
Subject: model: Add show system command to ciscosmb (#1165)

* Add show commands to ciscosmb

* Update ciscosmb.rb

Uptime changes which cause oxidized to update config.
Removing line from final config output
---
 lib/oxidized/model/ciscosmb.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lib')

diff --git a/lib/oxidized/model/ciscosmb.rb b/lib/oxidized/model/ciscosmb.rb
index 9453059..deb4768 100644
--- a/lib/oxidized/model/ciscosmb.rb
+++ b/lib/oxidized/model/ciscosmb.rb
@@ -17,6 +17,7 @@ class CiscoSMB < Oxidized::Model
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
     cfg.gsub! /username (\S+) privilege (\d+) (\S+).*/, '<secret hidden>'
     cfg.gsub! /^(encrypted radius-server key).*/, '\\1 <configuration removed>'
+    cfg.gsub! /System Up Time.*/, ''
     cfg
   end
 
@@ -24,6 +25,10 @@ class CiscoSMB < Oxidized::Model
     comment cfg
   end
   
+  cmd 'show system' do |cfg|
+    comment cfg
+  end
+  
   cmd 'show bootvar' do |cfg|
     comment cfg
   end
-- 
cgit v1.2.1


From 3836597f38d7dd34ac164857e317560af4206fd1 Mon Sep 17 00:00:00 2001
From: Thane Gill <me@thanegill.com>
Date: Fri, 9 Feb 2018 12:41:39 -0800
Subject: model: AWOS Make the space between # mandatory rather than optional
 in the prompt. (#1182)

Per discussion in #1000
---
 lib/oxidized/model/aosw.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/oxidized/model/aosw.rb b/lib/oxidized/model/aosw.rb
index a85ead7..71fde2e 100644
--- a/lib/oxidized/model/aosw.rb
+++ b/lib/oxidized/model/aosw.rb
@@ -11,7 +11,7 @@ class AOSW < Oxidized::Model
   # All IAPs connected to a Instant Controller will have the same config output. Only the controller needs to be monitored. 
 
   comment  '# '
-  prompt /^\(?.+\)?\s?[#>]/
+  prompt /^\(?.+\)?\s[#>]/
 
   cmd :all do |cfg|
     cfg.each_line.to_a[1..-2].join
-- 
cgit v1.2.1


From a9e5eed60b687b4a488eb1d11b5147e9f932c6fa Mon Sep 17 00:00:00 2001
From: Dave <davama@gmail.com>
Date: Sat, 10 Feb 2018 17:10:23 -0500
Subject: mode: Procurve model add show commands (#1176)

Sanitized output:

```
 Power Supply Status:

  PS#    Model       State        AC/DC  + V      Wattage
  ---- --------- ------------- ----------------- ---------
    1   Unknwn    Powered         AC 220V          1500
    2   Unknwn    Powered         AC 220V          1500

    2 /  2 supply bays delivering power.
    Total power: 3000 W
```

Of course you see `unknwn` but that is addressed in latest firmware release.

Thanks!
---
 lib/oxidized/model/procurve.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib')

diff --git a/lib/oxidized/model/procurve.rb b/lib/oxidized/model/procurve.rb
index 11d7ea9..444fb5b 100644
--- a/lib/oxidized/model/procurve.rb
+++ b/lib/oxidized/model/procurve.rb
@@ -47,6 +47,10 @@ class Procurve < Oxidized::Model
     comment cfg
   end
 
+  cmd 'show system power-supply' do |cfg|
+    comment cfg
+  end
+
   cmd 'show interfaces transceiver' do |cfg|
     comment cfg
   end
-- 
cgit v1.2.1


From a42d1bad82e37975d674b560b18bc153a2786669 Mon Sep 17 00:00:00 2001
From: dhooper6430 <dhooper@gold.net.au>
Date: Wed, 21 Feb 2018 17:25:49 +0800
Subject: model: Update br6910 model prompt detection (#1188)

The BR6910 switch can be configured to display anything on the prompt, by default it's vty-, I have modified the prompt statement to allow for whatever the user has configured the prompt to be.
---
 lib/oxidized/model/br6910.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/oxidized/model/br6910.rb b/lib/oxidized/model/br6910.rb
index b5c9bcf..df93793 100644
--- a/lib/oxidized/model/br6910.rb
+++ b/lib/oxidized/model/br6910.rb
@@ -1,7 +1,7 @@
 
 class BR6910 < Oxidized::Model
 
-  prompt /^Vty-[0-9]\#$/
+  prompt /^([\w.@()-]+[#>]\s?)$/
   comment  '! '
 
   # not possible to disable paging prior to show running-config
-- 
cgit v1.2.1


From 72397c4f344ab97fe3db1e381a3e5e1b1a935c62 Mon Sep 17 00:00:00 2001
From: Jason Ackley <jason@ackley.net>
Date: Tue, 27 Feb 2018 08:58:59 -0600
Subject: model: Added support for ArbOS from Arbor Networks. (#1096)

* Basic support for ArbOS from Arbor Networks.

ArbOS is the generic name for Arbor Networks (https://www.arbornetworks.com/) OS that runs on some of their devices.

Found and imported from https://github.com/claranet/oxidized . Credit to Claranet for the creation.

Locally validated on Peakflow SP v8.2+

The module is quite simple as the command 'config show' automatically disables pagination. There is a pagination-enabled version of the command as well.

* Added model notes for ArbOS
---
 lib/oxidized/model/arbos.rb | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 lib/oxidized/model/arbos.rb

(limited to 'lib')

diff --git a/lib/oxidized/model/arbos.rb b/lib/oxidized/model/arbos.rb
new file mode 100644
index 0000000..389f3f6
--- /dev/null
+++ b/lib/oxidized/model/arbos.rb
@@ -0,0 +1,27 @@
+class ARBOS  < Oxidized::Model
+
+  # Arbor OS model #
+
+  prompt /^[\S\s]+\n([\w.@-]+[:\/#>]+)\s?$/
+  comment  '# '
+
+  cmd 'system hardware' do |cfg|
+    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
+
+  cmd 'system version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'config show' do |cfg|
+    cfg
+  end
+
+  cfg :ssh do
+    exec true
+    pre_logout 'exit'
+  end
+end
-- 
cgit v1.2.1


From 34cdbeb75f3c74d803fb60c509fc06e4f6365f0c Mon Sep 17 00:00:00 2001
From: Zachary Puls <zach@zachpuls.com>
Date: Tue, 27 Feb 2018 09:22:32 -0600
Subject: model: Added "commands" flag to "show configuration" on
 VyOS/Vyatta/EdgeOS (#1164)

---
 lib/oxidized/model/edgeos.rb | 2 +-
 lib/oxidized/model/vyatta.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/oxidized/model/edgeos.rb b/lib/oxidized/model/edgeos.rb
index 2a8d663..bb0aab5 100644
--- a/lib/oxidized/model/edgeos.rb
+++ b/lib/oxidized/model/edgeos.rb
@@ -13,7 +13,7 @@ class Edgeos < Oxidized::Model
     cfg
   end
 
-  cmd 'show configuration | no-more'
+  cmd 'show configuration commands | no-more'
 
   cfg :telnet do
     username  /login:\s/
diff --git a/lib/oxidized/model/vyatta.rb b/lib/oxidized/model/vyatta.rb
index 8d977aa..aa0bc74 100644
--- a/lib/oxidized/model/vyatta.rb
+++ b/lib/oxidized/model/vyatta.rb
@@ -13,7 +13,7 @@ class Vyatta < Oxidized::Model
     cfg
   end
 
-  cmd 'show configuration | no-more'
+  cmd 'show configuration commands | no-more'
 
   cfg :telnet do
     username  /login:\s/
-- 
cgit v1.2.1


From 692a5c0d61f4900c07b859afff5affa86ccb8505 Mon Sep 17 00:00:00 2001
From: Adam Furman <adam@furmantation.com>
Date: Sat, 10 Mar 2018 12:55:39 -0800
Subject: Add fortios fields to be masked by remove_secret flag

---
 lib/oxidized/model/fortios.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/oxidized/model/fortios.rb b/lib/oxidized/model/fortios.rb
index bffaf3c..23370c4 100644
--- a/lib/oxidized/model/fortios.rb
+++ b/lib/oxidized/model/fortios.rb
@@ -15,7 +15,7 @@ class FortiOS < Oxidized::Model
   end
 
   cmd :secret do |cfg|
-    cfg.gsub! /(set (?:passwd|password|psksecret|secret|key|group-password|secondary-secret|tertiary-secret|auth-password-l1|auth-password-l2|rsso|history0|history1|inter-controller-key ENC)).*/, '\\1 <configuration removed>'
+    cfg.gsub! /(set (?:passwd|password|psksecret|secret|key|group-password|secondary-secret|tertiary-secret|auth-password-l1|auth-password-l2|rsso|history0|history1|inter-controller-key ENC|passphrase ENC|login-passwd ENC)).*/, '\\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>'
@@ -63,4 +63,3 @@ cfg << cmd('end') if @vdom_enabled
   end
 
 end
-
-- 
cgit v1.2.1


From ad2a0675edee605bda8fe460b3656857eb050129 Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Sun, 11 Mar 2018 23:11:13 +0100
Subject: Introduce support for OXIDIZED_SSH_PASSPHRASE

---
 lib/oxidized/hook/githubrepo.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/oxidized/hook/githubrepo.rb b/lib/oxidized/hook/githubrepo.rb
index d33e54e..f74b22a 100644
--- a/lib/oxidized/hook/githubrepo.rb
+++ b/lib/oxidized/hook/githubrepo.rb
@@ -51,7 +51,7 @@ class GithubRepo < Oxidized::Hook
     else
       if cfg.has_key?('publickey') && cfg.has_key?('privatekey')
         log "Using ssh auth with key", :debug
-        Rugged::Credentials::SshKey.new(username: 'git', publickey: File.expand_path(cfg.publickey), privatekey: File.expand_path(cfg.privatekey))
+        Rugged::Credentials::SshKey.new(username: 'git', publickey: File.expand_path(cfg.publickey), privatekey: File.expand_path(cfg.privatekey), passphrase: ENV["OXIDIZED_SSH_PASSPHRASE"])
       else
         log "Using ssh auth with agentforwarding", :debug
         Rugged::Credentials::SshKeyFromAgent.new(username: 'git')
-- 
cgit v1.2.1


From 577128f962f02e81ce7664e32fb97a46f2c220e8 Mon Sep 17 00:00:00 2001
From: Adam Smith <zero1three@gmail.com>
Date: Thu, 15 Mar 2018 01:54:55 -0700
Subject: add removal of secrets in edgeos, vyatta

---
 lib/oxidized/model/edgeos.rb | 4 ++++
 lib/oxidized/model/vyatta.rb | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'lib')

diff --git a/lib/oxidized/model/edgeos.rb b/lib/oxidized/model/edgeos.rb
index bb0aab5..aa7a197 100644
--- a/lib/oxidized/model/edgeos.rb
+++ b/lib/oxidized/model/edgeos.rb
@@ -9,6 +9,10 @@ class Edgeos < Oxidized::Model
   end
 
   cmd :secret do |cfg|
+    cfg.gsub! /encrypted-password (\S+).*/, 'encrypted-password <secret removed>'
+    cfg.gsub! /plaintext-password (\S+).*/, 'plaintext-password <secret removed>'
+    cfg.gsub! /password (\S+).*/, 'password <secret removed>'
+    cfg.gsub! /pre-shared-secret (\S+).*/, 'pre-shared-secret <secret removed>'
     cfg.gsub! /community (\S+) {/, 'community <hidden> {'
     cfg
   end
diff --git a/lib/oxidized/model/vyatta.rb b/lib/oxidized/model/vyatta.rb
index aa0bc74..57ec9d3 100644
--- a/lib/oxidized/model/vyatta.rb
+++ b/lib/oxidized/model/vyatta.rb
@@ -9,6 +9,10 @@ class Vyatta < Oxidized::Model
   end
 
   cmd :secret do |cfg|
+    cfg.gsub! /encrypted-password (\S+).*/, 'encrypted-password <secret removed>'
+    cfg.gsub! /plaintext-password (\S+).*/, 'plaintext-password <secret removed>'
+    cfg.gsub! /password (\S+).*/, 'password <secret removed>'
+    cfg.gsub! /pre-shared-secret (\S+).*/, 'pre-shared-secret <secret removed>'
     cfg.gsub! /community (\S+) {/, 'community <hidden> {'
     cfg
   end
-- 
cgit v1.2.1


From 05e1d505f2cc30e87b1cdcf90db966690882f610 Mon Sep 17 00:00:00 2001
From: Adam Smith <zero1three@gmail.com>
Date: Thu, 15 Mar 2018 02:18:38 -0700
Subject: add secrets to sanitize in JunOS

---
 lib/oxidized/model/junos.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/oxidized/model/junos.rb b/lib/oxidized/model/junos.rb
index 2f59414..4652ab1 100644
--- a/lib/oxidized/model/junos.rb
+++ b/lib/oxidized/model/junos.rb
@@ -13,7 +13,9 @@ class JunOS < Oxidized::Model
   end
 
   cmd :secret do |cfg|
-    cfg.gsub!(/encrypted-password (\S+).*/, '<secret removed>')
+    cfg.gsub!(/encrypted-password (\S+).*/, 'encrypted-password <secret removed>')
+    cfg.gsub!(/pre-shared-key ascii-text (\S+).*/, 'pre-shared-key ascii-text <secret removed>')
+    cfg.gsub!(/authentication-key (\S+).*/, 'authentication-key <secret removed>')
     cfg.gsub!(/community (\S+) {/, 'community <hidden> {')
     cfg
   end
-- 
cgit v1.2.1


From 227f1af00c6d43e9627fa2803d90617bebcd1d83 Mon Sep 17 00:00:00 2001
From: Adam Smith <zero1three@gmail.com>
Date: Thu, 15 Mar 2018 02:23:45 -0700
Subject: add hexadecimal for junos pre-shared-secret

---
 lib/oxidized/model/junos.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/oxidized/model/junos.rb b/lib/oxidized/model/junos.rb
index 4652ab1..2ea0179 100644
--- a/lib/oxidized/model/junos.rb
+++ b/lib/oxidized/model/junos.rb
@@ -15,6 +15,7 @@ class JunOS < Oxidized::Model
   cmd :secret do |cfg|
     cfg.gsub!(/encrypted-password (\S+).*/, 'encrypted-password <secret removed>')
     cfg.gsub!(/pre-shared-key ascii-text (\S+).*/, 'pre-shared-key ascii-text <secret removed>')
+    cfg.gsub!(/pre-shared-key hexadecimal (\S+).*/, 'pre-shared-key hexadecimal <secret removed>')
     cfg.gsub!(/authentication-key (\S+).*/, 'authentication-key <secret removed>')
     cfg.gsub!(/community (\S+) {/, 'community <hidden> {')
     cfg
-- 
cgit v1.2.1


From dc28e4b352dde0b43656c93f852e744125dd708e Mon Sep 17 00:00:00 2001
From: Brian Candler <b.candler@pobox.com>
Date: Thu, 15 Mar 2018 19:57:33 +0000
Subject: Skip the word 'encrypted' in Powerconnect password masking

Fixes #1212
---
 lib/oxidized/model/powerconnect.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/oxidized/model/powerconnect.rb b/lib/oxidized/model/powerconnect.rb
index 61e1cf2..f602a36 100644
--- a/lib/oxidized/model/powerconnect.rb
+++ b/lib/oxidized/model/powerconnect.rb
@@ -14,7 +14,7 @@ class PowerConnect < Oxidized::Model
   end
 
   cmd :secret do |cfg|
-    cfg.gsub! /^username (\S+) password \S+ (.*)/, 'username \1 password <hidden> \2'
+    cfg.gsub! /^(username \S+ password (?:encrypted )?)\S+(.*)/, '\1<hidden>\2'
     cfg
   end
 
-- 
cgit v1.2.1


From 7445e7ae80aa291a816fdae5fbec0594401ea9c9 Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Sat, 17 Mar 2018 12:13:43 +0100
Subject: restore backward compatibility with a supermicro shim

---
 lib/oxidized/model/supermicro.rb | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 lib/oxidized/model/supermicro.rb

(limited to 'lib')

diff --git a/lib/oxidized/model/supermicro.rb b/lib/oxidized/model/supermicro.rb
new file mode 100644
index 0000000..9cfa0a3
--- /dev/null
+++ b/lib/oxidized/model/supermicro.rb
@@ -0,0 +1,7 @@
+# Backward compatibility shim for deprecated model `supermicro`.
+# Migrate your source from `supermicro` to `edgecos`.
+
+require_relative 'edgecos.rb'
+
+Supermicro = EdgeCOS
+
-- 
cgit v1.2.1


From 640bdb90f096334d3c6a6e2dd7fce8d34c1fba96 Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Sat, 17 Mar 2018 12:44:01 +0100
Subject: complain when backward compatibility shim is used

---
 lib/oxidized/model/supermicro.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib')

diff --git a/lib/oxidized/model/supermicro.rb b/lib/oxidized/model/supermicro.rb
index 9cfa0a3..518ae41 100644
--- a/lib/oxidized/model/supermicro.rb
+++ b/lib/oxidized/model/supermicro.rb
@@ -5,3 +5,5 @@ require_relative 'edgecos.rb'
 
 Supermicro = EdgeCOS
 
+Oxidized.logger.warn "Using deprecated model supermicro, use edgecos instead."
+
-- 
cgit v1.2.1


From 9862cff359d6abc7bdc260600acd293d2d85dd2b Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Sat, 17 Mar 2018 13:04:20 +0100
Subject: restore dev comment of @tobbez to aricentiss model

---
 lib/oxidized/model/aricentiss.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lib')

diff --git a/lib/oxidized/model/aricentiss.rb b/lib/oxidized/model/aricentiss.rb
index 8675263..60c2f48 100644
--- a/lib/oxidized/model/aricentiss.rb
+++ b/lib/oxidized/model/aricentiss.rb
@@ -1,3 +1,8 @@
+# Developed against:
+# #show version
+# Switch ID       Hardware Version                Firmware Version
+# 0               SSE-G48-TG4   (P2-01)           1.0.16-9
+
 class AricentISS < Oxidized::Model
 
   prompt (/^(\e\[27m)?[ \r]*\w+# ?$/)
-- 
cgit v1.2.1


From 2978d671a195a024893150cdf27b8a136d18e003 Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Sat, 17 Mar 2018 13:24:02 +0100
Subject: correct typo in command to disable pagination

---
 lib/oxidized/model/aricentiss.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/oxidized/model/aricentiss.rb b/lib/oxidized/model/aricentiss.rb
index 60c2f48..80735c7 100644
--- a/lib/oxidized/model/aricentiss.rb
+++ b/lib/oxidized/model/aricentiss.rb
@@ -8,7 +8,7 @@ class AricentISS < Oxidized::Model
   prompt (/^(\e\[27m)?[ \r]*\w+# ?$/)
 
   cfg :ssh do
-    post_login 'no cli pagignation'
+    post_login 'no cli pagination'
     pre_logout 'exit'
   end
 
-- 
cgit v1.2.1


From d3c96a04c15ff0c6cae00d0721a6f5216357207f Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@futureinquestion.net>
Date: Sat, 17 Mar 2018 17:49:18 +0100
Subject: transition timos to sros

---
 lib/oxidized/model/sros.rb       | 118 ++++++++++++++++++++++++++++++++++++++
 lib/oxidized/model/supermicro.rb |   1 +
 lib/oxidized/model/timos.rb      | 120 ++-------------------------------------
 3 files changed, 125 insertions(+), 114 deletions(-)
 create mode 100644 lib/oxidized/model/sros.rb

(limited to 'lib')

diff --git a/lib/oxidized/model/sros.rb b/lib/oxidized/model/sros.rb
new file mode 100644
index 0000000..289bed3
--- /dev/null
+++ b/lib/oxidized/model/sros.rb
@@ -0,0 +1,118 @@
+class SROS < Oxidized::Model
+
+  #
+  # Nokia SR OS (TiMOS) (formerly TiMetra, Alcatel, Alcatel-Lucent).
+  # Used in 7705 SAR, 7210 SAS, 7450 ESS, 7750 SR, 7950 XRS, and NSP.
+  #
+
+  comment  '# '
+
+  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
+  end
+
+  #
+  # Show the boot options file.
+  #
+  cmd 'show bof' do |cfg|
+    cfg.gsub! /# Finished .*/, ''
+    cfg.gsub! /# Generated .*/, ''
+    comment cfg
+  end
+
+  #
+  # Show the system information.
+  #
+  cmd 'show system information' do |cfg|
+    #
+    # Strip uptime.
+    #
+    cfg.sub! /^System Up Time.*\n/, ''
+    cfg.gsub! /# Finished .*/, ''
+    cfg.gsub! /# Generated .*/, ''
+    comment cfg
+  end
+
+  #
+  # Show the card state.
+  #
+  cmd 'show card state' do |cfg|
+    cfg.gsub! /# Finished .*/, ''
+    cfg.gsub! /# Generated .*/, ''
+    comment cfg
+  end
+
+  #
+  # Show the boot log.
+  #
+  cmd 'file type bootlog.txt' do |cfg|
+    #
+    # Strip carriage returns and backspaces.
+    #
+    cfg.gsub! /\r/, ''
+    cfg.gsub! /[\b][\b][\b]/, "\n"
+    cfg.gsub! /# Finished .*/, ''
+    cfg.gsub! /# Generated .*/, ''
+    comment cfg
+  end
+
+  #
+  # Show the running debug configuration.
+  #
+  cmd 'show debug' do |cfg|
+    cfg.gsub! /# Finished .*/, ''
+    cfg.gsub! /# Generated .*/, ''
+    comment cfg
+  end
+
+  #
+  # Show the saved debug configuration (admin debug-save).
+  #
+  cmd 'file type config.dbg' do |cfg|
+    #
+    # Strip carriage returns.
+    #
+    cfg.gsub! /\r/, ''
+    cfg.gsub! /# Finished .*/, ''
+    cfg.gsub! /# Generated .*/, ''
+    comment cfg
+  end
+
+  #
+  # Show the running persistent indices.
+  #
+  cmd 'admin display-config index' do |cfg|
+    #
+    # Strip carriage returns.
+    #
+    cfg.gsub! /\r/, ''
+    cfg.gsub! /# Finished .*/, ''
+    cfg.gsub! /# Generated .*/, ''
+    comment cfg
+  end
+
+  #
+  # Show the running configuration.
+  #
+  cmd 'admin display-config' do |cfg|
+    #
+    # Strip carriage returns.
+    #
+    cfg.gsub! /\r/, ''
+    cfg.gsub! /# Finished .*/, ''
+    cfg.gsub! /# Generated .*/, ''
+  end
+
+  cfg :telnet do
+    username /^Login: /
+    password /^Password: /
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'environment no more'
+    pre_logout 'logout'
+  end
+end
diff --git a/lib/oxidized/model/supermicro.rb b/lib/oxidized/model/supermicro.rb
index 518ae41..56d5ef6 100644
--- a/lib/oxidized/model/supermicro.rb
+++ b/lib/oxidized/model/supermicro.rb
@@ -7,3 +7,4 @@ Supermicro = EdgeCOS
 
 Oxidized.logger.warn "Using deprecated model supermicro, use edgecos instead."
 
+# Deprecated
diff --git a/lib/oxidized/model/timos.rb b/lib/oxidized/model/timos.rb
index c230a8f..e454630 100644
--- a/lib/oxidized/model/timos.rb
+++ b/lib/oxidized/model/timos.rb
@@ -1,118 +1,10 @@
-class TiMOS < Oxidized::Model
+# Backward compatibility shim for deprecated model `timos`.
+# Migrate your source from `timos` to `sros`.
 
-  #
-  # Nokia SR OS (TiMOS) (formerly TiMetra, Alcatel, Alcatel-Lucent).
-  # Used in 7705 SAR, 7210 SAS, 7450 ESS, 7750 SR, 7950 XRS, and NSP.
-  #
+require_relative 'sros.rb'
 
-  comment  '# '
+TiMOS = SROS
 
-  prompt /^([-\w\.:>\*]+\s?[#>]\s?)$/
+Oxidized.logger.warn "Using deprecated model timos, use sros instead."
 
-  cmd :all do |cfg, cmdstring|
-    new_cfg = comment "COMMAND: #{cmdstring}\n"
-    new_cfg << cfg.each_line.to_a[1..-2].join
-  end
-
-  #
-  # Show the boot options file.
-  #
-  cmd 'show bof' do |cfg|
-    cfg.gsub! /# Finished .*/, ''
-    cfg.gsub! /# Generated .*/, ''
-    comment cfg
-  end
-
-  #
-  # Show the system information.
-  #
-  cmd 'show system information' do |cfg|
-    #
-    # Strip uptime.
-    #
-    cfg.sub! /^System Up Time.*\n/, ''
-    cfg.gsub! /# Finished .*/, ''
-    cfg.gsub! /# Generated .*/, ''
-    comment cfg
-  end
-
-  #
-  # Show the card state.
-  #
-  cmd 'show card state' do |cfg|
-    cfg.gsub! /# Finished .*/, ''
-    cfg.gsub! /# Generated .*/, ''
-    comment cfg
-  end
-
-  #
-  # Show the boot log.
-  #
-  cmd 'file type bootlog.txt' do |cfg|
-    #
-    # Strip carriage returns and backspaces.
-    #
-    cfg.gsub! /\r/, ''
-    cfg.gsub! /[\b][\b][\b]/, "\n"
-    cfg.gsub! /# Finished .*/, ''
-    cfg.gsub! /# Generated .*/, ''
-    comment cfg
-  end
-
-  #
-  # Show the running debug configuration.
-  #
-  cmd 'show debug' do |cfg|
-    cfg.gsub! /# Finished .*/, ''
-    cfg.gsub! /# Generated .*/, ''
-    comment cfg
-  end
-
-  #
-  # Show the saved debug configuration (admin debug-save).
-  #
-  cmd 'file type config.dbg' do |cfg|
-    #
-    # Strip carriage returns.
-    #
-    cfg.gsub! /\r/, ''
-    cfg.gsub! /# Finished .*/, ''
-    cfg.gsub! /# Generated .*/, ''
-    comment cfg
-  end
-
-  #
-  # Show the running persistent indices.
-  #
-  cmd 'admin display-config index' do |cfg|
-    #
-    # Strip carriage returns.
-    #
-    cfg.gsub! /\r/, ''
-    cfg.gsub! /# Finished .*/, ''
-    cfg.gsub! /# Generated .*/, ''
-    comment cfg
-  end
-
-  #
-  # Show the running configuration.
-  #
-  cmd 'admin display-config' do |cfg|
-    #
-    # Strip carriage returns.
-    #
-    cfg.gsub! /\r/, ''
-    cfg.gsub! /# Finished .*/, ''
-    cfg.gsub! /# Generated .*/, ''
-  end
-
-  cfg :telnet do
-    username /^Login: /
-    password /^Password: /
-  end
-
-  cfg :telnet, :ssh do
-    post_login 'environment no more'
-    pre_logout 'logout'
-  end
-end
+# Deprecated
-- 
cgit v1.2.1


From 7c5ca77a2e0349b87128fa6d143f391a9204b0f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torbj=C3=B6rn=20L=C3=B6nnemark?= <ketl@nsc.liu.se>
Date: Mon, 19 Mar 2018 12:11:21 +0100
Subject: AricentISS: Fix pagination for old OS versions

Always issue both 'no cli pagination' and 'no cli pagignation'.

Conditionally issuing only the correct variant would require sending the
same number of commands to the switch ('show version', 'no cli
pagi(g)nation') and also require extra logic in the model.

Additionally, always issuing both removes the need for storing
information about what OS versions require which command in the model.
---
 lib/oxidized/model/aricentiss.rb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib')

diff --git a/lib/oxidized/model/aricentiss.rb b/lib/oxidized/model/aricentiss.rb
index 80735c7..8821801 100644
--- a/lib/oxidized/model/aricentiss.rb
+++ b/lib/oxidized/model/aricentiss.rb
@@ -8,7 +8,10 @@ class AricentISS < Oxidized::Model
   prompt (/^(\e\[27m)?[ \r]*\w+# ?$/)
 
   cfg :ssh do
+    # "pagination" was misspelled in some (earlier) versions (at least 1.0.16-9)
+    # 1.0.18-15 is known to include the corrected spelling
     post_login 'no cli pagination'
+    post_login 'no cli pagignation'
     pre_logout 'exit'
   end
 
-- 
cgit v1.2.1