8 files changed, 116 insertions, 44 deletions
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')
diff --git a/lib/oxidized/model/aricentiss.rb b/lib/oxidized/model/aricentiss.rb
new file mode 100644
index 0000000..80735c7
--- /dev/null
+++ b/lib/oxidized/model/aricentiss.rb
@@ -0,0 +1,50 @@
+# 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+# ?$/)
+
+  cfg :ssh do
+    post_login 'no cli pagination'
+    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
diff --git a/lib/oxidized/model/edgecos.rb b/lib/oxidized/model/edgecos.rb
new file mode 100644
index 0000000..bc205f5
--- /dev/null
+++ b/lib/oxidized/model/edgecos.rb
@@ -0,0 +1,47 @@
+class EdgeCOS < Oxidized::Model
+  
+  comment  '! '
+
+  cmd :secret do |cfg|
+    cfg.gsub!(/password \d+ (\S+).*/, '<secret removed>')
+    cfg.gsub!(/community (\S+)/, 'community <hidden>')
+    cfg
+  end
+
+  cmd :all do |cfg|
+     cfg.each_line.to_a[2..-2].join
+  end
+
+  cmd 'show running-config'
+
+  cmd 'show access-list tcam-utilization' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show memory' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show system' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show watchdog' 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
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/junos.rb b/lib/oxidized/model/junos.rb
index 2f59414..2ea0179 100644
--- a/lib/oxidized/model/junos.rb
+++ b/lib/oxidized/model/junos.rb
@@ -13,7 +13,10 @@ 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!(/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
   end
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
 
diff --git a/lib/oxidized/model/supermicro.rb b/lib/oxidized/model/supermicro.rb
index 361244c..518ae41 100644
--- a/lib/oxidized/model/supermicro.rb
+++ b/lib/oxidized/model/supermicro.rb
@@ -1,45 +1,9 @@
-class Supermicro < Oxidized::Model
-  comment  '! '
+# Backward compatibility shim for deprecated model `supermicro`.
+# Migrate your source from `supermicro` to `edgecos`.
 
-  cmd :secret do |cfg|
-    cfg.gsub!(/password \d+ (\S+).*/, '<secret removed>')
-    cfg.gsub!(/community (\S+)/, 'community <hidden>')
-    cfg
-  end
+require_relative 'edgecos.rb'
 
-  cmd :all do |cfg|
-     cfg.each_line.to_a[2..-2].join
-  end
+Supermicro = EdgeCOS
 
-  cmd 'show running-config'
+Oxidized.logger.warn "Using deprecated model supermicro, use edgecos instead."
 
-  cmd 'show access-list tcam-utilization' do |cfg|
-    comment cfg
-  end
-
-  cmd 'show memory' do |cfg|
-    comment cfg
-  end
-
-  cmd 'show system' do |cfg|
-    comment cfg
-  end
-
-  cmd 'show version' do |cfg|
-    comment cfg
-  end
-
-  cmd 'show watchdog' 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
-\ No newline at end of file
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