From 7c42c2891e7da0432c805e95678934e5a63770cd Mon Sep 17 00:00:00 2001
From: Alexander Schaber <alexander@schaber.info>
Date: Tue, 7 Feb 2017 13:45:32 +0100
Subject: add support for netgear switch

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/netgear.rb b/lib/oxidized/model/netgear.rb
new file mode 100644
index 0000000..47e00b1
--- /dev/null
+++ b/lib/oxidized/model/netgear.rb
@@ -0,0 +1,37 @@
+class Netgear < Oxidized::Model
+
+  comment '!'
+  prompt /^(\([\w-]+\)\s[#>])$/
+
+  expect /^--More-- or \(q\)uit/ do |data, re|
+    send ' '
+    data.sub re, ''
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub!(/password (\S+)/, 'password <hidden>')
+    cfg
+  end
+
+  cfg :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 /^.+[#]$/
+      end
+    end
+    pre_logout 'exit'
+    pre_logout 'quit'
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg.gsub! /^(!.*Time).*$/, '\1'
+  end
+
+end
+
-- 
cgit v1.2.1


From da074381e4b998270e0886152446de7945ba120e Mon Sep 17 00:00:00 2001
From: Robert Drake <rfdrake@users.noreply.github.com>
Date: Thu, 23 Mar 2017 22:49:23 -0400
Subject: Adding support for more "show version" commands

This is a port of some of the rancid "show version" parsing.  I tried to
simplify it from the way rancid does it, so it doesn't attempt to guess
the device type, but it does provide IOS version and the type of
processor.
---
 lib/oxidized/model/ios.rb | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/ios.rb b/lib/oxidized/model/ios.rb
index 94a3ab0..d155aa6 100644
--- a/lib/oxidized/model/ios.rb
+++ b/lib/oxidized/model/ios.rb
@@ -19,6 +19,8 @@ class IOS < Oxidized::Model
   cmd :all do |cfg|
     #cfg.gsub! /\cH+\s{8}/, ''         # example how to handle pager
     #cfg.gsub! /\cH+/, ''              # example how to handle pager
+    # get rid of errors for commands that don't work on some devices
+    cfg.gsub! /^ % Invalid input detected at '\^' marker\./, ''
     cfg.each_line.to_a[1..-2].join
   end
 
@@ -36,7 +38,42 @@ class IOS < Oxidized::Model
   end
 
   cmd 'show version' do |cfg|
-    comment cfg.lines.first
+    comments = []
+    comments << cfg.lines.first
+    lines = cfg.lines
+    lines.each_with_index do |line,i|
+        slave = ''
+        slaveslot = ''
+
+        if line.match /^Slave in slot (\d+) is running/
+            slave = " Slave:";
+            slaveslot = ", slot #{$1}";
+        end
+
+        if line.match /(\S+(?:\sseries)?)\s+(?:\((\S+)\)\s+processor|\(revision[^)]+\)).*\s+with (\S+k) bytes/i
+            sproc = $1
+            cpu = $2
+            mem = $3
+            cpuxtra = ''
+            comments << "Chassis type:#{slave} #{sproc}";
+            comments << "Memory:#{slave} main #{mem}";
+            # check the next two lines for more CPU info
+            if cfg.lines[i+1].match /processor board id (\S+)/i
+		comments << "Processor ID: #{$1}";
+            end
+            if cfg.lines[i+2].match /(cpu at |processor: |#{cpu} processor,)/i
+               # change implementation to impl and prepend comma
+               cpuxtra = cfg.lines[i+2].gsub(/implementation/,'impl').gsub(/^/,', ').chomp;
+            end
+            comments << "CPU:#{slave} #{cpu}#{cpuxtra}#{slaveslot}";
+        end
+
+        if line.match /^System image file is "([^\"]*)"$/
+            comments << "Image: #{$1}"
+        end
+    end
+    comments << "\n"
+    comment comments.join "\n"
   end
 
   cmd 'show inventory' do |cfg|
-- 
cgit v1.2.1


From f63cb61550cd2401c32a42d36cf07f5243c788c1 Mon Sep 17 00:00:00 2001
From: nesteffe <nate.steffen@gmail.com>
Date: Tue, 28 Mar 2017 11:07:53 -0500
Subject: Remove single line 'Up Time' lines from show system

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/powerconnect.rb b/lib/oxidized/model/powerconnect.rb
index ac36c26..618f05a 100644
--- a/lib/oxidized/model/powerconnect.rb
+++ b/lib/oxidized/model/powerconnect.rb
@@ -67,6 +67,7 @@ class PowerConnect < Oxidized::Model
       end
       out << line.strip
     end
+    out = out.select { |line| not line[/Up\sTime/] }
     out = comment out.join "\n"
     out << "\n"
   end
-- 
cgit v1.2.1


From 0a6cbe3d10dd6d78cf8ec93ad66ebd69e0780946 Mon Sep 17 00:00:00 2001
From: Robert Drake <rfdrake@users.noreply.github.com>
Date: Fri, 24 Mar 2017 16:46:21 -0400
Subject: added support for VTP

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/ios.rb b/lib/oxidized/model/ios.rb
index d155aa6..a522257 100644
--- a/lib/oxidized/model/ios.rb
+++ b/lib/oxidized/model/ios.rb
@@ -76,6 +76,12 @@ class IOS < Oxidized::Model
     comment comments.join "\n"
   end
 
+  cmd 'show vtp status' do |cfg|
+    cfg.gsub! /^$\n/, ''
+    cfg.gsub! /^/, 'VTP: ' if (!cfg.empty?)
+    comment "#{cfg}\n"
+  end
+
   cmd 'show inventory' do |cfg|
     comment cfg
   end
-- 
cgit v1.2.1


From 49b4087297a528cfd5e5f1a0c88fccab7695ad8e Mon Sep 17 00:00:00 2001
From: Robert Drake <rfdrake@users.noreply.github.com>
Date: Fri, 24 Mar 2017 21:59:19 -0400
Subject: whitespace cleanup / fixing invalid command

---
 lib/oxidized/model/ios.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/ios.rb b/lib/oxidized/model/ios.rb
index a522257..afd419e 100644
--- a/lib/oxidized/model/ios.rb
+++ b/lib/oxidized/model/ios.rb
@@ -20,7 +20,7 @@ class IOS < Oxidized::Model
     #cfg.gsub! /\cH+\s{8}/, ''         # example how to handle pager
     #cfg.gsub! /\cH+/, ''              # example how to handle pager
     # get rid of errors for commands that don't work on some devices
-    cfg.gsub! /^ % Invalid input detected at '\^' marker\./, ''
+    cfg.gsub! /^% Invalid input detected at '\^' marker\.$|^\s+\^$/, ''
     cfg.each_line.to_a[1..-2].join
   end
 
@@ -59,11 +59,11 @@ class IOS < Oxidized::Model
             comments << "Memory:#{slave} main #{mem}";
             # check the next two lines for more CPU info
             if cfg.lines[i+1].match /processor board id (\S+)/i
-		comments << "Processor ID: #{$1}";
+                comments << "Processor ID: #{$1}";
             end
             if cfg.lines[i+2].match /(cpu at |processor: |#{cpu} processor,)/i
-               # change implementation to impl and prepend comma
-               cpuxtra = cfg.lines[i+2].gsub(/implementation/,'impl').gsub(/^/,', ').chomp;
+                # change implementation to impl and prepend comma
+                cpuxtra = cfg.lines[i+2].gsub(/implementation/,'impl').gsub(/^/,', ').chomp;
             end
             comments << "CPU:#{slave} #{cpu}#{cpuxtra}#{slaveslot}";
         end
-- 
cgit v1.2.1


From ce3461f0801cdb6829637646eecd4c87e2d9a9a8 Mon Sep 17 00:00:00 2001
From: Robert Drake <rfdrake@users.noreply.github.com>
Date: Fri, 24 Mar 2017 22:00:08 -0400
Subject: more "show version" additions

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/ios.rb b/lib/oxidized/model/ios.rb
index afd419e..0596f90 100644
--- a/lib/oxidized/model/ios.rb
+++ b/lib/oxidized/model/ios.rb
@@ -50,6 +50,34 @@ class IOS < Oxidized::Model
             slaveslot = ", slot #{$1}";
         end
 
+        if line.match /^Compiled (.*)$/
+            comments << "Image:#{slave} Compiled: #{$1}"
+        end
+
+        if line.match /^(?:Cisco )?IOS .* Software,? \(([A-Za-z0-9_-]*)\), .*Version\s+(.*)$/
+            comments << "Image:#{slave} Software: #{$1}, #{$2}"
+        end
+
+        if line.match /^ROM: (IOS \S+ )?(System )?Bootstrap.*(Version.*)$/
+            comments << "ROM Bootstrap: #{$3}"
+        end
+
+        if line.match /^BOOTFLASH: .*(Version.*)$/
+            comments << "BOOTFLASH: #{$1}"
+        end
+
+        if line.match /^(\d+[kK]) bytes of (non-volatile|NVRAM)/
+            comments << "Memory: nvram #{$1}"
+        end
+
+        if line.match /^(\d+[kK]) bytes of (flash memory|flash internal|processor board System flash|ATA CompactFlash)/i
+            comments << "Memory: flash #{$1}"
+        end
+
+        if line.match (/^(\d+[kK]) bytes of (Flash|ATA)?.*PCMCIA .*(slot|disk) ?(\d)/i)
+            comments << "Memory: pcmcia #{$2} #{$3}#{$4} #{$1}";
+        end
+
         if line.match /(\S+(?:\sseries)?)\s+(?:\((\S+)\)\s+processor|\(revision[^)]+\)).*\s+with (\S+k) bytes/i
             sproc = $1
             cpu = $2
-- 
cgit v1.2.1


From e3f1cc86a6240f848eb3fa24e0dba151b42c88be Mon Sep 17 00:00:00 2001
From: Sten Spans <sten@blinkenlights.nl>
Date: Wed, 5 Apr 2017 09:53:07 +0200
Subject: Update slackdiff.rb

Add proxy option to slackdiff hook
---
 lib/oxidized/hook/slackdiff.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/hook/slackdiff.rb b/lib/oxidized/hook/slackdiff.rb
index b37c9c4..61f1743 100644
--- a/lib/oxidized/hook/slackdiff.rb
+++ b/lib/oxidized/hook/slackdiff.rb
@@ -10,7 +10,11 @@ class SlackDiff < Oxidized::Hook
     if ctx.node
       if ctx.event.to_s == "post_store"
         log "Connecting to slack"
-        client = Slack::Client.new token: cfg.token
+        Slack.configure do |config|
+           config.token = cfg.token
+           config.proxy = cfg.proxy if cfg.has_key?('proxy')
+        end
+        client = Slack::Client.new
         client.auth_test
         log "Connected"
         gitoutput = ctx.node.output.new
-- 
cgit v1.2.1


From 5c5a7244ed085235bddee0e34251dcc4537fd680 Mon Sep 17 00:00:00 2001
From: "David R. Bild" <david.bild@xaptum.com>
Date: Thu, 6 Apr 2017 18:23:32 -0500
Subject: Fixed IOS model to redact only secrets

The secrets configuration for IOS would the full contents of any line
containing a secret. Instead, just redact the secret, keeping the rest
of line instact for

"enable secret 5 SeCre7" was replaced by "<secret hidden>". Now it is
now replaced by "enable secret 5 <secret hidden>".
---
 lib/oxidized/model/ios.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/ios.rb b/lib/oxidized/model/ios.rb
index 0596f90..9fda128 100644
--- a/lib/oxidized/model/ios.rb
+++ b/lib/oxidized/model/ios.rb
@@ -26,14 +26,14 @@ class IOS < Oxidized::Model
 
   cmd :secret do |cfg|
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
-    cfg.gsub! /username (\S+) privilege (\d+) (\S+).*/, '<secret hidden>'
-    cfg.gsub! /^username \S+ password \d \S+/, '<secret hidden>'
-    cfg.gsub! /^username \S+ secret \d \S+/, '<secret hidden>'
-    cfg.gsub! /^enable (password|secret) \d \S+/, '<secret hidden>'
+    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! /wpa-psk ascii \d \S+/, '<secret hidden>'
-    cfg.gsub! /key 7 \d.+/, '<secret hidden>'
-    cfg.gsub! /^tacacs-server key \d \S+/, '<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 \d) (\S+)/, '\\1 <secret hidden>'
     cfg
   end
 
-- 
cgit v1.2.1


From a07b05d8685ba07380121e23757bb3631fffbe2a Mon Sep 17 00:00:00 2001
From: "David R. Bild" <david.bild@xaptum.com>
Date: Thu, 6 Apr 2017 18:27:45 -0500
Subject: Added IPSEC keys to IOS secrets config

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/ios.rb b/lib/oxidized/model/ios.rb
index 9fda128..c3d5543 100644
--- a/lib/oxidized/model/ios.rb
+++ b/lib/oxidized/model/ios.rb
@@ -34,6 +34,7 @@ class IOS < Oxidized::Model
     cfg.gsub! /^(.*wpa-psk ascii \d) (\S+)/, '\\1 <secret hidden>'
     cfg.gsub! /^(.*key 7) (\d.+)/, '\\1 <secret hidden>'
     cfg.gsub! /^(tacacs-server key \d) (\S+)/, '\\1 <secret hidden>'
+    cfg.gsub! /^(crypto isakmp key) (\S+) (.*)/, '\\1 <secret hidden> \\3'
     cfg
   end
 
-- 
cgit v1.2.1


From 8805ae7570b3a7ee01c2839e3fb2b38a59162e5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benedikt=20Heum=C3=BCller?= <bheum@users.noreply.github.com>
Date: Mon, 10 Apr 2017 11:25:55 +0200
Subject: Added secret and key statements to secret removal

Values changed for every show command and versioning was not possible.
---
 lib/oxidized/model/fortios.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/fortios.rb b/lib/oxidized/model/fortios.rb
index 2415537..cdaa282 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)).*/, '\\1 <configuration removed>'
+    cfg.gsub! /(set (?:passwd|password|psksecret|secret|key ENC)).*/, '\\1 <configuration removed>'
     cfg.gsub! /(set private-key).*-+END ENCRYPTED PRIVATE KEY-*"$/m , '\\1 <configuration removed>'
     cfg
   end
-- 
cgit v1.2.1


From 58fd5a6ffb386dde320b288f2c428305d5f59986 Mon Sep 17 00:00:00 2001
From: Clement Parisot <clement.parisot@uni.lu>
Date: Mon, 3 Apr 2017 09:30:55 +0200
Subject: Added Mellanox voltaire switch to the list of supported devices

Signed-off-by: Clement Parisot <clement.parisot@uni.lu>
---
 lib/oxidized/model/voltaire.rb | 56 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 lib/oxidized/model/voltaire.rb

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/voltaire.rb b/lib/oxidized/model/voltaire.rb
new file mode 100644
index 0000000..1e7fad2
--- /dev/null
+++ b/lib/oxidized/model/voltaire.rb
@@ -0,0 +1,56 @@
+class VOLTAIRE < Oxidized::Model
+
+  prompt /([\w.@()-\[:\s\]]+[#>]\s|(One or more tests have failed.*))$/
+  comment  '## '
+  
+  # Pager Handling
+  expect /.+lines\s\d+\-\d+([\s]|\/\d+\s\(END\)\s).+$/ do |data, re|
+    send ' '
+    data.sub re, ''
+  end
+
+
+  cmd :all do |cfg|
+    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 = cfg.lines.to_a[2..-3].join
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /(snmp-server community).*/, '   <snmp-server community configuration removed>'
+    cfg.gsub! /username (\S+) password (\d+) (\S+).*/, '<secret hidden>'
+    cfg
+  end
+
+
+  cmd 'version show' do |cfg|
+    comment cfg
+  end
+
+  cmd 'firmware-version show' do |cfg|
+    comment cfg
+  end
+
+  cmd 'remote show' do |cfg|
+    cfg
+  end
+
+  cmd 'sm-info show' do |cfg|
+    cfg
+  end
+
+  cmd ' show' do |cfg|
+    cfg
+  end
+
+  cfg :ssh do
+    post_login "no\n"
+    password /^Password:\s*/
+    pre_logout 'exit'
+  end
+end
-- 
cgit v1.2.1


From f4d65e911cc4ecb4471b7e91f88285bcc1078c42 Mon Sep 17 00:00:00 2001
From: Clement Parisot <clement.parisot@uni.lu>
Date: Mon, 3 Apr 2017 10:13:38 +0200
Subject: model - mlnxos : patch exit command

Signed-off-by: Clement Parisot <clement.parisot@uni.lu>
---
 lib/oxidized/model/mlnxos.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/mlnxos.rb b/lib/oxidized/model/mlnxos.rb
index 97e7098..49f3369 100644
--- a/lib/oxidized/model/mlnxos.rb
+++ b/lib/oxidized/model/mlnxos.rb
@@ -42,6 +42,6 @@ class MLNXOS < Oxidized::Model
 
   cfg :ssh do
     password /^Password:\s*/
-    pre_logout 'exit'
+    pre_logout "\nexit"
   end
 end
-- 
cgit v1.2.1


From b0ad6abc0ae43c2af414aadd3e4fac4fe325dd0a Mon Sep 17 00:00:00 2001
From: Clement Parisot <clement.parisot@uni.lu>
Date: Wed, 12 Apr 2017 14:02:28 +0200
Subject: Add new output GitCrypt

Signed-off-by: Clement Parisot <clement.parisot@uni.lu>
---
 lib/oxidized/node.rb            |  36 ++++--
 lib/oxidized/output/gitcrypt.rb | 244 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 271 insertions(+), 9 deletions(-)
 create mode 100644 lib/oxidized/output/gitcrypt.rb

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/node.rb b/lib/oxidized/node.rb
index 6f89b56..cf71e48 100644
--- a/lib/oxidized/node.rb
+++ b/lib/oxidized/node.rb
@@ -166,18 +166,32 @@ module Oxidized
     end
 
     def resolve_repo opt
-      return unless is_git? opt
-
-      remote_repo = Oxidized.config.output.git.repo
-
-      if remote_repo.is_a?(::String)
-        if Oxidized.config.output.git.single_repo? || @group.nil?
-          remote_repo
+      if is_git? opt
+        remote_repo = Oxidized.config.output.git.repo
+
+        if remote_repo.is_a?(::String)
+          if Oxidized.config.output.git.single_repo? || @group.nil?
+            remote_repo
+          else
+            File.join(File.dirname(remote_repo), @group + '.git')
+          end
+        else
+          remote_repo[@group]
+        end
+      elsif is_gitcrypt? opt
+        remote_repo = Oxidized.config.output.gitcrypt.repo
+
+        if remote_repo.is_a?(::String)
+          if Oxidized.config.output.gitcrypt.single_repo? || @group.nil?
+            remote_repo
+          else
+            File.join(File.dirname(remote_repo), @group + '.git')
+          end
         else
-          File.join(File.dirname(remote_repo), @group + '.git')
+          remote_repo[@group]
         end
       else
-        remote_repo[@group]
+        return
       end
     end
 
@@ -212,5 +226,9 @@ module Oxidized
       (opt[:output] || Oxidized.config.output.default) == 'git'
     end
 
+    def is_gitcrypt? opt
+      (opt[:output] || Oxidized.config.output.default) == 'gitcrypt'
+    end
+
   end
 end
diff --git a/lib/oxidized/output/gitcrypt.rb b/lib/oxidized/output/gitcrypt.rb
new file mode 100644
index 0000000..b0d80f2
--- /dev/null
+++ b/lib/oxidized/output/gitcrypt.rb
@@ -0,0 +1,244 @@
+module Oxidized
+	class GitCrypt < Output
+		class GitCryptError < OxidizedError; end
+		begin
+			require 'git'
+		rescue LoadError
+			raise OxidizedError, 'git not found: sudo gem install ruby-git'
+		end
+
+		attr_reader :commitref
+
+		def initialize
+			@cfg = Oxidized.config.output.gitcrypt
+			@gitcrypt_cmd = "/usr/bin/git-crypt"
+			@gitcrypt_init = @gitcrypt_cmd + " init"
+			@gitcrypt_unlock = @gitcrypt_cmd + " unlock"
+			@gitcrypt_lock = @gitcrypt_cmd + " lock"
+			@gitcrypt_adduser = @gitcrypt_cmd + " add-gpg-user --trusted "
+		end
+
+		def setup
+			if @cfg.empty?
+				Oxidized.asetus.user.output.gitcrypt.user  = 'Oxidized'
+				Oxidized.asetus.user.output.gitcrypt.email = 'o@example.com'
+				Oxidized.asetus.user.output.gitcrypt.repo  =  File.join(Config::Root, 'oxidized.git')
+				Oxidized.asetus.save :user
+				raise NoConfig, 'no output git config, edit ~/.config/oxidized/config'
+			end
+
+			if @cfg.repo.respond_to?(:each)
+				@cfg.repo.each do |group, repo|
+					@cfg.repo["#{group}="] = File.expand_path repo
+				end
+			else
+				@cfg.repo = File.expand_path @cfg.repo
+			end
+		end
+
+		def crypt_init repo
+			repo.chdir do
+				system(@gitcrypt_init)
+				@cfg.users.each do |user|
+					system("#{@gitcrypt_adduser} #{user}")
+				end
+				File.write(".gitattributes", "* filter=git-crypt diff=git-crypt\n.gitattributes !filter !diff")
+				repo.add(".gitattributes")
+				repo.commit("Initial commit: crypt all config files")
+			end
+		end
+
+		def lock repo
+			repo.chdir do
+				system(@gitcrypt_lock)
+			end
+		end
+
+		def unlock repo
+			repo.chdir do
+				system(@gitcrypt_unlock)
+			end
+		end
+
+		def store file, outputs, opt={}
+			@msg   = opt[:msg]
+			@user  = (opt[:user]  or @cfg.user)
+			@email = (opt[:email] or @cfg.email)
+			@opt   = opt
+			@commitref = nil
+			repo   = @cfg.repo
+
+			outputs.types.each do |type|
+				type_cfg = ''
+				type_repo = File.join(File.dirname(repo), type + '.git')
+				outputs.type(type).each do |output|
+					(type_cfg << output; next) if not output.name
+					type_file = file + '--' + output.name
+					if @cfg.type_as_directory?
+						type_file = type + '/' + type_file
+						type_repo = repo
+					end
+					update type_repo, type_file, output
+				end
+				update type_repo, file, type_cfg
+			end
+
+			update repo, file, outputs.to_cfg
+		end
+
+
+		def fetch node, group
+			begin
+				repo, path = yield_repo_and_path(node, group)
+				repo = Git.open repo
+				unlock repo
+				index = repo.index
+				# Empty repo ?
+				empty = File.exists? index.path
+				if empty
+					raise 'Empty git repo'
+				else
+					File.read path
+				end
+				lock repo
+			rescue
+				'node not found'
+			end
+		end
+
+		# give a hash of all oid revision for the given node, and the date of the commit
+		def version node, group
+			begin
+				repo, path = yield_repo_and_path(node, group)
+
+				repo = Git.open repo
+				unlock repo
+				walker = repo.log.path(path)
+				i = -1
+				tab  = []
+				walker.each do |commit|
+					hash = {}
+					hash[:date] = commit.date.to_s
+					hash[:oid] = commit.objectish
+					hash[:author] = commit.author
+					hash[:message] = commit.message
+					tab[i += 1] = hash
+				end
+				walker.reset
+				tab
+			rescue
+				'node not found'
+			end
+		end
+
+		#give the blob of a specific revision
+		def get_version node, group, oid
+			begin
+				repo, path = yield_repo_and_path(node, group)
+				repo = Git.open repo
+				unlock repo
+				repo.gtree(oid).files[path].contents
+			rescue
+				'version not found'
+			ensure
+				lock repo
+			end
+		end
+
+		#give a hash with the patch of a diff between 2 revision and the stats (added and deleted lines)
+		def get_diff node, group, oid1, oid2
+			begin
+				diff_commits = nil
+				repo, path = yield_repo_and_path(node, group)
+				repo = Git.open repo
+				unlock repo
+				commit = repo.gcommit(oid1)
+
+				if oid2
+					commit_old = repo.gcommit(oid2)
+					diff = repo.diff(commit_old, commit)
+					stats = [diff.stats[:files][node.name][:insertions], diff.stats[:files][node.name][:deletions]]
+					diff.each do |patch|
+						if /#{node.name}\s+/.match(patch.patch.to_s.lines.first)
+							diff_commits = {:patch => patch.patch.to_s, :stat => stats}
+							break
+						end
+					end
+				else
+					stat = commit.parents[0].diff(commit).stats
+					stat = [stat[:files][node.name][:insertions],stat[:files][node.name][:deletions]]
+					patch = commit.parents[0].diff(commit).patch
+					diff_commits = {:patch => patch, :stat => stat}
+				end
+				lock repo
+				diff_commits
+			rescue
+				'no diffs'
+			ensure
+				lock repo
+			end
+		end
+
+		private
+
+		def yield_repo_and_path(node, group)
+			repo, path = node.repo, node.name
+
+			if group and @cfg.single_repo?
+				path = "#{group}/#{node.name}"
+			end
+
+			[repo, path]
+		end
+
+		def update repo, file, data
+			return if data.empty?
+
+			if @opt[:group]
+				if @cfg.single_repo?
+					file = File.join @opt[:group], file
+				else
+					repo = if repo.is_a?(::String)
+						File.join File.dirname(repo), @opt[:group] + '.git'
+					else
+						repo[@opt[:group]]
+					end
+				end
+			end
+
+			begin
+				update_repo repo, file, data, @msg, @user, @email
+			rescue Git::GitExecuteError, ArgumentError => open_error
+				Oxidized.logger.debug "open_error #{open_error} #{file}"
+				begin
+					grepo = Git.init repo
+					crypt_init grepo
+				rescue => create_error
+					raise GitCryptError, "first '#{open_error.message}' was raised while opening git repo, then '#{create_error.message}' was while trying to create git repo"
+				end
+				retry
+			end
+		end
+
+		def update_repo repo, file, data, msg, user, email
+			grepo = Git.open repo
+			grepo.config('user.name', user)
+			grepo.config('user.email', email)
+			grepo.chdir do
+				unlock grepo
+				File.write(file, data)
+				grepo.add(file)
+				if grepo.status[file].nil?
+					grepo.commit(msg)
+					@commitref = grepo.log(1).first.objectish
+					true
+				elsif !grepo.status[file].type.nil?
+					grepo.commit(msg)
+					@commitref = grepo.log(1).first.objectish
+					true
+				end
+				lock grepo
+			end
+		end
+	end
+end
-- 
cgit v1.2.1


From 90ef044a5dea849de8da879f607b47ef47a12421 Mon Sep 17 00:00:00 2001
From: Mike Nowak <mikenowak@users.noreply.github.com>
Date: Sat, 15 Apr 2017 11:42:58 +0900
Subject: Update prompt to include that of the status user

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

(limited to 'lib/oxidized')

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


From 76e01672790843de33df67dd76686c00460377d8 Mon Sep 17 00:00:00 2001
From: Mike Nowak <mikenowak@users.noreply.github.com>
Date: Sat, 15 Apr 2017 18:46:09 +0900
Subject: Support for Watchguard Logon Disclaimer

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/firewareos.rb b/lib/oxidized/model/firewareos.rb
index f2bef4c..3b24f89 100644
--- a/lib/oxidized/model/firewareos.rb
+++ b/lib/oxidized/model/firewareos.rb
@@ -7,6 +7,12 @@ class FirewareOS < Oxidized::Model
     cfg.each_line.to_a[1..-2].join
   end
 
+  # Handle Logon Disclaimer added in XTM 11.9.3
+  expect /^I have read and accept the Logon Disclaimer message. \(yes or no\)\? $/ do |data, re|
+    send "yes\n"
+    data.sub re, ''
+  end
+
   cmd 'show sysinfo' do |cfg|
     # avoid commits due to uptime
     cfg = cfg.each_line.select { |line| not line.match /(.*time.*)|(.*memory.*)|(.*cpu.*)/ }
-- 
cgit v1.2.1


From 2d3033c81349e4a061e3b2cde63c035526e516e8 Mon Sep 17 00:00:00 2001
From: Mike Nowak <mikenowak@users.noreply.github.com>
Date: Mon, 17 Apr 2017 21:11:38 +0900
Subject: Updated watchguard prompt

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

(limited to 'lib/oxidized')

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


From 278f92c7dc1edfe1e64a2791d36bc36960c9c936 Mon Sep 17 00:00:00 2001
From: Robert Drake <rfdrake@users.noreply.github.com>
Date: Thu, 20 Apr 2017 21:15:25 -0400
Subject: added firmware version to airos

---
 lib/oxidized/model/airos.rb | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/airos.rb b/lib/oxidized/model/airos.rb
index 775005f..7d82956 100644
--- a/lib/oxidized/model/airos.rb
+++ b/lib/oxidized/model/airos.rb
@@ -1,14 +1,19 @@
 class Airos < Oxidized::Model
   # Ubiquiti AirOS circa 5.x
-  
+
   prompt /^[^#]+# /
-  
+  comment '# '
+
   cmd 'cat /etc/board.info' do |cfg|
     cfg.split("\n").map { |line| "# #{line}" }.join("\n") + "\n"
   end
-  
+
+  cmd 'cat /etc/version' do |cfg|
+    comment "airos version: #{cfg}"
+  end
+
   cmd 'sort /tmp/system.cfg'
-  
+
   cmd :secret do |cfg|
     cfg.gsub! /^(users\.\d+\.password|snmp\.community)=.+/, "# \\1=<hidden>"
     cfg
-- 
cgit v1.2.1


From 3d66709add6e21b2ee111af1ae11c865ff570d66 Mon Sep 17 00:00:00 2001
From: bdg-robert <bdg-robert@users.noreply.github.com>
Date: Fri, 21 Apr 2017 16:27:14 -0500
Subject: Create siklu.rb

Adds support for Siklu EtherHaul radios
---
 lib/oxidized/model/siklu.rb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 lib/oxidized/model/siklu.rb

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/siklu.rb b/lib/oxidized/model/siklu.rb
new file mode 100644
index 0000000..322eb4d
--- /dev/null
+++ b/lib/oxidized/model/siklu.rb
@@ -0,0 +1,19 @@
+class Siklu < Oxidized::Model
+
+  # Siklu EtherHaul #
+
+  comment '# '
+
+  prompt /^[\w-]+>$/
+
+  cmd 'copy running-configuration display'
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  cfg :ssh do
+    pre_logout 'exit'
+  end
+
+end
-- 
cgit v1.2.1


From 38ea1fa1c678e40072551a487c0112798107fe68 Mon Sep 17 00:00:00 2001
From: bdg-robert <bdg-robert@users.noreply.github.com>
Date: Fri, 21 Apr 2017 18:49:09 -0500
Subject: Update to include version

The output from startup-configuration includes the version information, so we'll prepend the running config output with it.
---
 lib/oxidized/model/siklu.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/siklu.rb b/lib/oxidized/model/siklu.rb
index 322eb4d..2b0c95a 100644
--- a/lib/oxidized/model/siklu.rb
+++ b/lib/oxidized/model/siklu.rb
@@ -6,10 +6,12 @@ class Siklu < Oxidized::Model
 
   prompt /^[\w-]+>$/
 
-  cmd 'copy running-configuration display'
+  cmd 'copy startup-configuration display' do |cfg|
+    cfg.each_line.to_a[2..2].join
+  end
 
-  cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+  cmd 'copy running-configuration display' do |cfg|
+    cfg.each_line.to_a[3..-2].join
   end
 
   cfg :ssh do
-- 
cgit v1.2.1


From 712a314503c24c8059c0125d20d164987d7a4088 Mon Sep 17 00:00:00 2001
From: bdg-robert <bdg-robert@users.noreply.github.com>
Date: Fri, 21 Apr 2017 18:56:02 -0500
Subject: Update siklu.rb

---
 lib/oxidized/model/siklu.rb | 2 --
 1 file changed, 2 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/siklu.rb b/lib/oxidized/model/siklu.rb
index 2b0c95a..2bdfbc3 100644
--- a/lib/oxidized/model/siklu.rb
+++ b/lib/oxidized/model/siklu.rb
@@ -2,8 +2,6 @@ class Siklu < Oxidized::Model
 
   # Siklu EtherHaul #
 
-  comment '# '
-
   prompt /^[\w-]+>$/
 
   cmd 'copy startup-configuration display' do |cfg|
-- 
cgit v1.2.1


From 1f2a11069f93a2997dac387e90010eacc20e2375 Mon Sep 17 00:00:00 2001
From: Alexander Schaber <alexander@schaber.info>
Date: Thu, 27 Apr 2017 09:18:00 +0200
Subject: include solution for paging on netgear

---
 lib/oxidized/model/netgear.rb | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/netgear.rb b/lib/oxidized/model/netgear.rb
index 47e00b1..08c64d3 100644
--- a/lib/oxidized/model/netgear.rb
+++ b/lib/oxidized/model/netgear.rb
@@ -3,28 +3,24 @@ class Netgear < Oxidized::Model
   comment '!'
   prompt /^(\([\w-]+\)\s[#>])$/
 
-  expect /^--More-- or \(q\)uit/ do |data, re|
-    send ' '
-    data.sub re, ''
-  end
-
   cmd :secret do |cfg|
     cfg.gsub!(/password (\S+)/, 'password <hidden>')
     cfg
   end
 
-  cfg :ssh do
+  cfg :telnet, :ssh do
     if vars :enable
       post_login do
-        send "enable\n"
+        cmd 'enable'
         # 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"
+          cmd vars(:enable) + "\n"
         end
         expect /^.+[#]$/
       end
     end
+    post_login 'terminal length 0'
     pre_logout 'exit'
     pre_logout 'quit'
   end
@@ -34,4 +30,3 @@ class Netgear < Oxidized::Model
   end
 
 end
-
-- 
cgit v1.2.1


From f0683725079035633f7b2e64c99af7e2ce2ad3e5 Mon Sep 17 00:00:00 2001
From: Cyril LAVIER <cyril.lavier@davromaniak.eu>
Date: Wed, 3 May 2017 14:05:28 +0200
Subject: Added support for model specific credentials

---
 lib/oxidized/config.rb      | 1 +
 lib/oxidized/config/vars.rb | 6 +++++-
 lib/oxidized/node.rb        | 8 ++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/config.rb b/lib/oxidized/config.rb
index aba8b63..23af9c2 100644
--- a/lib/oxidized/config.rb
+++ b/lib/oxidized/config.rb
@@ -31,6 +31,7 @@ module Oxidized
       asetus.default.next_adds_job = false            # if true, /next adds job, so device is fetched immmeiately
       asetus.default.vars          = {}               # could be 'enable'=>'enablePW'
       asetus.default.groups        = {}               # group level configuration
+      asetus.default.models        = {}               # model level configuration
       asetus.default.pid           = File.join(Oxidized::Config::Root, 'pid')
 
       asetus.default.input.default    = 'ssh, telnet'
diff --git a/lib/oxidized/config/vars.rb b/lib/oxidized/config/vars.rb
index 09f9781..d926ee2 100644
--- a/lib/oxidized/config/vars.rb
+++ b/lib/oxidized/config/vars.rb
@@ -8,8 +8,12 @@ module Oxidized::Config::Vars
         r ||= Oxidized.config.groups[@node.group].vars[name.to_s]
       end
     end
+    if Oxidized.config.models.has_key?(@node.model.class.name.to_s.downcase)
+      if Oxidized.config.models[@node.model.class.name.to_s.downcase].vars.has_key?(name.to_s)
+        r ||= Oxidized.config.models[@node.model.class.name.to_s.downcase].vars[name.to_s]
+      end
+    end
     r ||= Oxidized.config.vars[name.to_s] if Oxidized.config.vars.has_key?(name.to_s)
     r
   end
 end
-
diff --git a/lib/oxidized/node.rb b/lib/oxidized/node.rb
index cf71e48..8d0d0af 100644
--- a/lib/oxidized/node.rb
+++ b/lib/oxidized/node.rb
@@ -216,6 +216,14 @@ module Oxidized
         end
       end
 
+      #model
+      if Oxidized.config.models.has_key?(@model.class.name.to_s.downcase)
+        if Oxidized.config.models[@model.class.name.to_s.downcase].has_key?(key_str)
+          value = Oxidized.config.models[@model.class.name.to_s.downcase][key_str]
+          Oxidized.logger.debug "node.rb: setting node key '#{key}' to value '#{value}' from model"
+        end
+      end
+
       #node
       value = opt[key_sym] || value
       Oxidized.logger.debug "node.rb: returning node key '#{key}' with value '#{value}'"
-- 
cgit v1.2.1


From a002a0672eb083be0704bc434c975dd5cbd079a1 Mon Sep 17 00:00:00 2001
From: Zollner Robert <wolfit_ro@yahoo.com>
Date: Thu, 4 May 2017 01:21:05 +0300
Subject: Quanta: accept shorter username prompt

This was default with my Quanta LB4M

Software Version............................... 1.1.0.8
Operating System............................... VxWorks 6.6
---
 lib/oxidized/model/quantaos.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/quantaos.rb b/lib/oxidized/model/quantaos.rb
index 274440d..5197aa8 100644
--- a/lib/oxidized/model/quantaos.rb
+++ b/lib/oxidized/model/quantaos.rb
@@ -12,7 +12,7 @@ class QuantaOS < Oxidized::Model
   end
 
   cfg :telnet do
-    username /^Username:/
+    username /^User(name)?:/
     password /^Password:/
   end
 
-- 
cgit v1.2.1


From 186dcd42aa60ee1c3e9125044f29a17f74ea7bd6 Mon Sep 17 00:00:00 2001
From: sorano <sorano@users.noreply.github.com>
Date: Mon, 8 May 2017 09:34:52 +0200
Subject: Fix closing /pfsense tag

Fix closing /pfsense tag.
Closes #825.
---
 lib/oxidized/model/pfsense.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/pfsense.rb b/lib/oxidized/model/pfsense.rb
index 782969e..5849160 100644
--- a/lib/oxidized/model/pfsense.rb
+++ b/lib/oxidized/model/pfsense.rb
@@ -3,7 +3,7 @@ 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..-2].join
+    cfg.each_line.to_a[1..-1].join
   end
   
   cmd 'cat /cf/conf/config.xml' do |cfg|
-- 
cgit v1.2.1


From 075b733475080440a97083ba2dfae50bfc54531a Mon Sep 17 00:00:00 2001
From: ospfbgp <danielcoxman@gmail.com>
Date: Tue, 9 May 2017 13:42:06 -0400
Subject: Add support for Avaya VSP

Adding support Avaya VSP Operating System Software(VOSS).  Tested both ssh and telnet.
---
 lib/oxidized/model/voss.rb | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 lib/oxidized/model/voss.rb

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/voss.rb b/lib/oxidized/model/voss.rb
new file mode 100644
index 0000000..075f001
--- /dev/null
+++ b/lib/oxidized/model/voss.rb
@@ -0,0 +1,33 @@
+class Voss < Oxidized::Model
+  # Avaya VSP Operating System Software(VOSS)
+  # Created by danielcoxman@gmail.com
+  # May 9, 2017
+  # This was tested on vsp4k and vsp8k
+
+  comment '# '
+
+  prompt /^[^\s#>]+[#>]$/
+
+  cmd 'show sys-info' do |cfg|
+    comment cfg
+  end
+
+  # more the config rather than doing a show run
+  cmd 'more config.cfg' do |cfg|
+    cfg
+    cfg.gsub! /^[^\s#>]+[#>]$/, ''
+    cfg.gsub! /^more config.cfg/, ''
+  end
+
+  cfg :telnet do
+    username /Login: $/
+    password /Password: $/
+  end
+
+  cfg :telnet, :ssh do
+    pre_logout 'exit'
+    post_login 'enable'
+    post_login 'terminal more disable'
+  end
+
+end
-- 
cgit v1.2.1


From 9094c9d90a9e7e663ae29fd010d56d0e3e9e01c3 Mon Sep 17 00:00:00 2001
From: madmouser1 <lenjoubert@gmail.com>
Date: Wed, 10 May 2017 10:14:38 +0100
Subject: added a pre-logout command to quit cleanly from routeros

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/routeros.rb b/lib/oxidized/model/routeros.rb
index 5717100..94f3c4a 100644
--- a/lib/oxidized/model/routeros.rb
+++ b/lib/oxidized/model/routeros.rb
@@ -22,6 +22,10 @@ class RouterOS < Oxidized::Model
     password /^Password:/
   end
 
+  cfg :telnet, :ssh do
+    pre_logout 'quit'
+  end
+
   cfg :ssh do
     exec true
   end
-- 
cgit v1.2.1


From e201b4c653c5145f70dfdf9d4f1c63d3bc6ad5ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benedikt=20Heum=C3=BCller?= <bheum@users.noreply.github.com>
Date: Thu, 11 May 2017 15:39:55 +0200
Subject: Added OX_NODE_IP for hook type: exec

Added OX_NODE_IP to access the IP address for exec commands.
---
 lib/oxidized/hook/exec.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/hook/exec.rb b/lib/oxidized/hook/exec.rb
index 58d6fd5..fa8aff1 100644
--- a/lib/oxidized/hook/exec.rb
+++ b/lib/oxidized/hook/exec.rb
@@ -67,6 +67,7 @@ class Exec < Oxidized::Hook
     if ctx.node
       env.merge!(
         "OX_NODE_NAME" => ctx.node.name.to_s,
+        "OX_NODE_IP" => ctx.node.ip.to_s,
         "OX_NODE_FROM" => ctx.node.from.to_s,
         "OX_NODE_MSG" => ctx.node.msg.to_s,
         "OX_NODE_GROUP" => ctx.node.group.to_s,
-- 
cgit v1.2.1


From 4854deb9e40b060a55d230cfb49a8e93e3346ac8 Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Sun, 14 May 2017 12:47:56 +0300
Subject: update changelog, bump version

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/version.rb b/lib/oxidized/version.rb
index 073aae9..221cffa 100644
--- a/lib/oxidized/version.rb
+++ b/lib/oxidized/version.rb
@@ -1,3 +1,3 @@
 module Oxidized
-  VERSION = '0.19.0'
+  VERSION = '0.20.0'
 end
-- 
cgit v1.2.1


From 89aa488c7bd6bf90adc17824fd42850390bdb0c5 Mon Sep 17 00:00:00 2001
From: Richard Mayhew <richard@splash.co.za>
Date: Sun, 14 May 2017 16:17:05 +0200
Subject: Included the changelog for RouterOS

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/routeros.rb b/lib/oxidized/model/routeros.rb
index 94f3c4a..31650c7 100644
--- a/lib/oxidized/model/routeros.rb
+++ b/lib/oxidized/model/routeros.rb
@@ -10,6 +10,10 @@ class RouterOS < Oxidized::Model
     comment cfg
   end
 
+  cmd '/system history print' do |cfg|
+    comment cfg
+  end
+
   cmd '/export' 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
-- 
cgit v1.2.1


From 97133ec863c695c6eaea6a4da523128234344295 Mon Sep 17 00:00:00 2001
From: ospfbgp <danielcoxman@gmail.com>
Date: Mon, 15 May 2017 00:44:31 -0400
Subject: Update voss.rb because of git diff

every config update was making a diff because temperature was included in "show sys-info".  Used more specific commands so temperature is not included now.
---
 lib/oxidized/model/voss.rb | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/voss.rb b/lib/oxidized/model/voss.rb
index 075f001..8a82fb3 100644
--- a/lib/oxidized/model/voss.rb
+++ b/lib/oxidized/model/voss.rb
@@ -1,22 +1,25 @@
 class Voss < Oxidized::Model
   # Avaya VSP Operating System Software(VOSS)
   # Created by danielcoxman@gmail.com
-  # May 9, 2017
+  # May 15, 2017
   # This was tested on vsp4k and vsp8k
 
   comment '# '
 
   prompt /^[^\s#>]+[#>]$/
 
-  cmd 'show sys-info' do |cfg|
-    comment cfg
-  end
+  # needed for proper formatting after post_login
+  cmd('') { |cfg| comment "#{cfg}\n" }
+  # get some general information about switch
+  cmd('show sys-info card') { |cfg| comment "#{cfg}\n" }
+  cmd('show sys-info fan') { |cfg| comment "#{cfg}\n" }
+  cmd('show sys-info power') { |cfg| comment "#{cfg}\n" }
 
   # more the config rather than doing a show run
   cmd 'more config.cfg' do |cfg|
     cfg
     cfg.gsub! /^[^\s#>]+[#>]$/, ''
-    cfg.gsub! /^more config.cfg/, ''
+    cfg.gsub! /^more config.cfg/, '# more config.cfg'
   end
 
   cfg :telnet do
@@ -24,10 +27,14 @@ class Voss < Oxidized::Model
     password /Password: $/
   end
 
-  cfg :telnet, :ssh do
+cfg :telnet, :ssh do
     pre_logout 'exit'
-    post_login 'enable'
-    post_login 'terminal more disable'
+    post_login do
+      send "enable\n"
+      send "terminal more disable\n"
+      # Backup the config via tftp to a tftpserver of your choice
+      #send "copy config.cfg x.x.x.x:" + node.name + ".cfg\n"
+    end
   end
 
 end
-- 
cgit v1.2.1


From 76b9a6ea902ce699f90305ec7a58882da798acbe Mon Sep 17 00:00:00 2001
From: ospfbgp <danielcoxman@gmail.com>
Date: Mon, 15 May 2017 01:01:16 -0400
Subject: Add support for Avaya BOSS

Add support for Avaya Baystack Operating System Software(BOSS)
---
 lib/oxidized/model/boss.rb | 80 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 lib/oxidized/model/boss.rb

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/boss.rb b/lib/oxidized/model/boss.rb
new file mode 100644
index 0000000..93f9903
--- /dev/null
+++ b/lib/oxidized/model/boss.rb
@@ -0,0 +1,80 @@
+class Boss < Oxidized::Model
+  # Avaya Baystack Operating System Software(BOSS)
+  # Created by danielcoxman@gmail.com
+  # May 15, 2017
+  # This was tested on ers3510, ers5530, ers4850, ers5952
+  # ssh and telnet were tested with banner and without
+
+  comment  '! '
+
+  prompt /^[^\s#>]+[#>]$/
+
+  # Handle the banner
+  # to disable the banner on BOSS the configuration parameter is "banner disabled"
+  expect /Enter Ctrl-Y to begin\./ do |data, re|
+    send "\cY"
+    data.sub re, ''
+  end
+
+  # Handle the Failed retries since last login 
+  # no known way to disable other than to implement radius authentication
+  expect /Press ENTER to continue/ do |data, re|
+    send "\n"
+    data.sub re, ''
+  end
+
+  # Handle the menu on the older BOSS example ers55xx, ers56xx
+  # to disable them menu on BOSS the configuration parameter is "cmd-interface cli"
+  expect /ommand Line Interface\.\.\./ do |data, re|
+    send "c"
+    data.sub re, ''
+  end
+ 
+  # needed for proper formatting
+  cmd('') { |cfg| comment "#{cfg}\n" }
+
+  # Do a sys-info and check and see if it supports stack
+  cmd 'show sys-info' do |cfg|
+    @stack = true if cfg.match /Stack/
+    cfg.gsub! /(^((.*)sysUpTime(.*))$)/, 'removed sysUpTime'
+    cfg.gsub! /(^((.*)sysNtpTime(.*))$)/, 'removed sysNtpTime'
+    cfg.gsub! /(^((.*)sysRtcTime(.*))$)/, 'removed sysNtpTime'
+    cfg.gsub! /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} .*/, ''
+    comment "#{cfg}\n"
+  end
+  
+  # if a stack then collect the stacking information
+  cmd 'show stack-info' do |cfg|
+    if @stack
+      cfg.gsub! /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} .*/, ''
+      comment "#{cfg}\n"
+    end
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg.gsub! /^show running-config/, '! show running-config'
+    # remove cli timestamp
+    cfg.gsub! /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} .*/, ''
+    cfg.gsub! /^[^\s#>]+[#>]$/, ''
+    cfg.gsub! /^! clock set.*/, '! removed clock set'
+    cfg
+  end
+
+  cfg :telnet do
+    username /Username: /
+    password /Password: /
+  end
+
+  cfg :telnet, :ssh do
+    pre_logout do
+      # Backup the running-config via tftp to a tftpserver of your choice
+      #send "copy running-config tftp address x.x.x.x filename " + node.name + ".cli\n"
+      send "logout\n"
+    end
+    post_login do
+      send "terminal length 0\n"
+      send "terminal width 132\n"
+    end
+  end
+
+end
-- 
cgit v1.2.1


From 361c1da35cce14d430f14c6c27dce2194183127f Mon Sep 17 00:00:00 2001
From: ospfbgp <danielcoxman@gmail.com>
Date: Mon, 15 May 2017 02:09:23 -0400
Subject: Update voss.rb

had some test code that needed to be removed
---
 lib/oxidized/model/voss.rb | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/voss.rb b/lib/oxidized/model/voss.rb
index 8a82fb3..599462a 100644
--- a/lib/oxidized/model/voss.rb
+++ b/lib/oxidized/model/voss.rb
@@ -27,14 +27,10 @@ class Voss < Oxidized::Model
     password /Password: $/
   end
 
-cfg :telnet, :ssh do
+  cfg :telnet, :ssh do
     pre_logout 'exit'
-    post_login do
-      send "enable\n"
-      send "terminal more disable\n"
-      # Backup the config via tftp to a tftpserver of your choice
-      #send "copy config.cfg x.x.x.x:" + node.name + ".cfg\n"
-    end
+    post_login 'enable'
+    post_login 'terminal more disable'
   end
 
 end
-- 
cgit v1.2.1


From dd8101df0aa579405eab958da623fb36ef3231ab Mon Sep 17 00:00:00 2001
From: ospfbgp <danielcoxman@gmail.com>
Date: Mon, 15 May 2017 02:12:18 -0400
Subject: Update boss.rb

had some test code that needed to be removed
---
 lib/oxidized/model/boss.rb | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/boss.rb b/lib/oxidized/model/boss.rb
index 93f9903..02201a1 100644
--- a/lib/oxidized/model/boss.rb
+++ b/lib/oxidized/model/boss.rb
@@ -39,6 +39,7 @@ class Boss < Oxidized::Model
     cfg.gsub! /(^((.*)sysUpTime(.*))$)/, 'removed sysUpTime'
     cfg.gsub! /(^((.*)sysNtpTime(.*))$)/, 'removed sysNtpTime'
     cfg.gsub! /(^((.*)sysRtcTime(.*))$)/, 'removed sysNtpTime'
+    # remove timestamp
     cfg.gsub! /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} .*/, ''
     comment "#{cfg}\n"
   end
@@ -46,6 +47,7 @@ class Boss < Oxidized::Model
   # if a stack then collect the stacking information
   cmd 'show stack-info' do |cfg|
     if @stack
+      # remove timestamp
       cfg.gsub! /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} .*/, ''
       comment "#{cfg}\n"
     end
@@ -53,7 +55,7 @@ class Boss < Oxidized::Model
 
   cmd 'show running-config' do |cfg|
     cfg.gsub! /^show running-config/, '! show running-config'
-    # remove cli timestamp
+    # remove timestamp
     cfg.gsub! /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} .*/, ''
     cfg.gsub! /^[^\s#>]+[#>]$/, ''
     cfg.gsub! /^! clock set.*/, '! removed clock set'
@@ -66,15 +68,9 @@ class Boss < Oxidized::Model
   end
 
   cfg :telnet, :ssh do
-    pre_logout do
-      # Backup the running-config via tftp to a tftpserver of your choice
-      #send "copy running-config tftp address x.x.x.x filename " + node.name + ".cli\n"
-      send "logout\n"
-    end
-    post_login do
-      send "terminal length 0\n"
-      send "terminal width 132\n"
-    end
+    pre_logout 'logout'
+    post_login 'terminal length 0'
+    post_login 'terminal width 132'
   end
 
 end
-- 
cgit v1.2.1


From a9d4c4f29fb1e8eaf7a10a0e11017ce6a35dc4bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benedikt=20Heum=C3=BCller?= <bheum@users.noreply.github.com>
Date: Tue, 16 May 2017 11:03:11 +0200
Subject: Added secret removal to vrp model

Added possibilty to remove lines of configration containing secrets
---
 lib/oxidized/model/vrp.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/vrp.rb b/lib/oxidized/model/vrp.rb
index 12a9ca3..98229c3 100644
--- a/lib/oxidized/model/vrp.rb
+++ b/lib/oxidized/model/vrp.rb
@@ -4,6 +4,12 @@ class VRP < Oxidized::Model
   prompt /^(<[\w.-]+>)$/
   comment '# '
 
+  cmd :secret do |cfg|
+    cfg.gsub! /(pin verify (?:auto|)).*/, '\\1 <PIN hidden>'
+    cfg.gsub! /(%\^%#.*%\^%#)/, '<secret hidden>'
+    cfg
+  end
+
   cmd :all do |cfg|
     cfg.each_line.to_a[1..-2].join
   end
-- 
cgit v1.2.1


From 1da216558e9392d3465dba2e6bb79d0221e43c03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benedikt=20Heum=C3=BCller?= <bheum@users.noreply.github.com>
Date: Tue, 16 May 2017 14:21:04 +0200
Subject: fortios.rb fortios_autoupdate remove FDS Address

The output of "diagnose autoupdate version" contains the FortiGuard
Distribution Server (FDS) address. This IP address changes several times
per week and therefore versioning is hardly possible. Added a line to
remove the IP address when fortios_autoupdate is set true.
---
 lib/oxidized/model/fortios.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/fortios.rb b/lib/oxidized/model/fortios.rb
index cdaa282..0249933 100644
--- a/lib/oxidized/model/fortios.rb
+++ b/lib/oxidized/model/fortios.rb
@@ -38,6 +38,7 @@ class FortiOS < Oxidized::Model
     #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|
+          cfg.gsub! /(FDS Address\n---------\n).*/, '\\1IP Address removed'
           comment cfg.each_line.reject { |line| line.match /Last Update|Result/ }.join
        end
     end
-- 
cgit v1.2.1


From 0f409421d8aebe4ef8305dc07c7d3260b926b3cd Mon Sep 17 00:00:00 2001
From: OCangrand <olivier.cangrand@gmail.com>
Date: Tue, 16 May 2017 16:26:11 +0200
Subject: Update README

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/hirschmann.rb b/lib/oxidized/model/hirschmann.rb
new file mode 100644
index 0000000..82432d7
--- /dev/null
+++ b/lib/oxidized/model/hirschmann.rb
@@ -0,0 +1,41 @@
+class Hirschmann < Oxidized::Model
+
+  prompt /^[\(\w\s\w\)]+\s[>|#]+?$/ 
+ 
+  comment '## '
+ 
+  #Handle pager
+  expect /^--More--.*$/ do |data, re|
+    send 'a'
+    data.sub re, ''
+  end
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  cmd 'show sysinfo' do |cfg|
+    cfg.gsub! /^System Up Time.*\n/, ""
+    cfg.gsub! /^System Date and Time.*\n/, ""
+    cfg.gsub! /^CPU Utilization.*\n/, ""
+    cfg.gsub! /^Memory.*\n/, ""
+    cfg.gsub! /^Average CPU Utilization.*\n/, ""
+    comment cfg
+  end
+ 
+  cmd 'show running-config' do |cfg|
+    cfg.gsub! /^users.*\n/, "" 
+    cfg
+  end    
+
+  cfg :telnet do
+    username /^User:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+   post_login 'enable'
+   pre_logout 'logout'
+  end
+
+end
-- 
cgit v1.2.1