From ed7c5574a197605658dfc5c8d5563d55e483eef3 Mon Sep 17 00:00:00 2001
From: Arnoud Vermeer <a.vermeer@tech.leaseweb.com>
Date: Mon, 22 Aug 2016 15:22:30 +0200
Subject: Remove secrets from A10 config and 'show running-config' doesn't have
 'all-partitions' in 64-bit Advanced Core OS (ACOS) version 4.1.0-P4, build 12
 (Jul-22-2016,15:49)

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/acos.rb b/lib/oxidized/model/acos.rb
index bb9846e..f4d4464 100644
--- a/lib/oxidized/model/acos.rb
+++ b/lib/oxidized/model/acos.rb
@@ -6,6 +6,13 @@ class ACOS < Oxidized::Model
   ##ACOS prompt changes depending on the state of the device
   prompt /^([-\w.\/:?\[\]\(\)]+[#>]\s?)$/
 
+  cmd :secret do |cfg|
+    cfg.gsub!(/community read encrypted (\S+)/, 'community read encrypted <hidden>') # snmp
+    cfg.gsub!(/secret encrypted (\S+)/, 'secret encrypted <hidden>') # tacacs-server
+    cfg.gsub!(/password encrypted (\S+)/, 'password encrypted <hidden>') # user
+    cfg
+  end
+
   cmd 'show version' do |cfg|
     cfg.gsub! /\s(Last configuration saved at).*/, ' \\1 <removed>'
     cfg.gsub! /\s(Memory).*/, ' \\1 <removed>'
@@ -22,7 +29,7 @@ class ACOS < Oxidized::Model
     comment cfg
   end
 
-  cmd 'show running-config all-partitions' do |cfg|
+  cmd 'show running-config' do |cfg|
      cfg.gsub! /(Current configuration).*/, '\\1 <removed>'
      cfg.gsub! /(Configuration last updated at).*/, '\\1 <removed>'
      cfg.gsub! /(Configuration last saved at).*/, '\\1 <removed>'
-- 
cgit v1.2.1


From 2c4ac17756320fa4abba2eee9ad32badb15043c7 Mon Sep 17 00:00:00 2001
From: Arnoud Vermeer <a.vermeer@tech.leaseweb.com>
Date: Mon, 22 Aug 2016 15:23:59 +0200
Subject: Cisco Adaptive Security Appliance Software Version 9.4(2)6 reports
 TACACS config like this:

aaa-server tacacs (OUTSIDE) host 192.168.1.1
 key assadasda

Updated the regex to be backward compatible.
---
 lib/oxidized/model/asa.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/asa.rb b/lib/oxidized/model/asa.rb
index a41348e..df30059 100644
--- a/lib/oxidized/model/asa.rb
+++ b/lib/oxidized/model/asa.rb
@@ -15,7 +15,7 @@ class ASA < Oxidized::Model
     cfg.gsub! /username (\S+) password (\S+) (.*)/, 'username \1 password <secret hidden> \3'
     cfg.gsub! /ikev2 pre-shared-key (\S+)/, 'ikev2 pre-shared-key <secret hidden>'
     cfg.gsub! /ikev2 (remote|local)-authentication pre-shared-key (\S+)/, 'ikev2 \1-authentication pre-shared-key <secret hidden>'
-    cfg.gsub! /^(aaa-server TACACS\+ \(\S+\) host.*\n\skey) \S+$/m, '\1 <secret hidden>'
+    cfg.gsub! /^(aaa-server TACACS\+? \(\S+\) host.*\n\skey) \S+$/mi, '\1 <secret hidden>'
     cfg
   end
 
-- 
cgit v1.2.1


From fef6b89aaeb44ab2b0601ee8a8924f20958cf507 Mon Sep 17 00:00:00 2001
From: Arnoud Vermeer <a.vermeer@tech.leaseweb.com>
Date: Mon, 22 Aug 2016 15:30:40 +0200
Subject: It's not outputting config

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/acos.rb b/lib/oxidized/model/acos.rb
index f4d4464..6b5bc41 100644
--- a/lib/oxidized/model/acos.rb
+++ b/lib/oxidized/model/acos.rb
@@ -34,6 +34,7 @@ class ACOS < Oxidized::Model
      cfg.gsub! /(Configuration last updated at).*/, '\\1 <removed>'
      cfg.gsub! /(Configuration last saved at).*/, '\\1 <removed>'
      cfg.gsub! /(Configuration last synchronized at).*/, '\\1 <removed>'
+     cfg
   end
 
   cmd 'show aflex all-partitions' do |cfg|
-- 
cgit v1.2.1


From 530db63d0f385bccab5efbfcbf24011aa2925e3c Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Tue, 23 Aug 2016 13:13:13 +0300
Subject: Closes #535

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/pfsense.rb b/lib/oxidized/model/pfsense.rb
index cd6885c..8cb0118 100644
--- a/lib/oxidized/model/pfsense.rb
+++ b/lib/oxidized/model/pfsense.rb
@@ -1,4 +1,6 @@
 class PfSense < Oxidized::Model
+
+  # use other use than 'admin' user, 'admin' user cannot get ssh/exec. See issue #535
   
   comment  '# '
   
-- 
cgit v1.2.1


From d9888effefa6abeae55c4e3e4dc0f77ac5ba1e31 Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Tue, 23 Aug 2016 13:34:30 +0300
Subject: 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 023f184..54defae 100644
--- a/lib/oxidized/version.rb
+++ b/lib/oxidized/version.rb
@@ -1,3 +1,3 @@
 module Oxidized
-  VERSION = '0.16.2'
+  VERSION = '0.16.3'
 end
-- 
cgit v1.2.1


From 0c925a7e8e3ff2b8b1f8b69443032a37c7f8dbcc Mon Sep 17 00:00:00 2001
From: Arnoud Vermeer <a.vermeer@tech.leaseweb.com>
Date: Tue, 23 Aug 2016 13:38:07 +0200
Subject: !Current config commit point for partition 0 is 0 & config mode is
 classical-mode ! COMMAND: show running-config all-partitions                 
                                               ^ % Unrecognized
 command.Invalid input detected at '^' marker.

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/acos.rb b/lib/oxidized/model/acos.rb
index 6b5bc41..ec78711 100644
--- a/lib/oxidized/model/acos.rb
+++ b/lib/oxidized/model/acos.rb
@@ -37,6 +37,14 @@ class ACOS < Oxidized::Model
      cfg
   end
 
+  cmd 'show running-config all-partitions' do |cfg|
+     cfg.gsub! /(Current configuration).*/, '\\1 <removed>'
+     cfg.gsub! /(Configuration last updated at).*/, '\\1 <removed>'
+     cfg.gsub! /(Configuration last saved at).*/, '\\1 <removed>'
+     cfg.gsub! /(Configuration last synchronized at).*/, '\\1 <removed>'
+     cfg
+  end
+
   cmd 'show aflex all-partitions' do |cfg|
     comment cfg
   end
-- 
cgit v1.2.1


From 233a360e0f975cf9f04a70d5fbbce0e6945967f9 Mon Sep 17 00:00:00 2001
From: Arnoud Vermeer <a.vermeer@tech.leaseweb.com>
Date: Tue, 23 Aug 2016 16:37:32 +0200
Subject: Use partition-confg for newer devices

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/acos.rb b/lib/oxidized/model/acos.rb
index ec78711..37d2c4e 100644
--- a/lib/oxidized/model/acos.rb
+++ b/lib/oxidized/model/acos.rb
@@ -37,6 +37,14 @@ class ACOS < Oxidized::Model
      cfg
   end
 
+  cmd 'show partition-config all' do |cfg|
+     cfg.gsub! /(Current configuration).*/, '\\1 <removed>'
+     cfg.gsub! /(Configuration last updated at).*/, '\\1 <removed>'
+     cfg.gsub! /(Configuration last saved at).*/, '\\1 <removed>'
+     cfg.gsub! /(Configuration last synchronized at).*/, '\\1 <removed>'
+     cfg
+  end  
+
   cmd 'show running-config all-partitions' do |cfg|
      cfg.gsub! /(Current configuration).*/, '\\1 <removed>'
      cfg.gsub! /(Configuration last updated at).*/, '\\1 <removed>'
-- 
cgit v1.2.1


From e2fa16b811791c7e2a0563d7b57140b4ccb2a9b4 Mon Sep 17 00:00:00 2001
From: Arnoud Vermeer <a.vermeer@tech.leaseweb.com>
Date: Wed, 24 Aug 2016 09:45:11 +0200
Subject: Show partition-config all includes show running-config.

---
 lib/oxidized/model/acos.rb | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/acos.rb b/lib/oxidized/model/acos.rb
index 37d2c4e..47649a2 100644
--- a/lib/oxidized/model/acos.rb
+++ b/lib/oxidized/model/acos.rb
@@ -29,14 +29,6 @@ class ACOS < Oxidized::Model
     comment cfg
   end
 
-  cmd 'show running-config' do |cfg|
-     cfg.gsub! /(Current configuration).*/, '\\1 <removed>'
-     cfg.gsub! /(Configuration last updated at).*/, '\\1 <removed>'
-     cfg.gsub! /(Configuration last saved at).*/, '\\1 <removed>'
-     cfg.gsub! /(Configuration last synchronized at).*/, '\\1 <removed>'
-     cfg
-  end
-
   cmd 'show partition-config all' do |cfg|
      cfg.gsub! /(Current configuration).*/, '\\1 <removed>'
      cfg.gsub! /(Configuration last updated at).*/, '\\1 <removed>'
-- 
cgit v1.2.1


From 22b6c6d877638f32177e3d160a490109304f355a Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Thu, 25 Aug 2016 14:55:05 +0300
Subject: refactor node resolution

two primary goals

- username and password can come from different sources (Global PW, per
  group username)
- model can come from group
---
 lib/oxidized/node.rb | 47 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 17 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/node.rb b/lib/oxidized/node.rb
index f2b125a..c1df6ad 100644
--- a/lib/oxidized/node.rb
+++ b/lib/oxidized/node.rb
@@ -128,24 +128,15 @@ module Oxidized
     end
 
     def resolve_auth opt
-      # Resolve configured username/password, give priority to group level configuration
-      # TODO: refactor to use revised behaviour of Asetus
-      cfg_username, cfg_password =
-        if Oxidized.config.groups.has_key?(@group) and ['username', 'password'].all? {|e| Oxidized.config.groups[@group].has_key?(e)}
-          [Oxidized.config.groups[@group].username, Oxidized.config.groups[@group].password]
-        elsif ['username', 'password'].all? {|e| Oxidized.config.has_key?(e)}
-          [Oxidized.config.username, Oxidized.config.password]
-        else
-          [nil, nil]
-        end
-      auth = {}
-      auth[:username] = (opt[:username] or cfg_username)
-      auth[:password] = (opt[:password] or cfg_password)
-      auth
+      # Resolve configured username/password
+      {
+        username: resolve_key(:username, opt),
+        password: resolve_key(:password, opt),
+      }
     end
 
     def resolve_input opt
-      inputs = (opt[:input]  or Oxidized.config.input.default)
+      inputs = resolve_key :input, opt, Oxidized.config.input.default
       inputs.split(/\s*,\s*/).map do |input|
         if not Oxidized.mgr.input[input]
           Oxidized.mgr.add_input input or raise MethodNotFound, "#{input} not found for node #{ip}"
@@ -155,7 +146,7 @@ module Oxidized
     end
 
     def resolve_output opt
-      output = (opt[:output] or Oxidized.config.output.default)
+      output = resolve_key :output, opt, Oxidized.config.output.default
       if not Oxidized.mgr.output[output]
         Oxidized.mgr.add_output output or raise MethodNotFound, "#{output} not found for node #{ip}"
       end
@@ -163,7 +154,7 @@ module Oxidized
     end
 
     def resolve_model opt
-      model = (opt[:model] or Oxidized.config.model)
+      model = resolve_key :model, opt
       if not Oxidized.mgr.model[model]
         Oxidized.logger.debug "lib/oxidized/node.rb: Loading model #{model.inspect}"
         Oxidized.mgr.add_model model or raise ModelNotFound, "#{model} not found for node #{ip}"
@@ -187,6 +178,28 @@ module Oxidized
       end
     end
 
+    def resolve_key key, opt, global=nil
+      # resolve key, first get global, then get group then get node config
+      key_sym = key.to_sym
+      key_str = key.to_str
+      value   = global
+
+      #global
+      if not value and Oxidized.config.has_key?(key_str)
+        value = Oxidized.config[key_str]
+      end
+      
+      #group
+      if Oxidized.config.groups.has_key?(@group)
+        if Oxidized.config.groups[@group].has.key?(key_str)
+          value = Oxidized.config.groups[@group][key_str]
+        end
+      end
+
+      #node
+      opt[key_sym] || value
+    end
+
     def is_git? opt
       (opt[:output] || Oxidized.config.output.default) == 'git'
     end
-- 
cgit v1.2.1


From 3f69328f5d01121eb9a8af39779c97943d6cd6d5 Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Thu, 25 Aug 2016 15:10:50 +0300
Subject: fix symbol conversion to string

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/node.rb b/lib/oxidized/node.rb
index c1df6ad..7df353d 100644
--- a/lib/oxidized/node.rb
+++ b/lib/oxidized/node.rb
@@ -181,7 +181,7 @@ module Oxidized
     def resolve_key key, opt, global=nil
       # resolve key, first get global, then get group then get node config
       key_sym = key.to_sym
-      key_str = key.to_str
+      key_str = key.to_s
       value   = global
 
       #global
-- 
cgit v1.2.1


From 647500ffc78d03bcb07043551bce3684d62ab40d Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Thu, 25 Aug 2016 15:47:20 +0300
Subject: add debugging to key resolution

---
 lib/oxidized/node.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/node.rb b/lib/oxidized/node.rb
index 7df353d..2abe096 100644
--- a/lib/oxidized/node.rb
+++ b/lib/oxidized/node.rb
@@ -183,21 +183,26 @@ module Oxidized
       key_sym = key.to_sym
       key_str = key.to_s
       value   = global
+      Oxidized.logger.debug "resolving node key #{key}, with global value of #{value} and node value #{opt[key_sym]}"
 
       #global
       if not value and Oxidized.config.has_key?(key_str)
         value = Oxidized.config[key_str]
+        Oxidized.logger.debug "setting node key #{key} to value #{value} from global"
       end
-      
+
       #group
       if Oxidized.config.groups.has_key?(@group)
         if Oxidized.config.groups[@group].has.key?(key_str)
           value = Oxidized.config.groups[@group][key_str]
+          Oxidized.logger.debug "setting node key #{key} to value #{value} from group"
         end
       end
 
       #node
-      opt[key_sym] || value
+      value = opt[key_sym] || value
+      Oxidized.logger.debug "returning node key #{key} with value #{value}"
+      value
     end
 
     def is_git? opt
-- 
cgit v1.2.1


From 5aada44192d1f6173c128baa2f602e6630886f1b Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Thu, 25 Aug 2016 16:39:13 +0300
Subject: typo fix

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/node.rb b/lib/oxidized/node.rb
index 2abe096..66262b8 100644
--- a/lib/oxidized/node.rb
+++ b/lib/oxidized/node.rb
@@ -193,7 +193,7 @@ module Oxidized
 
       #group
       if Oxidized.config.groups.has_key?(@group)
-        if Oxidized.config.groups[@group].has.key?(key_str)
+        if Oxidized.config.groups[@group].has_key?(key_str)
           value = Oxidized.config.groups[@group][key_str]
           Oxidized.logger.debug "setting node key #{key} to value #{value} from group"
         end
-- 
cgit v1.2.1


From 2e3eb45f19b9c40353705df19a8e0a316fd314c6 Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Thu, 25 Aug 2016 16:47:38 +0300
Subject: quote debugging

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/node.rb b/lib/oxidized/node.rb
index 66262b8..c93a16a 100644
--- a/lib/oxidized/node.rb
+++ b/lib/oxidized/node.rb
@@ -183,25 +183,25 @@ module Oxidized
       key_sym = key.to_sym
       key_str = key.to_s
       value   = global
-      Oxidized.logger.debug "resolving node key #{key}, with global value of #{value} and node value #{opt[key_sym]}"
+      Oxidized.logger.debug "node.rb: resolving node key '#{key}', with passed global value of '#{value}' and node value '#{opt[key_sym]}'"
 
       #global
       if not value and Oxidized.config.has_key?(key_str)
         value = Oxidized.config[key_str]
-        Oxidized.logger.debug "setting node key #{key} to value #{value} from global"
+        Oxidized.logger.debug "node.rb: setting node key '#{key}' to value '#{value}' from global"
       end
 
       #group
       if Oxidized.config.groups.has_key?(@group)
         if Oxidized.config.groups[@group].has_key?(key_str)
           value = Oxidized.config.groups[@group][key_str]
-          Oxidized.logger.debug "setting node key #{key} to value #{value} from group"
+          Oxidized.logger.debug "node.rb: setting node key '#{key}' to value '#{value}' from group"
         end
       end
 
       #node
       value = opt[key_sym] || value
-      Oxidized.logger.debug "returning node key #{key} with value #{value}"
+      Oxidized.logger.debug "node.rb: returning node key '#{key}' with value '#{value}'"
       value
     end
 
-- 
cgit v1.2.1


From 451ea95d70ca2773e6f7813a52627f622498589b Mon Sep 17 00:00:00 2001
From: Christoffer Stokbaek <christoffers@easyspeedy.com>
Date: Fri, 26 Aug 2016 16:35:17 +0200
Subject: config pull will not remove its revision time

---
 lib/oxidized/model/pfsense.rb | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/pfsense.rb b/lib/oxidized/model/pfsense.rb
index 8cb0118..9982d72 100644
--- a/lib/oxidized/model/pfsense.rb
+++ b/lib/oxidized/model/pfsense.rb
@@ -2,21 +2,12 @@ class PfSense < Oxidized::Model
 
   # use other use than 'admin' user, 'admin' user cannot get ssh/exec. See issue #535
   
-  comment  '# '
-  
-  #add a comment in the final conf
-  def add_comment comment
-    "\n###### #{comment} ######\n" 
-  end
-
   cmd :all do |cfg|
     cfg.each_line.to_a[1..-2].join
   end
   
-  #show the persistent configuration
-  pre do
-    cfg = add_comment 'Configuration'
-    cfg += cmd 'cat /cf/conf/config.xml'    
+  cmd 'cat /cf/conf/config.xml' do |cfg|
+    cfg.gsub! /\s<revision>\s*<time>\d*<\/time>\s*.*\s*.*\s*<\/revision>/, ''
   end
   
   cfg :ssh do
-- 
cgit v1.2.1


From 3b1bcbe86eb53261371b584b6655f409f80ead1b Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Sun, 28 Aug 2016 13:23:52 +0300
Subject: expand_path in file output

so that

```
output:
  file:
    directory: ~/foox
```

will work
---
 lib/oxidized/output/file.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/output/file.rb b/lib/oxidized/output/file.rb
index bb13827..0b64447 100644
--- a/lib/oxidized/output/file.rb
+++ b/lib/oxidized/output/file.rb
@@ -17,7 +17,7 @@ class OxidizedFile < Output
   end
 
   def store node, outputs, opt={}
-    file = @cfg.directory
+    file = File.expand_path @cfg.directory
     if opt[:group]
       file = File.join File.dirname(file), opt[:group]
     end
@@ -28,7 +28,7 @@ class OxidizedFile < Output
   end
 
   def fetch node, group
-    cfg_dir = @cfg.directory
+    cfg_dir = File.expand_path @cfg.directory
     if group # group is explicitly defined by user
       IO.readlines File.join(cfg_dir, group, node)
     else
-- 
cgit v1.2.1


From 97cb2fdaa9e6400d94e90dee024cac0aa62465bf Mon Sep 17 00:00:00 2001
From: MajesticFalcon <Schylarutley@hotmail.com>
Date: Sun, 28 Aug 2016 12:04:53 -0500
Subject: Add more extensive pattern matching

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/routeros.rb b/lib/oxidized/model/routeros.rb
index 4822500..216252a 100644
--- a/lib/oxidized/model/routeros.rb
+++ b/lib/oxidized/model/routeros.rb
@@ -1,5 +1,5 @@
 class RouterOS < Oxidized::Model
-  prompt /\[\w+@\S+\]\s?>\s?$/
+  prompt /\[\w+@\S+(\s?\S+){0,}\]\s?>\s?$/
   comment "# "
 
   cmd '/system routerboard print' do |cfg|
-- 
cgit v1.2.1


From 9f4cd0105e6cd8a39771d3340e14b7cfca5440e2 Mon Sep 17 00:00:00 2001
From: MajesticFalcon <Schylarutley@hotmail.com>
Date: Sun, 28 Aug 2016 12:44:14 -0500
Subject: Changing {0,} -> *

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/routeros.rb b/lib/oxidized/model/routeros.rb
index 216252a..fc96512 100644
--- a/lib/oxidized/model/routeros.rb
+++ b/lib/oxidized/model/routeros.rb
@@ -1,5 +1,5 @@
 class RouterOS < Oxidized::Model
-  prompt /\[\w+@\S+(\s?\S+){0,}\]\s?>\s?$/
+  prompt /\[\w+@\S+(\s?\S+)*\]\s?>\s?$/
   comment "# "
 
   cmd '/system routerboard print' do |cfg|
-- 
cgit v1.2.1


From dbab46d5f8228f8dd56bbca2e63405e818c598f9 Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Mon, 29 Aug 2016 14:27:57 +0300
Subject: support terminal and ssh auth for same model

Some boxes like prokurwa may authenticate via SSH (proper), or may have
no auth on SSH and use terminal auth (improper)

Even if SSH is configured for terminal auth, in this change we attempt
to detect prompt, so that we won't expect terminal auth, even when
requested, if it is not presented.
---
 lib/oxidized/input/ssh.rb | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/input/ssh.rb b/lib/oxidized/input/ssh.rb
index cd12167..c0b7cf9 100644
--- a/lib/oxidized/input/ssh.rb
+++ b/lib/oxidized/input/ssh.rb
@@ -42,7 +42,7 @@ module Oxidized
       unless @exec
         shell_open @ssh
         begin
-          @username ? shell_login : expect(@node.prompt)
+          login
         rescue Timeout::Error
           raise PromptUndetect, [ @output, 'not matching configured prompt', @node.prompt ].join(' ')
         end
@@ -102,13 +102,18 @@ module Oxidized
       end
     end
 
-    # Cisco WCS has extremely dubious SSH implementation, SSH auth is always
-    # success, it always opens shell and then run auth in shell. I guess
-    # they'll never support exec() :)
-    def shell_login
-      expect username
-      cmd @node.auth[:username], password
-      cmd @node.auth[:password]
+    # some models have SSH auth or terminal auth based on version of code
+    # if SSH is configured for terminal auth, we'll still try to detect prompt
+    def login
+      if @username
+        match = expect username, @node.prompt
+        if match == username
+          cmd @node.auth[:username], password
+          cmd @node.auth[:password]
+        end
+      else
+        expect @node.prompt
+      end
     end
 
     def exec state=nil
@@ -123,14 +128,18 @@ module Oxidized
       @output
     end
 
-    def expect regexp
-      Oxidized.logger.debug "lib/oxidized/input/ssh.rb: expecting #{regexp.inspect} at #{node.name}"
+    def expect *regexps
+      regexps = [regexps].flatten
+      Oxidized.logger.debug "lib/oxidized/input/ssh.rb: expecting #{regexps.inspect} at #{node.name}"
       Timeout::timeout(Oxidized.config.timeout) do
         @ssh.loop(0.1) do
           sleep 0.1
-          not @output.match regexp
+          match = regexps.find { |regexp| @output.match regexp }
+          return match if match
+          true
         end
       end
     end
+
   end
 end
-- 
cgit v1.2.1


From 699136c8c3a1a409a2eaa19019ec6df6bb4b61e0 Mon Sep 17 00:00:00 2001
From: Danilo Sousa <dsgoncalves@uoldiveo.com>
Date: Mon, 29 Aug 2016 16:42:06 -0300
Subject: fix the node variable from `#fetch`. closes #529

in commit `de2a9d1` I changed the `#fetch` method to pass the
`Node` object instead of the node name.
---
 lib/oxidized/output/file.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/output/file.rb b/lib/oxidized/output/file.rb
index 0b64447..851e4c5 100644
--- a/lib/oxidized/output/file.rb
+++ b/lib/oxidized/output/file.rb
@@ -29,13 +29,15 @@ class OxidizedFile < Output
 
   def fetch node, group
     cfg_dir = File.expand_path @cfg.directory
+    node_name = node.name
+
     if group # group is explicitly defined by user
-      IO.readlines File.join(cfg_dir, group, node)
+      IO.readlines File.join(cfg_dir, group, node_name)
     else
-      if File.exists? File.join(cfg_dir, node) # node configuration file is stored on base directory
-        IO.readlines File.join(cfg_dir, node)
+      if File.exists? File.join(cfg_dir, node_name) # node configuration file is stored on base directory
+        IO.readlines File.join(cfg_dir, node_name)
       else
-        path = Dir.glob File.join(cfg_dir, '**', node) # fetch node in all groups
+        path = Dir.glob File.join(cfg_dir, '**', node_name) # fetch node in all groups
         return nil if path[0].nil?
         open(path[0], 'r').readlines
       end
-- 
cgit v1.2.1


From 340aa7eff51f3c08a2764b3c5882b0568b1442fb Mon Sep 17 00:00:00 2001
From: MajesticFalcon <Schylarutley@hotmail.com>
Date: Tue, 30 Aug 2016 17:47:05 -0500
Subject: Adding Alvarion model

---
 lib/oxidized/model/alvarion | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 lib/oxidized/model/alvarion

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/alvarion b/lib/oxidized/model/alvarion
new file mode 100644
index 0000000..3c762de
--- /dev/null
+++ b/lib/oxidized/model/alvarion
@@ -0,0 +1,13 @@
+class Alvarion < Oxidized::Model
+
+  # Used in Alvarion wisp equipment
+
+  # Run this command as an instance of Model so we can access node
+  pre do
+    cmd "#{node.auth[:password]}.cfg"
+  end
+
+
+  cfg :tftp {}
+
+end
-- 
cgit v1.2.1


From 87e95ab4f947d33e0fc42bb8892cb0112f620b43 Mon Sep 17 00:00:00 2001
From: MajesticFalcon <Schylarutley@hotmail.com>
Date: Tue, 30 Aug 2016 17:49:14 -0500
Subject: Add UDP TFTP

---
 lib/oxidized/input/tftp | 58 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 lib/oxidized/input/tftp

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/input/tftp b/lib/oxidized/input/tftp
new file mode 100644
index 0000000..bfb69f6
--- /dev/null
+++ b/lib/oxidized/input/tftp
@@ -0,0 +1,58 @@
+module Oxidized
+  require 'net/tftp'
+  require 'timeout'
+  require 'stringio'
+  require_relative 'cli'
+
+  class TFTP < Input
+    RescueFail = {
+      :debug => [
+        #Net::SSH::Disconnect,
+      ],
+      :warn => [
+        #RuntimeError,
+        #Net::SSH::AuthenticationFailed,
+      ],
+    }
+    
+    include Input::CLI
+    
+    # TFTP utilizes UDP, there is not a connection. We simply specify an IP and send/receive data.
+    def connect node
+      @node       = node
+
+      @node.model.cfg['tftp'].each { |cb| instance_exec(&cb) }
+      @log = File.open(Oxidized::Config::Log + "/#{@node.ip}-tftp", 'w') if Oxidized.config.input.debug?
+      @tftp = Net::TFTP.new @node.ip
+    end
+
+    def cmd file
+      Oxidized.logger.info file.methods(true)
+      Oxidized.logger.debug "TFTP: #{file} @ #{@node.name}"
+      config = StringIO.new
+      @tftp.getbinary file, config
+      config.rewind
+      config.read
+    end
+    
+
+    # meh not sure if this is the best way, but perhaps better than not implementing send
+    def send my_proc
+      my_proc.call
+    end
+
+    def output
+      ""
+    end
+
+    private
+
+    def disconnect
+      # TFTP uses UDP, there is no connection to close
+    #rescue Errno::ECONNRESET, IOError
+    ensure
+      @log.close if Oxidized.config.input.debug?
+    end
+
+  end
+end
-- 
cgit v1.2.1


From 35f20515be92d57245abd24b9b2969d5d70922ba Mon Sep 17 00:00:00 2001
From: MajesticFalcon <Schylarutley@hotmail.com>
Date: Tue, 30 Aug 2016 17:56:09 -0500
Subject: Update tftp

---
 lib/oxidized/input/tftp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/input/tftp b/lib/oxidized/input/tftp
index bfb69f6..cac8f2d 100644
--- a/lib/oxidized/input/tftp
+++ b/lib/oxidized/input/tftp
@@ -49,7 +49,6 @@ module Oxidized
 
     def disconnect
       # TFTP uses UDP, there is no connection to close
-    #rescue Errno::ECONNRESET, IOError
     ensure
       @log.close if Oxidized.config.input.debug?
     end
-- 
cgit v1.2.1


From cc1184abc98fd270ee8fee4925f38de08c908bb8 Mon Sep 17 00:00:00 2001
From: MajesticFalcon <Schylarutley@hotmail.com>
Date: Tue, 30 Aug 2016 18:02:00 -0500
Subject: Update Filename and tftp load

---
 lib/oxidized/input/tftp    | 57 ------------------------------------------
 lib/oxidized/input/tftp.rb | 62 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 57 deletions(-)
 delete mode 100644 lib/oxidized/input/tftp
 create mode 100644 lib/oxidized/input/tftp.rb

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/input/tftp b/lib/oxidized/input/tftp
deleted file mode 100644
index cac8f2d..0000000
--- a/lib/oxidized/input/tftp
+++ /dev/null
@@ -1,57 +0,0 @@
-module Oxidized
-  require 'net/tftp'
-  require 'timeout'
-  require 'stringio'
-  require_relative 'cli'
-
-  class TFTP < Input
-    RescueFail = {
-      :debug => [
-        #Net::SSH::Disconnect,
-      ],
-      :warn => [
-        #RuntimeError,
-        #Net::SSH::AuthenticationFailed,
-      ],
-    }
-    
-    include Input::CLI
-    
-    # TFTP utilizes UDP, there is not a connection. We simply specify an IP and send/receive data.
-    def connect node
-      @node       = node
-
-      @node.model.cfg['tftp'].each { |cb| instance_exec(&cb) }
-      @log = File.open(Oxidized::Config::Log + "/#{@node.ip}-tftp", 'w') if Oxidized.config.input.debug?
-      @tftp = Net::TFTP.new @node.ip
-    end
-
-    def cmd file
-      Oxidized.logger.info file.methods(true)
-      Oxidized.logger.debug "TFTP: #{file} @ #{@node.name}"
-      config = StringIO.new
-      @tftp.getbinary file, config
-      config.rewind
-      config.read
-    end
-    
-
-    # meh not sure if this is the best way, but perhaps better than not implementing send
-    def send my_proc
-      my_proc.call
-    end
-
-    def output
-      ""
-    end
-
-    private
-
-    def disconnect
-      # TFTP uses UDP, there is no connection to close
-    ensure
-      @log.close if Oxidized.config.input.debug?
-    end
-
-  end
-end
diff --git a/lib/oxidized/input/tftp.rb b/lib/oxidized/input/tftp.rb
new file mode 100644
index 0000000..2a6a088
--- /dev/null
+++ b/lib/oxidized/input/tftp.rb
@@ -0,0 +1,62 @@
+module Oxidized
+  require 'timeout'
+  require 'stringio'
+  require_relative 'cli'
+
+  class TFTP < Input
+    RescueFail = {
+      :debug => [
+        #Net::SSH::Disconnect,
+      ],
+      :warn => [
+        #RuntimeError,
+        #Net::SSH::AuthenticationFailed,
+      ],
+    }
+    
+    include Input::CLI
+    
+    # TFTP utilizes UDP, there is not a connection. We simply specify an IP and send/receive data.
+    def connect node
+      begin
+        require 'net/tftp'
+      rescue LoadError
+        raise OxidizedError, 'net/tftp not found: sudo gem install net-tftp'
+      end
+      @node       = node
+
+      @node.model.cfg['tftp'].each { |cb| instance_exec(&cb) }
+      @log = File.open(Oxidized::Config::Log + "/#{@node.ip}-tftp", 'w') if Oxidized.config.input.debug?
+      @tftp = Net::TFTP.new @node.ip
+    end
+
+    def cmd file
+      Oxidized.logger.info file.methods(true)
+      Oxidized.logger.debug "TFTP: #{file} @ #{@node.name}"
+      config = StringIO.new
+      @tftp.getbinary file, config
+      config.rewind
+      config.read
+    end
+    
+
+    # meh not sure if this is the best way, but perhaps better than not implementing send
+    def send my_proc
+      my_proc.call
+    end
+
+    def output
+      ""
+    end
+
+    private
+
+    def disconnect
+      # TFTP uses UDP, there is no connection to close
+    #rescue Errno::ECONNRESET, IOError
+    ensure
+      @log.close if Oxidized.config.input.debug?
+    end
+
+  end
+end
-- 
cgit v1.2.1


From f9bd7b3b3564d99fb34c82edfc6b779b76496758 Mon Sep 17 00:00:00 2001
From: MajesticFalcon <Schylarutley@hotmail.com>
Date: Tue, 30 Aug 2016 18:07:58 -0500
Subject: Remove unnecessary debugging

---
 lib/oxidized/input/tftp.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/input/tftp.rb b/lib/oxidized/input/tftp.rb
index 2a6a088..c2f3a16 100644
--- a/lib/oxidized/input/tftp.rb
+++ b/lib/oxidized/input/tftp.rb
@@ -31,7 +31,6 @@ module Oxidized
     end
 
     def cmd file
-      Oxidized.logger.info file.methods(true)
       Oxidized.logger.debug "TFTP: #{file} @ #{@node.name}"
       config = StringIO.new
       @tftp.getbinary file, config
-- 
cgit v1.2.1


From 5d99baa74881271af4e73a2072325b5959ed9371 Mon Sep 17 00:00:00 2001
From: MajesticFalcon <Schylarutley@hotmail.com>
Date: Tue, 30 Aug 2016 18:20:31 -0500
Subject: Update tftp.rb

---
 lib/oxidized/input/tftp.rb | 35 ++++++++---------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/input/tftp.rb b/lib/oxidized/input/tftp.rb
index c2f3a16..18028c6 100644
--- a/lib/oxidized/input/tftp.rb
+++ b/lib/oxidized/input/tftp.rb
@@ -2,27 +2,19 @@ module Oxidized
   require 'timeout'
   require 'stringio'
   require_relative 'cli'
-
+  
+  begin
+    require 'net/tftp'
+  rescue LoadError
+    raise OxidizedError, 'net/tftp not found: sudo gem install net-tftp'
+  end
+  
   class TFTP < Input
-    RescueFail = {
-      :debug => [
-        #Net::SSH::Disconnect,
-      ],
-      :warn => [
-        #RuntimeError,
-        #Net::SSH::AuthenticationFailed,
-      ],
-    }
     
     include Input::CLI
     
     # TFTP utilizes UDP, there is not a connection. We simply specify an IP and send/receive data.
     def connect node
-      begin
-        require 'net/tftp'
-      rescue LoadError
-        raise OxidizedError, 'net/tftp not found: sudo gem install net-tftp'
-      end
       @node       = node
 
       @node.model.cfg['tftp'].each { |cb| instance_exec(&cb) }
@@ -38,21 +30,10 @@ module Oxidized
       config.read
     end
     
-
-    # meh not sure if this is the best way, but perhaps better than not implementing send
-    def send my_proc
-      my_proc.call
-    end
-
-    def output
-      ""
-    end
-
     private
-
+    
     def disconnect
       # TFTP uses UDP, there is no connection to close
-    #rescue Errno::ECONNRESET, IOError
     ensure
       @log.close if Oxidized.config.input.debug?
     end
-- 
cgit v1.2.1


From 8473dd0a6df171733ca6c02670ed1e1a5f894b00 Mon Sep 17 00:00:00 2001
From: MajesticFalcon <Schylarutley@hotmail.com>
Date: Tue, 30 Aug 2016 18:21:03 -0500
Subject: Update tftp.rb

---
 lib/oxidized/input/tftp.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/input/tftp.rb b/lib/oxidized/input/tftp.rb
index 18028c6..78164d0 100644
--- a/lib/oxidized/input/tftp.rb
+++ b/lib/oxidized/input/tftp.rb
@@ -1,5 +1,4 @@
 module Oxidized
-  require 'timeout'
   require 'stringio'
   require_relative 'cli'
   
-- 
cgit v1.2.1


From 388db3a021317c0887b45f57b7045dbb81062a45 Mon Sep 17 00:00:00 2001
From: boudreau <yves.boudreau@mcgill.ca>
Date: Fri, 2 Sep 2016 10:32:51 -0400
Subject: Update catos.rb

---
 lib/oxidized/model/catos.rb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/catos.rb b/lib/oxidized/model/catos.rb
index 874ebbc..bac9eec 100644
--- a/lib/oxidized/model/catos.rb
+++ b/lib/oxidized/model/catos.rb
@@ -1,6 +1,6 @@
 class Catos < Oxidized::Model
 
-  prompt /^[\w.@-]+> \(enable\) $/
+  prompt /^[\w.@-]+>\s?(\(enable\) )?$/
   comment '# '
 
   cmd :all do |cfg|
@@ -28,8 +28,15 @@ class Catos < Oxidized::Model
     password /^Password:/
   end
 
-  cfg :ssh, :telnet do
+  cfg :telnet, :ssh do
     post_login 'set length 0'
+    # preferred way to handle additional passwords
+    if vars :enable
+      post_login do
+        send "enable\n"
+        cmd vars(:enable)
+      end
+    end
     pre_logout 'exit'
   end
 
-- 
cgit v1.2.1


From d6cdfc119f32bca57c69deb8bcdc83999a84740d Mon Sep 17 00:00:00 2001
From: gerard780 <gerard780@users.noreply.github.com>
Date: Tue, 6 Sep 2016 15:25:54 -0400
Subject: Remove extra new lines added by export command

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/routeros.rb b/lib/oxidized/model/routeros.rb
index fc96512..a92ad5e 100644
--- a/lib/oxidized/model/routeros.rb
+++ b/lib/oxidized/model/routeros.rb
@@ -8,6 +8,7 @@ class RouterOS < Oxidized::Model
 
   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
     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 56bac9722fe26ce8e0af54ec52ca0b17aa7c9fa1 Mon Sep 17 00:00:00 2001
From: Schylar Utley <sutley@cwep.com>
Date: Wed, 7 Sep 2016 16:48:15 -0700
Subject: Add OS-Model mapping in README

---
 lib/oxidized/model/alvarion | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 lib/oxidized/model/alvarion

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/alvarion b/lib/oxidized/model/alvarion
deleted file mode 100644
index 3c762de..0000000
--- a/lib/oxidized/model/alvarion
+++ /dev/null
@@ -1,13 +0,0 @@
-class Alvarion < Oxidized::Model
-
-  # Used in Alvarion wisp equipment
-
-  # Run this command as an instance of Model so we can access node
-  pre do
-    cmd "#{node.auth[:password]}.cfg"
-  end
-
-
-  cfg :tftp {}
-
-end
-- 
cgit v1.2.1


From 09e169eac9ee83f8460835f0a14e3c6a64f9c253 Mon Sep 17 00:00:00 2001
From: Danilo Sousa <dsgoncalves@uoldiveo.com>
Date: Wed, 21 Sep 2016 09:07:52 -0300
Subject: rollback `alvarion` model

wrongly removed in 56bac9722fe26ce8e0af54ec52ca0b17aa7c9fa1
---
 lib/oxidized/model/alvarion | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 lib/oxidized/model/alvarion

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/alvarion b/lib/oxidized/model/alvarion
new file mode 100644
index 0000000..3c762de
--- /dev/null
+++ b/lib/oxidized/model/alvarion
@@ -0,0 +1,13 @@
+class Alvarion < Oxidized::Model
+
+  # Used in Alvarion wisp equipment
+
+  # Run this command as an instance of Model so we can access node
+  pre do
+    cmd "#{node.auth[:password]}.cfg"
+  end
+
+
+  cfg :tftp {}
+
+end
-- 
cgit v1.2.1


From e638e7c9685d375afbfba2949943da1c542dae53 Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Wed, 28 Sep 2016 16:14:35 +0300
Subject: interpolate node variable values

Empty value was variably considered "" or nil, now it will always be ""
string.

Now "nil", "false", "true" strings are converted to their respective
types nil, false and true.

This also means we cannot have verbatim strings by that name, like if
your password was "false", you're shit out of luck. If this is the case,
we can add some __false__ hack or consider other similar solutions.

Fixes #500
Fixes #534

May break stuff with ""/nil changing now, but as it was not consistent
to begin with, I find it acceptable. Users now may need to manually
enter nil in some fields to regain old behaviour.
---
 lib/oxidized/source/csv.rb    |  8 +++++---
 lib/oxidized/source/http.rb   |  6 ++++--
 lib/oxidized/source/source.rb | 12 ++++++++++++
 lib/oxidized/source/sql.rb    |  4 +++-
 4 files changed, 24 insertions(+), 6 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/source/csv.rb b/lib/oxidized/source/csv.rb
index a0ce848..be5c4a6 100644
--- a/lib/oxidized/source/csv.rb
+++ b/lib/oxidized/source/csv.rb
@@ -20,7 +20,7 @@ class CSV < Source
     nodes = []
     open(File.expand_path @cfg.file).each_line do |line|
       next if line.match(/^\s*#/)
-      data  = line.chomp.split @cfg.delimiter
+      data  = line.chomp.split(@cfg.delimiter, -1)
       next if data.empty?
       # map node parameters
       keys = {}
@@ -29,9 +29,11 @@ class CSV < Source
       end
       keys[:model] = map_model keys[:model] if keys.key? :model
 
-      # map node specific vars, empty value is considered as nil
+      # map node specific vars
       vars = {}
-      @cfg.vars_map.each { |key, position| vars[key.to_sym] = data[position].to_s.empty? ? nil : data[position] }
+      @cfg.vars_map.each do |key, position|
+        vars[key.to_sym] = node_var_interpolate data[position]
+      end
       keys[:vars] = vars unless vars.empty?
 
       nodes << keys
diff --git a/lib/oxidized/source/http.rb b/lib/oxidized/source/http.rb
index 93361a2..38387ad 100644
--- a/lib/oxidized/source/http.rb
+++ b/lib/oxidized/source/http.rb
@@ -43,9 +43,11 @@ class HTTP < Source
       end
       keys[:model] = map_model keys[:model] if keys.key? :model
 
-      # map node specific vars, empty value is considered as nil
+      # map node specific vars
       vars = {}
-      @cfg.vars_map.each { |key, position| vars[key.to_sym] = line[position].to_s.empty? ? nil : line[position] }
+      @cfg.vars_map.each do |key, position|
+        vars[key.to_sym] = node_var_interpolate line[position]
+      end
       keys[:vars] = vars unless vars.empty?
 
       nodes << keys
diff --git a/lib/oxidized/source/source.rb b/lib/oxidized/source/source.rb
index 7862dd1..9b8bc94 100644
--- a/lib/oxidized/source/source.rb
+++ b/lib/oxidized/source/source.rb
@@ -1,11 +1,23 @@
 module Oxidized
   class Source
     class NoConfig < OxidizedError; end
+
     def initialize
       @map = (Oxidized.config.model_map or {})
     end
+
     def map_model model
       @map.has_key?(model) ? @map[model] : model
     end
+
+    def node_var_interpolate var
+       case var
+       when "nil"   then nil
+       when "false" then false
+       when "true"  then true
+       else var
+       end
+    end
+
   end
 end
diff --git a/lib/oxidized/source/sql.rb b/lib/oxidized/source/sql.rb
index fc1caa8..ba85447 100644
--- a/lib/oxidized/source/sql.rb
+++ b/lib/oxidized/source/sql.rb
@@ -31,7 +31,9 @@ class SQL < Source
 
       # map node specific vars
       vars = {}
-      @cfg.vars_map.each { |key, sql_column| vars[key.to_sym] = node[sql_column.to_sym] }
+      @cfg.vars_map.each do |key, sql_column|
+        vars[key.to_sym] = node_var_interpolate node[sql_column.to_sym]
+      end
       keys[:vars] = vars unless vars.empty?
 
       nodes << keys
-- 
cgit v1.2.1


From cc127d63e753dc110876c754f98b9cad845f3cdd Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Wed, 28 Sep 2016 16:27:40 +0300
Subject: bump up 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 54defae..209b7d4 100644
--- a/lib/oxidized/version.rb
+++ b/lib/oxidized/version.rb
@@ -1,3 +1,3 @@
 module Oxidized
-  VERSION = '0.16.3'
+  VERSION = '0.17.0'
 end
-- 
cgit v1.2.1


From c17de76f1fd150a576dff05f8231720a88ae524b Mon Sep 17 00:00:00 2001
From: Cyril LAVIER <cyril.lavier@davromaniak.eu>
Date: Thu, 29 Sep 2016 11:51:03 +0200
Subject: Redoing the modifications on a up to date base

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/apc_aos.rb b/lib/oxidized/model/apc_aos.rb
new file mode 100644
index 0000000..530d436
--- /dev/null
+++ b/lib/oxidized/model/apc_aos.rb
@@ -0,0 +1,11 @@
+class Apc_aos < Oxidized::Model
+
+  cmd 'config.ini' do |cfg|
+    cfg.gsub! /^; Configuration file\, generated on.*/, ''
+  end
+
+  cfg :ftp do
+  end
+
+end
+
-- 
cgit v1.2.1


From d09f9c89c6422e813a470485327efe2cbb8963ca Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Fri, 30 Sep 2016 17:07:36 +0300
Subject: prompt not captured after sending enabe PW

fixes #577
---
 lib/oxidized/model/ironware.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/ironware.rb b/lib/oxidized/model/ironware.rb
index 1e8c30e..db341d1 100644
--- a/lib/oxidized/model/ironware.rb
+++ b/lib/oxidized/model/ironware.rb
@@ -2,14 +2,14 @@ class IronWare < Oxidized::Model
 
   prompt /^.*(telnet|ssh)\@.+[>#]\s?$/i
   comment  '! '
-  
+
   #to handle pager without enable
   #expect /^((.*)--More--(.*))$/ do |data, re|
   #  send ' '
   #  data.sub re, ''
   #end
 
-  
+
   #to remove backspace (if handle pager without enable)
   #expect /^((.*)[\b](.*))$/ do |data, re|
   #  data.sub re, ''
@@ -44,14 +44,14 @@ class IronWare < Oxidized::Model
       out << sc.rest
       cfg = out
     end
-    
+
     comment cfg
   end
-  
+
   cmd 'show flash' do |cfg|
     comment cfg
   end
-  
+
   cmd 'show module' do |cfg|
     cfg.gsub! /^((Invalid input)|(Type \?)).*$/, '' # some ironware devices are fixed config
     comment cfg
@@ -74,7 +74,7 @@ class IronWare < Oxidized::Model
     if vars :enable
       post_login do
         send "enable\r\n"
-        send vars(:enable) + "\r\n"
+        cmd vars(:enable)
       end
     end
     post_login ''
-- 
cgit v1.2.1


From c6a57ead5bd150128832c8cee30254846a1c22d8 Mon Sep 17 00:00:00 2001
From: boudreau <yves.boudreau@mcgill.ca>
Date: Tue, 4 Oct 2016 08:30:02 -0400
Subject: The \n is not seen as a lineline with ' it need "

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/aosw.rb b/lib/oxidized/model/aosw.rb
index 394561f..d533727 100644
--- a/lib/oxidized/model/aosw.rb
+++ b/lib/oxidized/model/aosw.rb
@@ -60,8 +60,8 @@ class AOSW < Oxidized::Model
   cfg :telnet, :ssh do
     if vars :enable
       post_login do
-        send 'enable\n'
-        send vars(:enable) + '\n'
+        send "enable\n"
+        send vars(:enable) + "\n"
       end
     end
     post_login 'no paging'
-- 
cgit v1.2.1


From 6612535aa3378b99f836b41e675bf8f92a1159e7 Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Wed, 12 Oct 2016 21:55:38 +0300
Subject: Interpolate also node variables, not just vars map

Fixes #583
---
 lib/oxidized/source/csv.rb  | 2 +-
 lib/oxidized/source/http.rb | 2 +-
 lib/oxidized/source/sql.rb  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/source/csv.rb b/lib/oxidized/source/csv.rb
index be5c4a6..d498e0b 100644
--- a/lib/oxidized/source/csv.rb
+++ b/lib/oxidized/source/csv.rb
@@ -25,7 +25,7 @@ class CSV < Source
       # map node parameters
       keys = {}
       @cfg.map.each do |key, position|
-        keys[key.to_sym] = data[position]
+        keys[key.to_sym] = node_var_interpolate data[position]
       end
       keys[:model] = map_model keys[:model] if keys.key? :model
 
diff --git a/lib/oxidized/source/http.rb b/lib/oxidized/source/http.rb
index 38387ad..dc1c0b7 100644
--- a/lib/oxidized/source/http.rb
+++ b/lib/oxidized/source/http.rb
@@ -39,7 +39,7 @@ class HTTP < Source
       # map node parameters
       keys = {}
       @cfg.map.each do |key, position|
-        keys[key.to_sym] = line[position]
+        keys[key.to_sym] = node_var_interpolate line[position]
       end
       keys[:model] = map_model keys[:model] if keys.key? :model
 
diff --git a/lib/oxidized/source/sql.rb b/lib/oxidized/source/sql.rb
index ba85447..13fc39b 100644
--- a/lib/oxidized/source/sql.rb
+++ b/lib/oxidized/source/sql.rb
@@ -26,7 +26,7 @@ class SQL < Source
     query.each do |node|
       # map node parameters
       keys = {}
-      @cfg.map.each { |key, sql_column| keys[key.to_sym] = node[sql_column.to_sym] }
+      @cfg.map.each { |key, sql_column| keys[key.to_sym] = node_var_interpolate node[sql_column.to_sym] }
       keys[:model] = map_model keys[:model] if keys.key? :model
 
       # map node specific vars
-- 
cgit v1.2.1


From 22755169b513ebde33de2704afd2f7a0b366723a Mon Sep 17 00:00:00 2001
From: Denver Abrey <denvera@gmail.com>
Date: Thu, 13 Oct 2016 22:00:33 +0200
Subject: Add key authentication to ssh input

---
 lib/oxidized/input/ssh.rb | 4 +++-
 lib/oxidized/node.rb      | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/input/ssh.rb b/lib/oxidized/input/ssh.rb
index c0b7cf9..32f4e40 100644
--- a/lib/oxidized/input/ssh.rb
+++ b/lib/oxidized/input/ssh.rb
@@ -23,6 +23,7 @@ module Oxidized
       secure = Oxidized.config.input.ssh.secure
       @log = File.open(Oxidized::Config::Log + "/#{@node.ip}-ssh", 'w') if Oxidized.config.input.debug?
       port = vars(:ssh_port) || 22
+      keys = node.auth[:private_key].is_a?(Array) ? @node.auth[:private_key] : [@node.auth[:private_key]]
       if proxy_host = vars(:ssh_proxy)
         proxy =  Net::SSH::Proxy::Command.new("ssh #{proxy_host} -W %h:%p")
       end
@@ -32,7 +33,8 @@ module Oxidized
         :paranoid => secure,
         :auth_methods => %w(none publickey password keyboard-interactive),
         :number_of_password_prompts => 0,
-        :proxy => proxy
+        :proxy => proxy,
+        :keys => keys
       }
       ssh_opts[:kex] = vars(:ssh_kex).split(/,\s*/) if vars(:ssh_kex)
       ssh_opts[:encryption] = vars(:ssh_encryption).split(/,\s*/) if vars(:ssh_encryption)
diff --git a/lib/oxidized/node.rb b/lib/oxidized/node.rb
index c93a16a..dc44df7 100644
--- a/lib/oxidized/node.rb
+++ b/lib/oxidized/node.rb
@@ -130,8 +130,9 @@ module Oxidized
     def resolve_auth opt
       # Resolve configured username/password
       {
-        username: resolve_key(:username, opt),
-        password: resolve_key(:password, opt),
+        username:       resolve_key(:username, opt),
+        password:       resolve_key(:password, opt),
+        private_key:    resolve_key(:private_key, opt),
       }
     end
 
-- 
cgit v1.2.1


From 18709601e55c8b3a610629aeae773c2233a928cd Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Fri, 14 Oct 2016 17:53:24 +0300
Subject: bump up 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 209b7d4..91e6624 100644
--- a/lib/oxidized/version.rb
+++ b/lib/oxidized/version.rb
@@ -1,3 +1,3 @@
 module Oxidized
-  VERSION = '0.17.0'
+  VERSION = '0.18.0'
 end
-- 
cgit v1.2.1


From 75534fa493013a5e563877ffc05eca6f4372999c Mon Sep 17 00:00:00 2001
From: Denver Abrey <denvera@gmail.com>
Date: Mon, 17 Oct 2016 20:42:10 +0200
Subject: Use variable vars(:ssh_keys) for private key authentication

---
 lib/oxidized/input/ssh.rb | 5 ++---
 lib/oxidized/node.rb      | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/input/ssh.rb b/lib/oxidized/input/ssh.rb
index 32f4e40..15f1427 100644
--- a/lib/oxidized/input/ssh.rb
+++ b/lib/oxidized/input/ssh.rb
@@ -23,7 +23,6 @@ module Oxidized
       secure = Oxidized.config.input.ssh.secure
       @log = File.open(Oxidized::Config::Log + "/#{@node.ip}-ssh", 'w') if Oxidized.config.input.debug?
       port = vars(:ssh_port) || 22
-      keys = node.auth[:private_key].is_a?(Array) ? @node.auth[:private_key] : [@node.auth[:private_key]]
       if proxy_host = vars(:ssh_proxy)
         proxy =  Net::SSH::Proxy::Command.new("ssh #{proxy_host} -W %h:%p")
       end
@@ -34,9 +33,9 @@ module Oxidized
         :auth_methods => %w(none publickey password keyboard-interactive),
         :number_of_password_prompts => 0,
         :proxy => proxy,
-        :keys => keys
       }
-      ssh_opts[:kex] = vars(:ssh_kex).split(/,\s*/) if vars(:ssh_kex)
+      ssh_opts[:keys] = vars(:ssh_keys).is_a?(Array) ? vars(:ssh_keys) : [vars(:ssh_keys)] if vars(:ssh_keys)
+      ssh_opts[:kex]  = vars(:ssh_kex).split(/,\s*/) if vars(:ssh_kex)
       ssh_opts[:encryption] = vars(:ssh_encryption).split(/,\s*/) if vars(:ssh_encryption)
 
       Oxidized.logger.debug "lib/oxidized/input/ssh.rb: Connecting to #{@node.name}"
diff --git a/lib/oxidized/node.rb b/lib/oxidized/node.rb
index dc44df7..b13ce0e 100644
--- a/lib/oxidized/node.rb
+++ b/lib/oxidized/node.rb
@@ -132,7 +132,6 @@ module Oxidized
       {
         username:       resolve_key(:username, opt),
         password:       resolve_key(:password, opt),
-        private_key:    resolve_key(:private_key, opt),
       }
     end
 
-- 
cgit v1.2.1


From 6ed048e1772bf236f34b3ad71f8ae40f992dd034 Mon Sep 17 00:00:00 2001
From: Denver Abrey <denvera@gmail.com>
Date: Mon, 17 Oct 2016 22:33:40 +0200
Subject: Fix blank pfSense configs being saved if regex doesn't match

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/pfsense.rb b/lib/oxidized/model/pfsense.rb
index 9982d72..55e7e85 100644
--- a/lib/oxidized/model/pfsense.rb
+++ b/lib/oxidized/model/pfsense.rb
@@ -8,6 +8,7 @@ class PfSense < Oxidized::Model
   
   cmd 'cat /cf/conf/config.xml' do |cfg|
     cfg.gsub! /\s<revision>\s*<time>\d*<\/time>\s*.*\s*.*\s*<\/revision>/, ''
+    cfg
   end
   
   cfg :ssh do
-- 
cgit v1.2.1


From d483d4e4be33c2062794d2d6aef7ce16eba223b2 Mon Sep 17 00:00:00 2001
From: Denver Abrey <denvera@gmail.com>
Date: Wed, 19 Oct 2016 01:12:48 +0200
Subject: Update regex to match newer pfSense config files

---
 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 55e7e85..c02c0d0 100644
--- a/lib/oxidized/model/pfsense.rb
+++ b/lib/oxidized/model/pfsense.rb
@@ -7,7 +7,7 @@ class PfSense < Oxidized::Model
   end
   
   cmd 'cat /cf/conf/config.xml' do |cfg|
-    cfg.gsub! /\s<revision>\s*<time>\d*<\/time>\s*.*\s*.*\s*<\/revision>/, ''
+    cfg.gsub! /\s<revision>\s*.*\s*<time>\d*<\/time>\s*.*\s*<\/revision>/, ''
     cfg
   end
   
-- 
cgit v1.2.1


From ee48fd9512df8ec839119317f58319a18a398c22 Mon Sep 17 00:00:00 2001
From: Christoffer Stokbaek <christoffers@easyspeedy.com>
Date: Tue, 25 Oct 2016 11:03:10 +0200
Subject: Added support for fujitsu blade switches

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/fujitsupy.rb b/lib/oxidized/model/fujitsupy.rb
new file mode 100644
index 0000000..20a78dd
--- /dev/null
+++ b/lib/oxidized/model/fujitsupy.rb
@@ -0,0 +1,42 @@
+class FujitsuPY < Oxidized::Model
+
+  prompt /^(\([\w.-]*\)\s#|^\S+\#\s)$/
+  comment  '! '
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+
+# 1Gbe switch
+  cmd 'show version' do |cfg|
+    cfg.gsub! /^(<ERROR> : 2 : format error)$/, ''
+    comment cfg
+  end
+
+# 10Gbe switch
+  cmd 'show system information' do |cfg|
+    cfg.gsub! /^Current-time : [\w\s:]*$/, ''
+    cfg.gsub! /^(\s{33}\^)$/, ''
+    cfg.gsub! /^(\% Invalid input detected at '\^' marker.)$/, ''
+    comment cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg
+  end
+
+  cfg :telnet do
+    username /^Username:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'no pager'
+    post_login 'terminal pager disable'
+    pre_logout do
+      send "quit\n"
+      send "n\n"
+    end
+  end
+
+end
-- 
cgit v1.2.1


From f8f5d43f732b7567dc26a2c12cc13f44a604458c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Lindsj=C3=B6?= <eric.lindsjo@glesys.se>
Date: Wed, 26 Oct 2016 09:01:37 +0200
Subject: Added Support for MRV FiberDriver Linux based management module

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/fiberdriver.rb b/lib/oxidized/model/fiberdriver.rb
new file mode 100644
index 0000000..8f8eb07
--- /dev/null
+++ b/lib/oxidized/model/fiberdriver.rb
@@ -0,0 +1,21 @@
+class FiberDriver < Oxidized::Model
+  prompt /\w+#/
+  comment "! "
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+  cmd 'show inventory' do |cfg|
+    comment cfg
+  end
+
+  cmd "show running-config" do |cfg|
+    cfg.each_line.to_a[3..-1].join
+  end
+
+  cfg :ssh do
+    post_login 'terminal length 0'
+    post_login 'terminal width 512'
+    pre_logout 'exit'
+  end
+end
-- 
cgit v1.2.1


From 449522554473f4b9a261ec06ee6961defb30f7bb Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Wed, 26 Oct 2016 13:32:01 +0300
Subject: fetch should return string, not array

Also if group was explicitly given, we referred to wrong directory
---
 lib/oxidized/output/file.rb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/output/file.rb b/lib/oxidized/output/file.rb
index 851e4c5..78db1d5 100644
--- a/lib/oxidized/output/file.rb
+++ b/lib/oxidized/output/file.rb
@@ -28,18 +28,19 @@ class OxidizedFile < Output
   end
 
   def fetch node, group
-    cfg_dir = File.expand_path @cfg.directory
+    cfg_dir   = File.expand_path @cfg.directory
     node_name = node.name
 
     if group # group is explicitly defined by user
-      IO.readlines File.join(cfg_dir, group, node_name)
+      cfg_dir = File.join File.dirname(cfg_dir), group
+      File.read File.join(cfg_dir, node_name)
     else
       if File.exists? File.join(cfg_dir, node_name) # node configuration file is stored on base directory
-        IO.readlines File.join(cfg_dir, node_name)
+        File.read File.join(cfg_dir, node_name)
       else
-        path = Dir.glob File.join(cfg_dir, '**', node_name) # fetch node in all groups
-        return nil if path[0].nil?
-        open(path[0], 'r').readlines
+        path = Dir.glob(File.join(cfg_dir, '**', node_name)).first # fetch node in all groups
+        return nil if not path
+        File.read path
       end
     end
   end
-- 
cgit v1.2.1


From 9ce9133dbf4589786329d5dad239f80882ea07ea Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Wed, 26 Oct 2016 22:08:19 +0300
Subject: return nil if we can't find file

unsure if we really should, or just raise the error and let consumer of
fetch decide what to do with the error
---
 lib/oxidized/output/file.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/output/file.rb b/lib/oxidized/output/file.rb
index 78db1d5..5327a80 100644
--- a/lib/oxidized/output/file.rb
+++ b/lib/oxidized/output/file.rb
@@ -39,10 +39,11 @@ class OxidizedFile < Output
         File.read File.join(cfg_dir, node_name)
       else
         path = Dir.glob(File.join(cfg_dir, '**', node_name)).first # fetch node in all groups
-        return nil if not path
         File.read path
       end
     end
+  rescue Errno::ENOENT
+    return nil
   end
 
   def version node, group
-- 
cgit v1.2.1


From c41b79b5a51b1b8d913c3f9c7478718bf3183a4b Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 27 Oct 2016 14:28:00 +0200
Subject: add support for the HPE BladeSystem

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/hpebladesystem.rb b/lib/oxidized/model/hpebladesystem.rb
new file mode 100644
index 0000000..5e34de8
--- /dev/null
+++ b/lib/oxidized/model/hpebladesystem.rb
@@ -0,0 +1,83 @@
+class HPEBladeSystem < Oxidized::Model
+  # HPE Onboard Administrator
+
+  prompt /.*> /
+  comment '# '
+
+  expect /^\s*--More--\s+.*$/ do |data, re|
+     send ' '
+     data.sub re, ''
+  end
+
+  cmd :all do |cfg|
+    cfg = cfg.delete("\r").each_line.to_a[0..-1].map{|line|line.rstrip}.join("\n") + "\n"
+    cfg.each_line.to_a[0..-2].join
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^(SET SNMP COMMUNITY (READ|WRITE)).*/, '\\1 <configuration removed>'
+    cfg
+  end
+
+  cmd 'show oa info' do |cfg|
+    comment cfg
+  end
+  
+  cmd 'show oa network' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show oa certificate' do |cfg|
+    comment cfg
+  end
+  
+  cmd 'show sshfingerprint' do |cfg|
+    comment cfg
+  end
+  
+  cmd 'show fru' do |cfg|
+    comment cfg
+  end
+  
+  cmd 'show network' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show vlan' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show rack name' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show server list' do |cfg|
+    comment cfg
+  end
+  
+  cmd 'show server names' do |cfg|
+    comment cfg
+  end
+  
+  cmd 'show server port map all' do |cfg|
+    comment cfg
+  end
+  
+  cmd 'show server info all' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show config' do |cfg|
+    cfg.gsub! /^#(Generated on:) .*$/, '\\1 <removed>'
+    cfg.gsub /^\s+/, ''
+  end
+  
+  cfg :telnet do
+    username /\slogin:/
+    password /^Password: /
+  end
+ 
+   cfg :telnet, :ssh do
+     pre_logout "exit"
+   end
+end
-- 
cgit v1.2.1


From 98ee2d2fadd56b9efadfc4f9ff667f71f6b22f6c Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Mon, 31 Oct 2016 17:54:47 +0200
Subject: Allow model to specify SSH PTY options

---
 lib/oxidized/input/ssh.rb      | 11 ++++++++---
 lib/oxidized/model/procurve.rb |  4 ++++
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/input/ssh.rb b/lib/oxidized/input/ssh.rb
index 15f1427..30b481d 100644
--- a/lib/oxidized/input/ssh.rb
+++ b/lib/oxidized/input/ssh.rb
@@ -17,8 +17,9 @@ module Oxidized
     class NoShell < OxidizedError; end
 
     def connect node
-      @node       = node
-      @output     = ''
+      @node        = node
+      @output      = ''
+      @pty_options = { term: "vt100" }
       @node.model.cfg['ssh'].each { |cb| instance_exec(&cb) }
       secure = Oxidized.config.input.ssh.secure
       @log = File.open(Oxidized::Config::Log + "/#{@node.ip}-ssh", 'w') if Oxidized.config.input.debug?
@@ -74,6 +75,10 @@ module Oxidized
 
     private
 
+    def pty_options hash
+      @pty_options = @pty_options.merge hash
+    end
+
     def disconnect
       disconnect_cli
       # if disconnect does not disconnect us, give up after timeout
@@ -94,7 +99,7 @@ module Oxidized
           @output << data
           @output = @node.model.expects @output
         end
-        ch.request_pty (_opts={:term=>'vt100'}) do |_ch, success_pty|
+        ch.request_pty (@pty_options) do |_ch, success_pty|
           raise NoShell, "Can't get PTY" unless success_pty
           ch.send_channel_request 'shell' do |_ch, success_shell|
             raise NoShell, "Can't get shell" unless success_shell
diff --git a/lib/oxidized/model/procurve.rb b/lib/oxidized/model/procurve.rb
index da792e6..c117df3 100644
--- a/lib/oxidized/model/procurve.rb
+++ b/lib/oxidized/model/procurve.rb
@@ -57,4 +57,8 @@ class Procurve < Oxidized::Model
     pre_logout "logout\ny\nn"
   end
 
+  cfg :ssh do
+    pty_options({ chars_wide: 1000 })
+  end
+
 end
-- 
cgit v1.2.1


From a87fc34a84a893b86d5ccb401d3bd4b9e544bfc2 Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Mon, 31 Oct 2016 17:56:37 +0200
Subject: it shouldn't be a private method

---
 lib/oxidized/input/ssh.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/input/ssh.rb b/lib/oxidized/input/ssh.rb
index 30b481d..9a5c508 100644
--- a/lib/oxidized/input/ssh.rb
+++ b/lib/oxidized/input/ssh.rb
@@ -73,12 +73,12 @@ module Oxidized
       @output
     end
 
-    private
-
     def pty_options hash
       @pty_options = @pty_options.merge hash
     end
 
+    private
+
     def disconnect
       disconnect_cli
       # if disconnect does not disconnect us, give up after timeout
-- 
cgit v1.2.1


From 2e9563eedf8dabb53a0cd3fe0ca1a1b0055c561c Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 31 Oct 2016 16:14:37 +0100
Subject: add Planet SGS switches

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/planetsgs.rb b/lib/oxidized/model/planetsgs.rb
new file mode 100644
index 0000000..c240237
--- /dev/null
+++ b/lib/oxidized/model/planetsgs.rb
@@ -0,0 +1,63 @@
+class PlanetSGS < Oxidized::Model
+
+  prompt /^\r?([\w.@()-]+[#>]\s?)$/
+  comment  '! '
+
+  # example how to handle pager
+  #expect /^\s--More--\s+.*$/ do |data, re|
+  # send ' '
+  # data.sub re, ''
+  #end
+
+  # non-preferred way to handle additional PW prompt
+  #expect /^[\w.]+>$/ do |data|
+  #  send "enable\n"
+  #  send vars(:enable) + "\n"
+  #  data
+  #end
+
+  cmd :all do |cfg|
+    #cfg.gsub! /\cH+\s{8}/, ''         # example how to handle pager
+    #cfg.gsub! /\cH+/, ''              # example how to handle pager
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  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! /^enable password \d \S+/, '<secret hidden>'
+    cfg.gsub! /wpa-psk ascii \d \S+/, '<secret hidden>'
+    cfg.gsub! /^tacacs-server key \d \S+/, '<secret hidden>'
+    cfg
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg.each_line.to_a[0..-2].join
+  end
+
+
+  cmd 'show running-config'
+  
+  cmd 'show transceiver detail | include transceiver detail information|found|Type|length|Nominal|wavelength|Base information' do |cfg|
+    comment cfg
+  end
+
+  cfg :telnet do
+    username /^Username:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'terminal length 0'
+    # preferred way to handle additional passwords
+    if vars :enable
+      post_login do
+        send "enable\n"
+        cmd vars(:enable)
+      end
+    end
+    pre_logout 'exit'
+  end
+
+end
-- 
cgit v1.2.1


From 65007bab6e94c7ba96be177c3fe8e7fdaed9587e Mon Sep 17 00:00:00 2001
From: jackson-tim <jackson.tim@gmail.com>
Date: Mon, 31 Oct 2016 17:47:05 -0500
Subject: Update dnos.rb

Handles old DNOS switches that do not allow term length 0 prior to enable, and double exits in case of enable..
---
 lib/oxidized/model/dnos.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/dnos.rb b/lib/oxidized/model/dnos.rb
index 1c31aad..a6cc05f 100644
--- a/lib/oxidized/model/dnos.rb
+++ b/lib/oxidized/model/dnos.rb
@@ -33,15 +33,16 @@ class DNOS  < Oxidized::Model
   end
 
   cfg :telnet, :ssh do
-    post_login 'terminal length 0'
-    post_login 'terminal width 0'
     if vars :enable
       post_login do
         send "enable\n"
         send vars(:enable) + "\n"
       end
     end
+    post_login 'terminal length 0'
+    post_login 'terminal width 0'
     pre_logout 'exit'
+    pre_logout 'exit'    
   end
 
 end
-- 
cgit v1.2.1


From e5dc1dedf976a12c278f68c284c976ed462cdcb4 Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Tue, 1 Nov 2016 02:04:31 +0200
Subject: expect prompt after sending enable password

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/dnos.rb b/lib/oxidized/model/dnos.rb
index a6cc05f..a44630e 100644
--- a/lib/oxidized/model/dnos.rb
+++ b/lib/oxidized/model/dnos.rb
@@ -36,7 +36,7 @@ class DNOS  < Oxidized::Model
     if vars :enable
       post_login do
         send "enable\n"
-        send vars(:enable) + "\n"
+        cmd vars(:enable)
       end
     end
     post_login 'terminal length 0'
-- 
cgit v1.2.1


From 60ee472e2cb62b6bae6ab118ec102108b81148b7 Mon Sep 17 00:00:00 2001
From: Robert Drake <rdrake@direcpath.com>
Date: Fri, 4 Nov 2016 14:17:52 -0400
Subject: Added support for Trango/Trangolink-45

I only have the Trangolink-45 so I'm not sure which other radios this
might support.
---
 lib/oxidized/model/trango.rb | 62 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 lib/oxidized/model/trango.rb

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/trango.rb b/lib/oxidized/model/trango.rb
new file mode 100644
index 0000000..b2aa1e7
--- /dev/null
+++ b/lib/oxidized/model/trango.rb
@@ -0,0 +1,62 @@
+class Trango < Oxidized::Model
+  # take a Trangolink sysinfo output and turn it into a configuration file
+  
+  prompt /^#>\s?/
+  comment  '# '
+
+  cmd 'sysinfo' do |cfg|
+    out = []
+    comments = []
+    cfg.each_line do |line|
+      if line.match /\[Opmode\] (off|on) \[Default Opmode\] (off|on)/
+        out << "opmode " + Regexp.last_match[1]
+        out << "defaultopmode " + Regexp.last_match[2]
+      end
+      if line.match /\[Tx Power\] ([\-\d]+) dBm/
+        out << "power " + Regexp.last_match[1]
+      end
+      if line.match /\[Active Channel\] (\d+) (v|h)/
+        out << "freq " + Regexp.last_match[1] + ' ' + Regexp.last_match[2]
+      end
+      if line.match /\[Peer ID\] ([A-F0-9]+)/
+        out << "peerid " + Regexp.last_match[1]
+      end
+      if line.match /\[Unit Type\] (\S+)/
+        out << "utype " + Regexp.last_match[1]
+      end
+      if line.match /\[(Hardware Version|Firmware Version|Model|S\/N)\] (\S+)/
+        comments << '# ' + Regexp.last_match[1] + ': ' + Regexp.last_match[2]
+      end
+      if line.match /\[Remarks\] (\S+)/
+        out << "remarks " + Regexp.last_match[1]
+      end
+      if line.match /\[RSSI LED\] (on|off)/
+        out << "rssiled " + Regexp.last_match[1]
+      end
+      if line.match /\[Speed\] (\d+) Mbps/
+        speed = Regexp.last_match[1]
+      end
+      if line.match /\[Tx MIR\] (\d+) Kbps/
+        out << "mir ".concat(Regexp.last_match[1])
+      end
+      if line.match /\[Auto Rate Shift\] (on|off)/
+        out << "autorateshift ".concat(Regexp.last_match[1])
+        if Regexp.last_match[1].eql? 'off'
+          out << "speed $speed"
+        end
+      end
+      if line.match /\[IP\] (\S+) \[Subnet Mask\] (\S+) \[Gateway\] (\S+)/
+        out << "ipconfig " + Regexp.last_match[1] + ' ' +
+                              Regexp.last_match[2] + ' ' +
+                              Regexp.last_match[3]
+      end
+    end 
+    comments.push(*out).join "\n"
+  end 
+
+  cfg :telnet do
+    password /Password:/
+    pre_logout 'exit'
+  end
+ 
+end
-- 
cgit v1.2.1


From 8862e0b303b2fdc4c50992cfbffbbccb9b88bc91 Mon Sep 17 00:00:00 2001
From: Robert Drake <rdrake@direcpath.com>
Date: Fri, 4 Nov 2016 14:21:09 -0400
Subject: This adds support for the Casa C1G CMTS

This will probably work for the other Casa CMTS as well.
---
 lib/oxidized/model/casa.rb | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 lib/oxidized/model/casa.rb

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/casa.rb b/lib/oxidized/model/casa.rb
new file mode 100644
index 0000000..e85c904
--- /dev/null
+++ b/lib/oxidized/model/casa.rb
@@ -0,0 +1,46 @@
+class Casa < Oxidized::Model
+  # Casa Systems CMTS
+
+  prompt /^([\w.@()-]+[#>]\s?)$/
+  comment '! '
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^(snmp community) \S+/, '\\1 <configuration removed>'
+    cfg.gsub! /^(snmp comm-tbl) \S+ \S+/, '\\1 <removed> <removed>'
+    cfg.gsub! /^(console-password encrypted) \S+/, '\\1 <secret hidden>'
+    cfg.gsub! /^(password encrypted) \S+/, '\\1 <secret hidden>'
+    cfg.gsub! /^(tacacs-server key) \S+/, '\\1 <secret hidden>'
+    cfg
+  end
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  cmd 'show system' do |cfg|
+    comment cfg.each_line.reject { |line| line.match /^\s+System (Time|Uptime): / }.join
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show run'
+
+  cfg :telnet do
+    username /^Username:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'page-off'
+    # preferred way to handle additional passwords
+    if vars :enable
+      post_login do
+        send "enable\n"
+        cmd vars(:enable)
+      end
+    end
+    pre_logout 'logout'
+  end
+end
-- 
cgit v1.2.1


From 0b903fe94c2673930f03a676b83e84277f51d010 Mon Sep 17 00:00:00 2001
From: Robert Drake <rdrake@direcpath.com>
Date: Fri, 4 Nov 2016 14:23:17 -0400
Subject: This adds support for D-Link switches

This specifically supports DES-3526/3550 series switches.
---
 lib/oxidized/model/dlink.rb | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 lib/oxidized/model/dlink.rb

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/dlink.rb b/lib/oxidized/model/dlink.rb
new file mode 100644
index 0000000..5756bad
--- /dev/null
+++ b/lib/oxidized/model/dlink.rb
@@ -0,0 +1,36 @@
+class Dlink < Oxidized::Model
+  # D-LINK Switches
+
+  prompt /^(\r*[\w.@():-]+[#>]\s?)$/
+  comment '# '
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^(create snmp community) \S+/, '\\1 <removed>'
+    cfg.gsub! /^(create snmp group) \S+/, '\\1 <removed>'
+    cfg
+  end
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[2..-2].map{|line|line.delete("\r").rstrip}.join("\n") + "\n"
+  end
+
+  cmd 'show switch' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show vlan' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show config current'
+
+  cfg :telnet do
+    username /\r*username:/
+    password /\r*password:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'disable clipaging'
+    pre_logout 'logout'
+  end
+end
-- 
cgit v1.2.1


From 2b05133b001c564676554bae05baa34a9900fbe0 Mon Sep 17 00:00:00 2001
From: Robert Drake <rdrake@direcpath.com>
Date: Fri, 4 Nov 2016 14:26:20 -0400
Subject: This adds support for Hatteras Networks devices

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/hatteras.rb b/lib/oxidized/model/hatteras.rb
new file mode 100644
index 0000000..4192cbc
--- /dev/null
+++ b/lib/oxidized/model/hatteras.rb
@@ -0,0 +1,52 @@
+class Hatteras < Oxidized::Model
+  # Hatteras Networks
+
+  prompt /^(\r?[\w.@()-]+[#>]\s?)$/
+  comment '# '
+
+  expect /WARNING: System configuration changes will be lost when the device restarts./ do |data, re|
+    send "y\r"
+    data.sub re, ''
+  end
+
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^(community) \S+/, '\\1 "<configuration removed>"'
+    cfg.gsub! /^(communityString) "\S+"/, '\\1 "<configuration removed>"'
+    cfg.gsub! /^(key) "\S+"/, '\\1 "<secret hidden>"'
+    cfg
+  end
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  cmd "show switch\r" do |cfg|
+    cfg = cfg.each_line.reject { |line| line.match /Switch uptime|Switch temperature|Last reset reason/ or
+                                          line.match /TermCpuUtil|^\s+\^$|ERROR: Bad command/ }.join
+    comment cfg
+  end
+
+  cmd "show card\r" do |cfg|
+    cfg = cfg.each_line.reject { |line| line.match /Card uptime|Card temperature|Last reset reason/ or
+                                          line.match /TermCpuUtil|^\s+\^$|ERROR: Bad command/ }.join
+    comment cfg
+  end
+
+  cmd "show sfp *\r" do |cfg|
+    comment cfg
+  end
+
+  cmd "show config run\r" do |cfg|
+    cfg
+  end
+
+  cfg :telnet do
+    username /^Login:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    pre_logout "logout\r"
+  end
+end
-- 
cgit v1.2.1


From 3da39c49e24b064af5fdd754da787e95dc2e1c06 Mon Sep 17 00:00:00 2001
From: Robert Drake <rdrake@direcpath.com>
Date: Wed, 9 Nov 2016 23:43:54 -0500
Subject: renamed  alvarion -> alvarion.rb

I believe from this:
require File.join dir, file+'.rb'

That the only way this model would work is if it has a .rb extension.  I
don't have any of these devices to test if this works.
---
 lib/oxidized/model/alvarion    | 13 -------------
 lib/oxidized/model/alvarion.rb | 13 +++++++++++++
 2 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 lib/oxidized/model/alvarion
 create mode 100644 lib/oxidized/model/alvarion.rb

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/alvarion b/lib/oxidized/model/alvarion
deleted file mode 100644
index 3c762de..0000000
--- a/lib/oxidized/model/alvarion
+++ /dev/null
@@ -1,13 +0,0 @@
-class Alvarion < Oxidized::Model
-
-  # Used in Alvarion wisp equipment
-
-  # Run this command as an instance of Model so we can access node
-  pre do
-    cmd "#{node.auth[:password]}.cfg"
-  end
-
-
-  cfg :tftp {}
-
-end
diff --git a/lib/oxidized/model/alvarion.rb b/lib/oxidized/model/alvarion.rb
new file mode 100644
index 0000000..3c762de
--- /dev/null
+++ b/lib/oxidized/model/alvarion.rb
@@ -0,0 +1,13 @@
+class Alvarion < Oxidized::Model
+
+  # Used in Alvarion wisp equipment
+
+  # Run this command as an instance of Model so we can access node
+  pre do
+    cmd "#{node.auth[:password]}.cfg"
+  end
+
+
+  cfg :tftp {}
+
+end
-- 
cgit v1.2.1


From eaaef17151017210bb20a936c89b43584914f92c Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 10 Nov 2016 22:19:40 +0100
Subject: add support for PLANET SG switches

So far, only SGS switches were supported.

Now, we check the model type during the 'show version' command, and only
execute the 'show transceiver details' command in case an SGS switch was
detected (as its not supported on SG models).
We will also strip lines containing the current System Time and Uptime.
These only appear on SG models, but it's a good idea to strip them anyways.
---
 lib/oxidized/model/planet.rb    | 83 +++++++++++++++++++++++++++++++++++++++++
 lib/oxidized/model/planetsgs.rb | 63 -------------------------------
 2 files changed, 83 insertions(+), 63 deletions(-)
 create mode 100644 lib/oxidized/model/planet.rb
 delete mode 100644 lib/oxidized/model/planetsgs.rb

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/planet.rb b/lib/oxidized/model/planet.rb
new file mode 100644
index 0000000..05a369a
--- /dev/null
+++ b/lib/oxidized/model/planet.rb
@@ -0,0 +1,83 @@
+class Planet < Oxidized::Model
+
+  prompt /^\r?([\w.@()-]+[#>]\s?)$/
+  comment  '! '
+
+  # example how to handle pager
+  #expect /^\s--More--\s+.*$/ do |data, re|
+  # send ' '
+  # data.sub re, ''
+  #end
+
+  # non-preferred way to handle additional PW prompt
+  #expect /^[\w.]+>$/ do |data|
+  #  send "enable\n"
+  #  send vars(:enable) + "\n"
+  #  data
+  #end
+
+  cmd :all do |cfg|
+    #cfg.gsub! /\cH+\s{8}/, ''         # example how to handle pager
+    #cfg.gsub! /\cH+/, ''              # example how to handle pager
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  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! /^enable password \d \S+/, '<secret hidden>'
+    cfg.gsub! /wpa-psk ascii \d \S+/, '<secret hidden>'
+    cfg.gsub! /^tacacs-server key \d \S+/, '<secret hidden>'
+    cfg
+  end
+
+  cmd 'show version' do |cfg|
+    cfg.gsub! "\n\r", "\n"
+    @planetgs = true if cfg.match /^System Name\w*:\w*GS-.*$/
+    @planetsgs = true if cfg.match /SGS-(.*) Device, Compiled on .*$/
+
+    cfg = cfg.each_line.to_a[0...-2]
+
+   # Strip system time and system uptime from planet gs switches
+    cfg = cfg.reject { |line| line.match /System Time\s*:.*/ }
+    cfg = cfg.reject { |line| line.match /System Uptime\s*:.*/ }
+
+    comment cfg.join
+  end
+
+
+  cmd 'show running-config' do |cfg|
+    cfg.gsub! "\n\r", "\n"
+    cfg = cfg.each_line.to_a
+
+    cfg = cfg.reject { |line| line.match "Building configuration..." }
+  
+    if @planetsgs
+      cfg << cmd('show transceiver detail | include transceiver detail information|found|Type|length|Nominal|wavelength|Base information') do |cfg|
+        comment cfg
+      end
+    end
+
+    cfg.join
+  end
+  
+
+  cfg :telnet do
+    username /^Username:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'terminal length 0'
+    # preferred way to handle additional passwords
+    if vars :enable
+      post_login do
+        send "enable\n"
+        cmd vars(:enable)
+      end
+    end
+    pre_logout 'exit'
+  end
+
+end
diff --git a/lib/oxidized/model/planetsgs.rb b/lib/oxidized/model/planetsgs.rb
deleted file mode 100644
index c240237..0000000
--- a/lib/oxidized/model/planetsgs.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-class PlanetSGS < Oxidized::Model
-
-  prompt /^\r?([\w.@()-]+[#>]\s?)$/
-  comment  '! '
-
-  # example how to handle pager
-  #expect /^\s--More--\s+.*$/ do |data, re|
-  # send ' '
-  # data.sub re, ''
-  #end
-
-  # non-preferred way to handle additional PW prompt
-  #expect /^[\w.]+>$/ do |data|
-  #  send "enable\n"
-  #  send vars(:enable) + "\n"
-  #  data
-  #end
-
-  cmd :all do |cfg|
-    #cfg.gsub! /\cH+\s{8}/, ''         # example how to handle pager
-    #cfg.gsub! /\cH+/, ''              # example how to handle pager
-    cfg.each_line.to_a[1..-2].join
-  end
-
-  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! /^enable password \d \S+/, '<secret hidden>'
-    cfg.gsub! /wpa-psk ascii \d \S+/, '<secret hidden>'
-    cfg.gsub! /^tacacs-server key \d \S+/, '<secret hidden>'
-    cfg
-  end
-
-  cmd 'show version' do |cfg|
-    comment cfg.each_line.to_a[0..-2].join
-  end
-
-
-  cmd 'show running-config'
-  
-  cmd 'show transceiver detail | include transceiver detail information|found|Type|length|Nominal|wavelength|Base information' do |cfg|
-    comment cfg
-  end
-
-  cfg :telnet do
-    username /^Username:/
-    password /^Password:/
-  end
-
-  cfg :telnet, :ssh do
-    post_login 'terminal length 0'
-    # preferred way to handle additional passwords
-    if vars :enable
-      post_login do
-        send "enable\n"
-        cmd vars(:enable)
-      end
-    end
-    pre_logout 'exit'
-  end
-
-end
-- 
cgit v1.2.1


From 689d4dba60de7a1faf555011f9db6fb3aef2fbea Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Fri, 11 Nov 2016 12:02:15 +0200
Subject: expect prompt after entering enable password

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/powerconnect.rb b/lib/oxidized/model/powerconnect.rb
index f0fa3df..ac36c26 100644
--- a/lib/oxidized/model/powerconnect.rb
+++ b/lib/oxidized/model/powerconnect.rb
@@ -39,7 +39,7 @@ class PowerConnect < Oxidized::Model
     if vars :enable
       post_login do
         send "enable\n"
-        send vars(:enable) + "\n"
+        cmd vars(:enable)
       end
     end
 
-- 
cgit v1.2.1


From 31e8e32509f353e5bf554714b35cf3dd799b3090 Mon Sep 17 00:00:00 2001
From: Atroskelis <fanachos@gmail.com>
Date: Fri, 18 Nov 2016 16:47:08 +0200
Subject: Update ciscosmb.rb

Adapted for SG series, not sure about SF.

Please test.
---
 lib/oxidized/model/ciscosmb.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/ciscosmb.rb b/lib/oxidized/model/ciscosmb.rb
index 3ef9a85..3d9b10d 100644
--- a/lib/oxidized/model/ciscosmb.rb
+++ b/lib/oxidized/model/ciscosmb.rb
@@ -33,14 +33,11 @@ class CiscoSMB < Oxidized::Model
     cfg
   end
 
-  cfg :telnet do
+  cfg :telnet, :ssh do
     username /^User Name:/
     password /^\r?Password:$/
-  end
-
-  cfg :telnet, :ssh do
-    post_login 'terminal datadump' # Disable pager
-    post_login 'terminal width 0'
+    post_login 'terminal len 0'
+    pre_logout 'exit' #exit returns to previous priv level, no way to quit from exec(#)
     pre_logout 'exit'
   end
 
-- 
cgit v1.2.1


From df08feadfa68eb3493a6b0e60a1ef8f667936d4d Mon Sep 17 00:00:00 2001
From: Atroskelis <fanachos@gmail.com>
Date: Fri, 18 Nov 2016 16:52:14 +0200
Subject: Update ciscosmb.rb

Forgot the username prompt change.
---
 lib/oxidized/model/ciscosmb.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/ciscosmb.rb b/lib/oxidized/model/ciscosmb.rb
index 3d9b10d..96baa7d 100644
--- a/lib/oxidized/model/ciscosmb.rb
+++ b/lib/oxidized/model/ciscosmb.rb
@@ -34,7 +34,7 @@ class CiscoSMB < Oxidized::Model
   end
 
   cfg :telnet, :ssh do
-    username /^User Name:/
+    username /^Username:/
     password /^\r?Password:$/
     post_login 'terminal len 0'
     pre_logout 'exit' #exit returns to previous priv level, no way to quit from exec(#)
-- 
cgit v1.2.1


From 9fdddda636f3f606a5eb7330e91a1c1a3a4a68a3 Mon Sep 17 00:00:00 2001
From: Atroskelis <fanachos@gmail.com>
Date: Fri, 18 Nov 2016 17:22:06 +0200
Subject: Update ciscosmb.rb

Added old commands in case of different CLI variations.
---
 lib/oxidized/model/ciscosmb.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/ciscosmb.rb b/lib/oxidized/model/ciscosmb.rb
index 96baa7d..73151f8 100644
--- a/lib/oxidized/model/ciscosmb.rb
+++ b/lib/oxidized/model/ciscosmb.rb
@@ -36,6 +36,8 @@ class CiscoSMB < Oxidized::Model
   cfg :telnet, :ssh do
     username /^Username:/
     password /^\r?Password:$/
+    post_login 'terminal datadump' # Disable pager
+    post_login 'terminal width 0'
     post_login 'terminal len 0'
     pre_logout 'exit' #exit returns to previous priv level, no way to quit from exec(#)
     pre_logout 'exit'
-- 
cgit v1.2.1


From 59e82bba2befb6ef5049ea9ae4e876327f3da158 Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Sat, 19 Nov 2016 14:16:20 +0000
Subject: Added option to disable ssl verification checks for http source

---
 lib/oxidized/source/http.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/source/http.rb b/lib/oxidized/source/http.rb
index dc1c0b7..6f16aee 100644
--- a/lib/oxidized/source/http.rb
+++ b/lib/oxidized/source/http.rb
@@ -20,6 +20,7 @@ class HTTP < Source
     uri = URI.parse(@cfg.url)
     http = Net::HTTP.new(uri.host, uri.port)
     http.use_ssl = true if uri.scheme == 'https'
+    http.verify_mode = OpenSSL::SSL::VERIFY_NONE if uri.no_check_certificate == true
 
     # map headers
     headers = {}
-- 
cgit v1.2.1


From 44574426d076c15f67ee9738b1c8c86d71910cce Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Sat, 19 Nov 2016 15:56:52 +0000
Subject: Updated config options

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/source/http.rb b/lib/oxidized/source/http.rb
index 6f16aee..4fd388b 100644
--- a/lib/oxidized/source/http.rb
+++ b/lib/oxidized/source/http.rb
@@ -20,7 +20,7 @@ class HTTP < Source
     uri = URI.parse(@cfg.url)
     http = Net::HTTP.new(uri.host, uri.port)
     http.use_ssl = true if uri.scheme == 'https'
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE if uri.no_check_certificate == true
+    http.verify_mode = OpenSSL::SSL::VERIFY_NONE unless @cfg.secure
 
     # map headers
     headers = {}
-- 
cgit v1.2.1


From 0e26ca4e877570b5ba02370768fcd758c4b03cc8 Mon Sep 17 00:00:00 2001
From: Nat Morris <nat@netflix.com>
Date: Sun, 4 Dec 2016 17:06:07 +0000
Subject: New hook: awssns - Publish messages to AWS SNS topics

---
 lib/oxidized/hook/awssns.rb | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 lib/oxidized/hook/awssns.rb

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/hook/awssns.rb b/lib/oxidized/hook/awssns.rb
new file mode 100644
index 0000000..dbc2d47
--- /dev/null
+++ b/lib/oxidized/hook/awssns.rb
@@ -0,0 +1,27 @@
+require 'aws-sdk'
+
+class AwsSns < Oxidized::Hook
+  def validate_cfg!
+    raise KeyError, 'hook.region is required' unless cfg.has_key?('region')
+    raise KeyError, 'hook.topic_arn is required' unless cfg.has_key?('topic_arn')
+  end
+
+  def run_hook(ctx)
+    sns = Aws::SNS::Resource.new(region: cfg.region)
+    topic = sns.topic(cfg.topic_arn)
+    message = {
+      :event => ctx.event.to_s
+    }
+    if ctx.node
+      message.merge!(
+        :group => ctx.node.group.to_s,
+        :model => ctx.node.model.class.name.to_s.downcase,
+        :node => ctx.node.name.to_s
+      )
+    end
+    topic.publish({
+      message: message.to_json
+    })
+  end
+
+end
-- 
cgit v1.2.1


From f15bf6ac203f3cd1774d72eb0fc16aac807f7bc0 Mon Sep 17 00:00:00 2001
From: jbaker48 <jonbaker85@gmail.com>
Date: Tue, 6 Dec 2016 21:05:23 +1100
Subject: exclude time from output

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/eos.rb b/lib/oxidized/model/eos.rb
index 75da0fa..bbcb4e2 100644
--- a/lib/oxidized/model/eos.rb
+++ b/lib/oxidized/model/eos.rb
@@ -22,7 +22,7 @@ class EOS < Oxidized::Model
     comment cfg
   end
 
-  cmd 'show running-config | no-more' do |cfg|
+  cmd 'show running-config | no-more | exclude Time:' do |cfg|
     cfg
   end
 
-- 
cgit v1.2.1


From 59851430fd2363940f435ca58c6a2fb6928d472e Mon Sep 17 00:00:00 2001
From: jbaker48 <jonbaker85@gmail.com>
Date: Tue, 6 Dec 2016 21:23:20 +1100
Subject: Update eos.rb

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/eos.rb b/lib/oxidized/model/eos.rb
index bbcb4e2..a9f3ff3 100644
--- a/lib/oxidized/model/eos.rb
+++ b/lib/oxidized/model/eos.rb
@@ -22,7 +22,7 @@ class EOS < Oxidized::Model
     comment cfg
   end
 
-  cmd 'show running-config | no-more | exclude Time:' do |cfg|
+  cmd 'show running-config | no-more | exclude ! Time:' do |cfg|
     cfg
   end
 
-- 
cgit v1.2.1


From 47e876c134da3b4f067fcd742fe8ea369b4b4747 Mon Sep 17 00:00:00 2001
From: Thane Gill <me@thanegill.com>
Date: Wed, 7 Dec 2016 08:17:44 -0800
Subject: Remove trailing whitespace and enable prompt detection

Fixes: #630
---
 lib/oxidized/model/aosw.rb | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/aosw.rb b/lib/oxidized/model/aosw.rb
index d533727..11d8442 100644
--- a/lib/oxidized/model/aosw.rb
+++ b/lib/oxidized/model/aosw.rb
@@ -28,19 +28,21 @@ class AOSW < Oxidized::Model
 
   cmd 'show version' do |cfg|
     cfg = cfg.each_line.select { |line| not line.match /Switch uptime/i }
-    comment cfg.join
+    rstrip_cfg comment cfg.join
   end
 
   cmd 'show inventory' do |cfg|
-    clean cfg
+    rstrip_cfg clean cfg
   end
 
   cmd 'show slots' do |cfg|
-    comment cfg
+    rstrip_cfg comment cfg
   end
+
   cmd 'show license' do |cfg|
-    comment cfg
+    rstrip_cfg comment cfg
   end
+
   cmd 'show running-config' do |cfg|
     out = []
     cfg.each_line do |line|
@@ -61,7 +63,7 @@ class AOSW < Oxidized::Model
     if vars :enable
       post_login do
         send "enable\n"
-        send vars(:enable) + "\n"
+        cmd vars(:enable)
       end
     end
     post_login 'no paging'
@@ -72,6 +74,15 @@ class AOSW < Oxidized::Model
     pre_logout 'exit'
   end
 
+  def rstrip_cfg cfg
+    out = []
+    cfg.each_line do |line|
+      out << line.rstrip
+    end
+    out = out.join "\n"
+    out << "\n"
+  end
+
   def clean cfg
     out = []
     cfg.each_line do |line|
-- 
cgit v1.2.1


From 61d9981aa0bc6ac014a03f3055ec432bc0c5089f Mon Sep 17 00:00:00 2001
From: Mike Rostermund <mike@kollegienet.dk>
Date: Wed, 7 Dec 2016 22:41:02 +0100
Subject: Fix suggested by ytti for issue #610

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/ciscosmb.rb b/lib/oxidized/model/ciscosmb.rb
index 73151f8..e5501d5 100644
--- a/lib/oxidized/model/ciscosmb.rb
+++ b/lib/oxidized/model/ciscosmb.rb
@@ -34,7 +34,7 @@ class CiscoSMB < Oxidized::Model
   end
 
   cfg :telnet, :ssh do
-    username /^Username:/
+    username /^User ?[nN]ame:/
     password /^\r?Password:$/
     post_login 'terminal datadump' # Disable pager
     post_login 'terminal width 0'
-- 
cgit v1.2.1


From 8dbd596ed73ff9d9cbe68093372fee799b6fd482 Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Mon, 12 Dec 2016 11:54:33 +0200
Subject: Recursively search from one dir above specified

Fixes #626
---
 lib/oxidized/output/file.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/output/file.rb b/lib/oxidized/output/file.rb
index 5327a80..45f72e1 100644
--- a/lib/oxidized/output/file.rb
+++ b/lib/oxidized/output/file.rb
@@ -38,7 +38,7 @@ class OxidizedFile < Output
       if File.exists? File.join(cfg_dir, node_name) # node configuration file is stored on base directory
         File.read File.join(cfg_dir, node_name)
       else
-        path = Dir.glob(File.join(cfg_dir, '**', node_name)).first # fetch node in all groups
+        path = Dir.glob(File.join(File.dirname(cfg_dir), '**', node_name)).first # fetch node in all groups
         File.read path
       end
     end
-- 
cgit v1.2.1


From bc64aaa7971070e21300eb1b15846ec1c7b4fdcb Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Mon, 12 Dec 2016 12:14:41 +0200
Subject: bump up 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 91e6624..073aae9 100644
--- a/lib/oxidized/version.rb
+++ b/lib/oxidized/version.rb
@@ -1,3 +1,3 @@
 module Oxidized
-  VERSION = '0.18.0'
+  VERSION = '0.19.0'
 end
-- 
cgit v1.2.1


From 72bc119966b20eb239c989ceb833051791f44007 Mon Sep 17 00:00:00 2001
From: mattttv <dev.matv@xoxy.net>
Date: Wed, 14 Dec 2016 13:31:34 +0100
Subject: delete secret password if it is called secret

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

(limited to 'lib/oxidized')

diff --git a/lib/oxidized/model/ios.rb b/lib/oxidized/model/ios.rb
index 1f099c8..3cbe0f0 100644
--- a/lib/oxidized/model/ios.rb
+++ b/lib/oxidized/model/ios.rb
@@ -26,7 +26,9 @@ class IOS < Oxidized::Model
     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 \d \S+/, '<secret hidden>'
+    cfg.gsub! /^enable secret \d \S+/, '<secret hidden>'
     cfg.gsub! /wpa-psk ascii \d \S+/, '<secret hidden>'
     cfg.gsub! /^tacacs-server key \d \S+/, '<secret hidden>'
     cfg
-- 
cgit v1.2.1