From ca54d6a72487d034e5b5b2a559f068fbcc4541d7 Mon Sep 17 00:00:00 2001
From: s-fu <43026027+s-fu@users.noreply.github.com>
Date: Sun, 19 Jan 2020 11:10:57 -0800
Subject: [PATCH 1/9] More secret scrubbing in SonicOS (#1938)

---
 CHANGELOG.md                  | 1 +
 lib/oxidized/model/sonicos.rb | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20474f7b8..b468d3d44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * FEATURE: add Waystream iBOS model
 * BUGFIX: better login modalities for telnet in aos7 (@optimuscream)
 * BUGFIX: better virtual domain detection in fortios (@agabellini)
+* MISC: more secret scrubbing in sonicos (@s-fu)
 * MISC: openssh key scrubbing as secret in fortios (@agabellini)
 
 ## 0.27.0
diff --git a/lib/oxidized/model/sonicos.rb b/lib/oxidized/model/sonicos.rb
index add95fb0a..bfcdad8dd 100644
--- a/lib/oxidized/model/sonicos.rb
+++ b/lib/oxidized/model/sonicos.rb
@@ -12,6 +12,11 @@ class SonicOS < Oxidized::Model
     cfg.gsub! /cli ftp password default \d\,(\S+)/, 'cli ftp password default <secret hidden> \2'
     cfg.gsub! /secret \d\,(\S+)/, 'secret <secret hidden> \2'
     cfg.gsub! /shared-secret \d\,(\S+)/, 'shared-secret <secret hidden> \2'
+    cfg.gsub! /password \d\,(\S+)/, 'password <secret hidden> \2'
+    cfg.gsub! /passphrase password \d\,(\S+)/, 'passphrase password <secret hidden> \2'
+    cfg.gsub! /bind-password \d\,(\S+)/, 'bind-password <secret hidden> \2'
+    cfg.gsub! /authentication sha1 \d\,(\S+)/, 'authentication sha1 <secret hidden> \2'
+    cfg.gsub! /encryption aes \d\,(\S+)/, 'encryption aes <secret hidden> \2'
     cfg
   end
 

From 29fbe3abe567cd36f469808dfd2878fa35894e4e Mon Sep 17 00:00:00 2001
From: Kris Amundson <krisa@subtend.net>
Date: Thu, 23 Jan 2020 03:02:41 -0600
Subject: [PATCH 2/9] EOS: Hides MACsec Key (#2014)

---
 CHANGELOG.md              | 1 +
 lib/oxidized/model/eos.rb | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b468d3d44..0a2b99721 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 * BUGFIX: better virtual domain detection in fortios (@agabellini)
 * MISC: more secret scrubbing in sonicos (@s-fu)
 * MISC: openssh key scrubbing as secret in fortios (@agabellini)
+* MISC: scrubs macsec key from Arista EOS (@krisamundson)
 
 ## 0.27.0
 
diff --git a/lib/oxidized/model/eos.rb b/lib/oxidized/model/eos.rb
index 661211664..e8dbd576c 100644
--- a/lib/oxidized/model/eos.rb
+++ b/lib/oxidized/model/eos.rb
@@ -15,6 +15,7 @@ class EOS < Oxidized::Model
     cfg.gsub! /(password \d+) (\S+).*/, '\\1 <secret hidden>'
     cfg.gsub! /^(enable secret).*/, '\\1 <configuration removed>'
     cfg.gsub! /^(tacacs-server key \d+).*/, '\\1 <configuration removed>'
+    cfg.gsub! /( {6}key) (\h+ 7) (\h+).*/, '\\1 <secret hidden>'
     cfg
   end
 

From 49f4c28e379fd84df17a851fa0e14fd77860bab8 Mon Sep 17 00:00:00 2001
From: Wild Kat <wk@users.noreply.github.com>
Date: Sat, 25 Jan 2020 21:47:20 +0100
Subject: [PATCH 3/9] Create publishdocker.yml

---
 .github/workflows/publishdocker.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .github/workflows/publishdocker.yml

diff --git a/.github/workflows/publishdocker.yml b/.github/workflows/publishdocker.yml
new file mode 100644
index 000000000..f3492519b
--- /dev/null
+++ b/.github/workflows/publishdocker.yml
@@ -0,0 +1,13 @@
+name: Publish Docker
+on: [push]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Publish to Registry
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: oxidized/oxidized
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}

From 87f38d131e80cc2f036d77ba81743fa90ea58dba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jozef=20Pivarn=C3=ADk?= <deesel@users.noreply.github.com>
Date: Sun, 26 Jan 2020 09:57:56 +0100
Subject: [PATCH 4/9] Fixes #1797 (#1994)

---
 CHANGELOG.md                   |  1 +
 lib/oxidized/model/ciscosmb.rb | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a2b99721..ae244af43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Master
 
+* FEATURE: add enable support to ciscosmb (@deesel)
 * FEATURE: add Waystream iBOS model
 * BUGFIX: better login modalities for telnet in aos7 (@optimuscream)
 * BUGFIX: better virtual domain detection in fortios (@agabellini)
diff --git a/lib/oxidized/model/ciscosmb.rb b/lib/oxidized/model/ciscosmb.rb
index 2cca9f986..b007f0932 100644
--- a/lib/oxidized/model/ciscosmb.rb
+++ b/lib/oxidized/model/ciscosmb.rb
@@ -46,6 +46,16 @@ class CiscoSMB < Oxidized::Model
   cfg :telnet, :ssh do
     username /^User ?[nN]ame:/
     password /^\r?Password:$/
+
+    post_login do
+      if vars(:enable) == true
+        cmd 'enable'
+      elsif vars(:enable)
+        cmd 'enable', /^\r?Password:$/
+        cmd vars(:enable)
+      end
+    end
+
     post_login 'terminal datadump' # Disable pager
     post_login 'terminal width 0'
     post_login 'terminal len 0'

From 105f565987b64f0bef3d1f2c255c4520eabcca01 Mon Sep 17 00:00:00 2001
From: SkylerBlumer <56000918+SkylerBlumer@users.noreply.github.com>
Date: Sun, 26 Jan 2020 04:29:51 -0500
Subject: [PATCH 5/9] Added telco.rb - Support for T-Marc 3306 (#1922)

---
 CHANGELOG.md                |  1 +
 docs/Supported-OS-Types.md  |  2 ++
 lib/oxidized/model/telco.rb | 24 ++++++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 lib/oxidized/model/telco.rb

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae244af43..246a822b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Master
 
+* FEATURE: add Telco Systems T-Marc 3306 support via telco model (@SkylerBlumer)
 * FEATURE: add enable support to ciscosmb (@deesel)
 * FEATURE: add Waystream iBOS model
 * BUGFIX: better login modalities for telnet in aos7 (@optimuscream)
diff --git a/docs/Supported-OS-Types.md b/docs/Supported-OS-Types.md
index 46f5aa29d..120f43358 100644
--- a/docs/Supported-OS-Types.md
+++ b/docs/Supported-OS-Types.md
@@ -192,6 +192,8 @@
   * [SBM-GEM-X2C, GEM-X2C+, GEM-X3S+, XEM-X10SM](/lib/oxidized/model/aricentiss.rb)
 * Symantec
   * [Blue Coat ProxySG / Security Gateway OS (SGOS)](/lib/oxidized/model/sgos.rb)
+* Telco Systems
+  * [Telco Systems T-Marc 3306](/lib/oxidized/model/telco.rb)
 * Trango Systems
   * [Trango](/lib/oxidized/model/trango.rb)
 * TPLink
diff --git a/lib/oxidized/model/telco.rb b/lib/oxidized/model/telco.rb
new file mode 100644
index 000000000..dd0bcf6ee
--- /dev/null
+++ b/lib/oxidized/model/telco.rb
@@ -0,0 +1,24 @@
+class TELCO < Oxidized::Model
+  # Telco Systems T-Marc 3306
+
+  prompt /^(\r?[\w.@_()-]+[#]\s?)$/
+  comment '! '
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[2..-2].join.delete("\n")
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg
+  end
+
+  cfg :ssh, :telnet do
+    post_login 'terminal length 0'
+    pre_logout 'exit'
+  end
+
+  cfg :telnet do
+    username /^Username:/
+    password /^Password:/
+  end
+end

From 9b3e27798342c92a214f2f7dfd1e278bb4fd45f2 Mon Sep 17 00:00:00 2001
From: Frederik Kriewitz <frederik@kriewitz.eu>
Date: Wed, 29 Jan 2020 14:49:53 +0100
Subject: [PATCH 6/9] GcomBNPS: allow any max length for username/password
 (#2022)

---
 CHANGELOG.md                   | 1 +
 lib/oxidized/model/gcombnps.rb | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 246a822b7..b2bd7997d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 * FEATURE: add Waystream iBOS model
 * BUGFIX: better login modalities for telnet in aos7 (@optimuscream)
 * BUGFIX: better virtual domain detection in fortios (@agabellini)
+* BUGFIX: allow any max length for username/password in GcomBNPS (@freddy36)
 * MISC: more secret scrubbing in sonicos (@s-fu)
 * MISC: openssh key scrubbing as secret in fortios (@agabellini)
 * MISC: scrubs macsec key from Arista EOS (@krisamundson)
diff --git a/lib/oxidized/model/gcombnps.rb b/lib/oxidized/model/gcombnps.rb
index 0510a8b67..535fb47c8 100644
--- a/lib/oxidized/model/gcombnps.rb
+++ b/lib/oxidized/model/gcombnps.rb
@@ -5,11 +5,11 @@ class GcomBNPS < Oxidized::Model
   # tested with:
   #  - S5330 (aka Fiberstore S3800)
 
-  prompt /^\r?([\w.@()-]+?(\(1-16 chars\))?[#>:]\s?)$/ # also match SSH password promt (post_login commands are sent after the first prompt)
+  prompt /^\r?([\w.@()-]+?(\(1-\d+ chars\))?[#>:]\s?)$/ # also match SSH password promt (post_login commands are sent after the first prompt)
   comment '! '
 
   # alternative to handle the SSH login, but this breaks telnet
-  #  expect /^Password\(1-16 chars\):/ do |data|
+  #  expect /^Password\(1-\d+ chars\):/ do |data|
   #      send @node.auth[:password] + "\n"
   #      ''
   #  end
@@ -66,8 +66,8 @@ class GcomBNPS < Oxidized::Model
   end
 
   cfg :telnet do
-    username /^Username\(1-32 chars\):/
-    password /^Password\(1-16 chars\):/
+    username /^Username\(1-\d+ chars\):/
+    password /^Password\(1-\d+ chars\):/
   end
 
   cfg :ssh do

From 590e58353e8f68318244fc5b813b3ed74bfc3f1b Mon Sep 17 00:00:00 2001
From: Frederik Kriewitz <frederik@kriewitz.eu>
Date: Wed, 29 Jan 2020 19:20:33 +0100
Subject: [PATCH 7/9] EdgeCOS: include transceiver details (#1891)

---
 CHANGELOG.md                  |  1 +
 lib/oxidized/model/edgecos.rb | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2bd7997d..0f05d7a60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Master
 
+* FEATURE: include transceiver information in EdgeCOS model (@freddy36)
 * FEATURE: add Telco Systems T-Marc 3306 support via telco model (@SkylerBlumer)
 * FEATURE: add enable support to ciscosmb (@deesel)
 * FEATURE: add Waystream iBOS model
diff --git a/lib/oxidized/model/edgecos.rb b/lib/oxidized/model/edgecos.rb
index 8c69d716a..e9ec128a9 100644
--- a/lib/oxidized/model/edgecos.rb
+++ b/lib/oxidized/model/edgecos.rb
@@ -27,6 +27,16 @@ class EdgeCOS < Oxidized::Model
     comment cfg
   end
 
+  cmd 'show interfaces transceiver' do |cfg|
+    cfg.gsub! /(\d\d)!/, '\\1 ' # alarm indicators of DDM thresholds
+    cfg.gsub! /^(\s*Temperature\s*:).*/, '\1 <hidden>'
+    cfg.gsub! /^(\s*Vcc\s*:).*/, '\1 <hidden>'
+    cfg.gsub! /^(\s*Bias Current\s*:).*/, '\1 <hidden>'
+    cfg.gsub! /^(\s*TX Power\s*:).*/, '\1 <hidden>'
+    cfg.gsub! /^(\s*RX Power\s*:).*/, '\1 <hidden>'
+    comment cfg
+  end
+
   cfg :telnet do
     username /^Username:/
     password /^Password:/

From 3091d34f81ec184450c1507a4339041fe859817c Mon Sep 17 00:00:00 2001
From: Frederik Kriewitz <frederik@kriewitz.eu>
Date: Thu, 30 Jan 2020 23:27:05 +0100
Subject: [PATCH 8/9] add Centec Networks CNOS support (#2023)

---
 CHANGELOG.md               |  1 +
 docs/Supported-OS-Types.md |  4 ++++
 lib/oxidized/model/cnos.rb | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 lib/oxidized/model/cnos.rb

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f05d7a60..d2f4396d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Master
 
+* FEATURE: add Centec Networks CNOS (Fiberstore S5800/S5850) support via cnos model (@freddy36)
 * FEATURE: include transceiver information in EdgeCOS model (@freddy36)
 * FEATURE: add Telco Systems T-Marc 3306 support via telco model (@SkylerBlumer)
 * FEATURE: add enable support to ciscosmb (@deesel)
diff --git a/docs/Supported-OS-Types.md b/docs/Supported-OS-Types.md
index 120f43358..09a9707a6 100644
--- a/docs/Supported-OS-Types.md
+++ b/docs/Supported-OS-Types.md
@@ -49,6 +49,8 @@
   * [Cambium (PMP450 Series)](/lib/oxidized/model/cambium.rb)
 * Casa
   * [Casa](/lib/oxidized/model/casa.rb)
+* Centec Networks
+  * [CNOS](/lib/oxidized/model/cnos.rb)
 * Check Point
   * [GaiaOS](/lib/oxidized/model/gaiaos.rb)
 * Ciena
@@ -106,6 +108,8 @@
 * Fiberstore
   * [S3800](/lib/oxidized/model/gcombnps.rb)
   * [S3900](/lib/oxidized/model/edgecos.rb)
+  * [S5800](/lib/oxidized/model/cnos.rb)
+  * [S5850](/lib/oxidized/model/cnos.rb)
 * Firebrick
   * [FBxxxx](/lib/oxidized/model/firebrick.rb)
 * Force10
diff --git a/lib/oxidized/model/cnos.rb b/lib/oxidized/model/cnos.rb
new file mode 100644
index 000000000..11375e64d
--- /dev/null
+++ b/lib/oxidized/model/cnos.rb
@@ -0,0 +1,33 @@
+# model for Centec Networks CNOS based switches
+class CNOS < Oxidized::Model
+  comment '! '
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[0..-2].join
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg.gsub!(/(snmp-server community )(\S+)/, '\1<hidden>')
+    cfg.gsub!(/key type private.+key string end/m, '<private key hidden>')
+    cfg
+  end
+
+  cmd 'show version' do |cfg|
+    cfg.gsub! /^(.* uptime is ).*\n/, '\1'
+    comment cfg
+  end
+
+  cmd 'show transceiver' do |cfg|
+    comment cfg
+  end
+
+  cfg :telnet do
+    username /^Username:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'terminal length 0'
+    pre_logout 'exit'
+  end
+end

From bbe864ce4fa97fcee8cf2af656c4b6e12983ff6e Mon Sep 17 00:00:00 2001
From: mmisslin <m.misslin@gmail.com>
Date: Sun, 2 Feb 2020 11:15:12 +0100
Subject: [PATCH 9/9] Add support for Dell OS10 (#2019)

---
 CHANGELOG.md               |  1 +
 docs/Supported-OS-Types.md |  1 +
 lib/oxidized/model/os10.rb | 46 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 lib/oxidized/model/os10.rb

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2f4396d5..607bbd252 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Master
 
+* FEATURE: add Dell EMC Networking OS10 support (@mmisslin)
 * FEATURE: add Centec Networks CNOS (Fiberstore S5800/S5850) support via cnos model (@freddy36)
 * FEATURE: include transceiver information in EdgeCOS model (@freddy36)
 * FEATURE: add Telco Systems T-Marc 3306 support via telco model (@SkylerBlumer)
diff --git a/docs/Supported-OS-Types.md b/docs/Supported-OS-Types.md
index 09a9707a6..2f6f87198 100644
--- a/docs/Supported-OS-Types.md
+++ b/docs/Supported-OS-Types.md
@@ -90,6 +90,7 @@
   * [PowerConnect](/lib/oxidized/model/powerconnect.rb)
   * [AOSW](/lib/oxidized/model/aosw.rb)
   * [DellX](/lib/oxidized/model/dellx.rb)
+  * [Dell EMC Networking OS10](/lib/oxidized/model/os10.rb)
 * D-Link
   * [D-Link](/lib/oxidized/model/dlink.rb)
 * ECI Telecom
diff --git a/lib/oxidized/model/os10.rb b/lib/oxidized/model/os10.rb
new file mode 100644
index 000000000..832deb303
--- /dev/null
+++ b/lib/oxidized/model/os10.rb
@@ -0,0 +1,46 @@
+class OS10 < Oxidized::Model
+  # For switches running Dell EMC Networking OS10 #
+  #
+  # Tested with : Dell PowerSwitch S4148U-ON
+
+  comment  '! '
+
+  cmd :all do |cfg|
+    cfg.gsub! /^% Invalid input detected at '\^' marker\.$|^\s+\^$/, ''
+    cfg.each_line.to_a[2..-2].join
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /(password )(\S+)/, '\1<secret hidden>'
+    cfg
+  end
+
+  cmd 'show inventory' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show inventory media' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show running-configuration' do |cfg|
+    cfg.each_line.to_a[3..-1].join
+  end
+
+  cfg :telnet do
+    username /^Login:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    if vars :enable
+      post_login do
+        send "enable\n"
+        cmd vars(:enable)
+      end
+    end
+    post_login 'terminal length 0'
+    pre_logout 'exit'
+    pre_logout 'exit'
+  end
+end