From 25dd702d92721e69dc4185205ad7bd7b65adf0ea Mon Sep 17 00:00:00 2001
From: Eric Lindsjö <eric.lindsjo@glesys.se>
Date: Fri, 20 Oct 2017 08:48:39 +0200
Subject: Fixed ever-changing output in fiberdriver model

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

(limited to 'lib')

diff --git a/lib/oxidized/model/fiberdriver.rb b/lib/oxidized/model/fiberdriver.rb
index abe8f68..7cfa847 100644
--- a/lib/oxidized/model/fiberdriver.rb
+++ b/lib/oxidized/model/fiberdriver.rb
@@ -13,7 +13,7 @@ class FiberDriver < Oxidized::Model
     cfg.each_line.to_a[3..-1].join
     cfg.gsub! /^Building configuration.*$/, ''
     cfg.gsub! /^Current configuration:.*$$/, ''
-    cfg.gsub! /^! Configuration saved on .*$/, ''
+    cfg.gsub! /^! Configuration (saved|generated) on .*$/, ''
     cfg
   end
 
-- 
cgit v1.2.3


From b43505e85193c28fbb39689542da229d057524fa Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Wed, 1 Nov 2017 22:18:30 +0000
Subject: release: Bump version to 0.21.0 (#1081)

---
 Gemfile.lock            | 2 +-
 lib/oxidized/version.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/Gemfile.lock b/Gemfile.lock
index 229a55c..6ee594f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oxidized (0.20.0)
+    oxidized (0.21.0)
       asetus (~> 0.1)
       net-ssh (~> 3.0.2)
       net-telnet (~> 0)
diff --git a/lib/oxidized/version.rb b/lib/oxidized/version.rb
index 221cffa..9a92133 100644
--- a/lib/oxidized/version.rb
+++ b/lib/oxidized/version.rb
@@ -1,3 +1,3 @@
 module Oxidized
-  VERSION = '0.20.0'
+  VERSION = '0.21.0'
 end
-- 
cgit v1.2.3


From 853480fca54492a38feaa4fa76941e88f54f11a8 Mon Sep 17 00:00:00 2001
From: mortzu <mortzu@users.noreply.github.com>
Date: Wed, 8 Nov 2017 22:48:51 +0100
Subject: feature: Added hook for XMPP MUC (#951)

* Added hook for XMPP MUC

* Updated dockerfile

* Added timeout to prevent oxidized to stop on XMPP error

* Updated README
---
 Dockerfile                    |  1 +
 docs/Hooks.md                 | 25 ++++++++++++++++++
 lib/oxidized/hook/xmppdiff.rb | 60 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+)
 create mode 100644 lib/oxidized/hook/xmppdiff.rb

(limited to 'lib')

diff --git a/Dockerfile b/Dockerfile
index a72a925..49ebb6e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,6 +18,7 @@ RUN gem install oxidized-web --no-ri --no-rdoc
 # dependencies for hooks
 RUN gem install aws-sdk
 RUN gem install slack-api
+RUN gem install xmpp4r
 
 RUN rm -rf /tmp/oxidized
 
diff --git a/docs/Hooks.md b/docs/Hooks.md
index 12e3ab7..bf6ea54 100644
--- a/docs/Hooks.md
+++ b/docs/Hooks.md
@@ -141,3 +141,28 @@ hooks:
 ```
 
 Note the channel name must be in quotes.
+
+## Hook type: xmppdiff
+
+The `xmppdiff` hook posts config diffs to a [XMPP](https://en.wikipedia.org/wiki/XMPP) chatroom of your choice. It only triggers for `post_store` events.
+
+You will need to manually install the `xmpp4r` gem on your system:
+
+```
+gem install xmpp4r
+```
+
+Configuration example:
+
+``` yaml
+hooks:
+  slack:
+    type: xmppdiff
+    events: [post_store]
+    jid: "user@server.tld/resource"
+    password: "password"
+    channel: "room@server.tld"
+    nick: "nickname"
+```
+
+Note the channel name must be in quotes.
diff --git a/lib/oxidized/hook/xmppdiff.rb b/lib/oxidized/hook/xmppdiff.rb
new file mode 100644
index 0000000..396d1b3
--- /dev/null
+++ b/lib/oxidized/hook/xmppdiff.rb
@@ -0,0 +1,60 @@
+require 'xmpp4r'
+require 'xmpp4r/muc/helper/simplemucclient'
+
+class XMPPDiff < Oxidized::Hook
+  def validate_cfg!
+    raise KeyError, 'hook.jid is required' unless cfg.has_key?('jid')
+    raise KeyError, 'hook.password is required' unless cfg.has_key?('password')
+    raise KeyError, 'hook.channel is required' unless cfg.has_key?('channel')
+    raise KeyError, 'hook.nick is required' unless cfg.has_key?('nick')
+ end
+
+  def run_hook(ctx)
+    if ctx.node
+      if ctx.event.to_s == "post_store"
+        begin
+          Timeout::timeout(15) do
+            gitoutput = ctx.node.output.new
+            diff = gitoutput.get_diff ctx.node, ctx.node.group, ctx.commitref, nil
+
+            interesting = diff[:patch].lines.to_a[4..-1].any? { |line|
+              ["+", "-"].include?(line[0]) and not ["#", "!"].include?(line[1])
+            }
+            interesting &&= diff[:patch].lines.to_a[5..-1].any? { |line| line[0] == '-' }
+            interesting &&= diff[:patch].lines.to_a[5..-1].any? { |line| line[0] == '+' }
+
+            if interesting
+              log "Connecting to XMPP"
+              client = Jabber::Client.new(Jabber::JID.new(cfg.jid))
+              client.connect
+              sleep 1
+              client.auth(cfg.password)
+              sleep 1
+
+              log "Connected"
+
+              m = Jabber::MUC::SimpleMUCClient.new(client)
+              m.join(cfg.channel + "/" + cfg.nick)
+
+              log "Joined"
+
+              title = "#{ctx.node.name.to_s} #{ctx.node.group.to_s} #{ctx.node.model.class.name.to_s.downcase}"
+              log "Posting diff as snippet to #{cfg.channel}"
+
+              m.say(title + "\n\n" + diff[:patch].lines.to_a[4..-1].join)
+
+              sleep 1
+
+              client.close
+
+              log "Finished"
+
+            end
+          end
+        rescue Timeout::Error
+          log "timed out"
+        end
+      end
+    end
+  end
+end
-- 
cgit v1.2.3


From aa0e1808f25e5e8b1a76f34c29f2eeb7db75a7c7 Mon Sep 17 00:00:00 2001
From: Nat Morris <nat@nuqe.net>
Date: Thu, 9 Nov 2017 22:14:37 +0000
Subject: feature: Slack hook - optionally disable diff snippets and post
 custom messages (#763)

* continue to diffs by default, but optionally post formatted messages

* updated readme

* remove static channel name

* Update Hooks.md
---
 docs/Hooks.md                  | 13 +++++++++++++
 lib/oxidized/hook/slackdiff.rb | 40 ++++++++++++++++++++++++++++++----------
 2 files changed, 43 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/docs/Hooks.md b/docs/Hooks.md
index bf6ea54..ca99034 100644
--- a/docs/Hooks.md
+++ b/docs/Hooks.md
@@ -140,6 +140,19 @@ hooks:
     channel: "#network-changes"
 ```
 
+Optionally you can disable snippets and post a formatted message, for instance linking to a commit in a git repo. Named parameters `%{node}`, `%{group}`, `%{model}` and `%{commitref}` are available.
+
+``` yaml
+hooks:
+  slack:
+    type: slackdiff
+    events: [post_store]
+    token: SLACK_BOT_TOKEN
+    channel: "#network-changes"
+    diff: false
+    message: "%{node} %{group} %{model} updated https://git.intranet/network-changes/commit/%{commitref}"
+```
+
 Note the channel name must be in quotes.
 
 ## Hook type: xmppdiff
diff --git a/lib/oxidized/hook/slackdiff.rb b/lib/oxidized/hook/slackdiff.rb
index 61f1743..728e5a7 100644
--- a/lib/oxidized/hook/slackdiff.rb
+++ b/lib/oxidized/hook/slackdiff.rb
@@ -1,5 +1,8 @@
 require 'slack'
 
+# defaults to posting a diff, if messageformat is supplied them a message will be posted too
+# diffenable defaults to true
+
 class SlackDiff < Oxidized::Hook
   def validate_cfg!
     raise KeyError, 'hook.token is required' unless cfg.has_key?('token')
@@ -17,16 +20,33 @@ class SlackDiff < Oxidized::Hook
         client = Slack::Client.new
         client.auth_test
         log "Connected"
-        gitoutput = ctx.node.output.new
-        diff = gitoutput.get_diff ctx.node, ctx.node.group, ctx.commitref, nil
-        title = "#{ctx.node.name.to_s} #{ctx.node.group.to_s} #{ctx.node.model.class.name.to_s.downcase}"
-        log "Posting diff as snippet to #{cfg.channel}"
-        client.files_upload(channels: cfg.channel, as_user: true,
-                             content: diff[:patch].lines.to_a[4..-1].join,
-                             filetype: "diff",
-                             title: title,
-                             filename: "change"
-                            )
+        # diff snippet - default
+        diffenable = true
+        if cfg.has_key?('diff') == true
+          if cfg.diff == false
+            diffenable = false
+          end
+        end
+        if diffenable == true
+          gitoutput = ctx.node.output.new
+          diff = gitoutput.get_diff ctx.node, ctx.node.group, ctx.commitref, nil
+          title = "#{ctx.node.name.to_s} #{ctx.node.group.to_s} #{ctx.node.model.class.name.to_s.downcase}"
+          log "Posting diff as snippet to #{cfg.channel}"
+          client.files_upload(channels: cfg.channel, as_user: true,
+                              content: diff[:patch].lines.to_a[4..-1].join,
+                              filetype: "diff",
+                              title: title,
+                              filename: "change"
+                             )
+        end
+        # message custom formatted - optional
+        if cfg.has_key?('message') == true
+          log cfg.message
+          msg = cfg.message % {:node => ctx.node.name.to_s, :group => ctx.node.group.to_s, :commitref => ctx.commitref, :model => ctx.node.model.class.name.to_s.downcase}
+          log msg
+          log "Posting message to #{cfg.channel}"
+          client.chat_postMessage(channel: cfg.channel, text: msg,  as_user: true)
+        end
         log "Finished"
       end
     end
-- 
cgit v1.2.3


From 4203e00cbde157e767e8be39ffdcecb30db14e6b Mon Sep 17 00:00:00 2001
From: Nicholas Meredith <nick@ndm.id.au>
Date: Sun, 12 Nov 2017 05:48:55 +1000
Subject: fix: Fix prompt pattern for model/comware.rb to handle ASCII Bell
 response +fix minor README.md typo (#1094)

* comware.rb: update prompt to work when trailing ^G ASCII 7 (bell) is sent

* README.md: correct typo 'HTT' to 'HTTP' for Configuration / Outputs paragraph

* model/comware.rb: cleaning out some comments
---
 README.md                     | 2 +-
 lib/oxidized/model/comware.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/README.md b/README.md
index 17b305b..2262d79 100644
--- a/README.md
+++ b/README.md
@@ -234,7 +234,7 @@ Oxidized supports [CSV](docs/Configuration.md#source-csv),  [SQLite](docs/Config
 
 ## Outputs
 
-Possible outputs are either [File](docs/Configuration.md#output-file), [GIT](docs/Configuration.md#output-git), [GIT-Crypt](docs/Configuration.md#output-git-crypt) and [HTT](docs/Configuration.md#output-http). The file backend takes a destination directory as argument and will keep a file per device, with most recent running version of a device. The GIT backend (recommended) will initialize an empty GIT repository in the specified path and create a new commit on every configuration change. The GIT-Crypt backend will also initialize a GIT repository but every configuration push to it will be encrypted on the fly by using `git-crypt` tool. Take a look at the [Configuration](docs/Configuration.md) for more details.
+Possible outputs are either [File](docs/Configuration.md#output-file), [GIT](docs/Configuration.md#output-git), [GIT-Crypt](docs/Configuration.md#output-git-crypt) and [HTTP](docs/Configuration.md#output-http). The file backend takes a destination directory as argument and will keep a file per device, with most recent running version of a device. The GIT backend (recommended) will initialize an empty GIT repository in the specified path and create a new commit on every configuration change. The GIT-Crypt backend will also initialize a GIT repository but every configuration push to it will be encrypted on the fly by using `git-crypt` tool. Take a look at the [Configuration](docs/Configuration.md) for more details.
 
 Maps define how to map a model's fields to model [model fields](https://github.com/ytti/oxidized/tree/master/lib/oxidized/model). Most of the settings should be self explanatory, log is ignored if `use_syslog`(requires Ruby >= 2.0) is set to `true`.
 
diff --git a/lib/oxidized/model/comware.rb b/lib/oxidized/model/comware.rb
index d926854..a5b7190 100644
--- a/lib/oxidized/model/comware.rb
+++ b/lib/oxidized/model/comware.rb
@@ -1,8 +1,8 @@
 class Comware < Oxidized::Model
   # HP (A-series)/H3C/3Com Comware
   
-  # sometimes the prompt might have a leading nul
-  prompt /^\0*(<[\w.-]+>)$/
+  # sometimes the prompt might have a leading nul or trailing ASCII Bell (^G)
+  prompt /^\0*(<[\w.-]+>).?$/
   comment '# '
 
   # example how to handle pager
-- 
cgit v1.2.3


From 40cfa7b7cfba0d0a655fe2148ad9336414e89737 Mon Sep 17 00:00:00 2001
From: pv2b <pvz@pvz.pp.se>
Date: Wed, 15 Nov 2017 23:02:27 +0100
Subject: fix: Netgear model: Permit . as valid character in prompt (#1099)

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

(limited to 'lib')

diff --git a/lib/oxidized/model/netgear.rb b/lib/oxidized/model/netgear.rb
index 38aaca7..0ab1349 100644
--- a/lib/oxidized/model/netgear.rb
+++ b/lib/oxidized/model/netgear.rb
@@ -1,7 +1,7 @@
 class Netgear < Oxidized::Model
 
   comment '!'
-  prompt /^(\([\w-]+\)\s[#>])$/
+  prompt /^(\([\w\-.]+\)\s[#>])$/
 
   cmd :secret do |cfg|
     cfg.gsub!(/password (\S+)/, 'password <hidden>')
-- 
cgit v1.2.3


From 8bef76580a3e848836f3f12fe9e6c50380dbe01e Mon Sep 17 00:00:00 2001
From: pv2b <pvz@pvz.pp.se>
Date: Sat, 18 Nov 2017 10:59:28 +0100
Subject: model: Procurve Handle switch selection for stack commanders (#1104)

When trying to connect to a HP Procurve Switch with stacking enabled,
you are asked to choose which switch to connect to to manage.

This patch makes it so that if this question is encountered, just press
"Enter" to choose the stack commander.

This won't make backing up stack members work (they still need to be
configured seperately and given IP addresses, making stacking useless)
but at least it makes it possible to back up a commander in a stack
seperately.

Fixed #1070

Credit to @stiltzkin10 for this fix.
---
 lib/oxidized/model/procurve.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lib')

diff --git a/lib/oxidized/model/procurve.rb b/lib/oxidized/model/procurve.rb
index 180b703..11d7ea9 100644
--- a/lib/oxidized/model/procurve.rb
+++ b/lib/oxidized/model/procurve.rb
@@ -21,6 +21,11 @@ class Procurve < Oxidized::Model
     ""
   end
 
+  expect /Enter switch number/ do
+    send "\n"
+    ""
+  end
+
   cmd :all do |cfg|
     cfg = cfg.each_line.to_a[1..-2].join
     cfg = cfg.gsub /^\r/, ''
-- 
cgit v1.2.3


From 115764f3b2d20b3732a8d81c38afaea19c11dad8 Mon Sep 17 00:00:00 2001
From: pv2b <pvz@pvz.pp.se>
Date: Mon, 20 Nov 2017 09:16:44 +0100
Subject: feature: Added model information to exec hook (#1105)

* Add OX_NODE_MODEL to exec hook

* Update docs to reflect added OX_NODE_MSG to hook
---
 docs/Hooks.md             | 1 +
 lib/oxidized/hook/exec.rb | 1 +
 2 files changed, 2 insertions(+)

(limited to 'lib')

diff --git a/docs/Hooks.md b/docs/Hooks.md
index 7d503a3..fab4025 100644
--- a/docs/Hooks.md
+++ b/docs/Hooks.md
@@ -26,6 +26,7 @@ OX_NODE_IP
 OX_NODE_FROM
 OX_NODE_MSG
 OX_NODE_GROUP
+OX_NODE_MODEL
 OX_JOB_STATUS
 OX_JOB_TIME
 OX_REPO_COMMITREF
diff --git a/lib/oxidized/hook/exec.rb b/lib/oxidized/hook/exec.rb
index a9a5950..3f984c2 100644
--- a/lib/oxidized/hook/exec.rb
+++ b/lib/oxidized/hook/exec.rb
@@ -71,6 +71,7 @@ class Exec < Oxidized::Hook
         "OX_NODE_FROM" => ctx.node.from.to_s,
         "OX_NODE_MSG" => ctx.node.msg.to_s,
         "OX_NODE_GROUP" => ctx.node.group.to_s,
+        "OX_NODE_MODEL" => ctx.node.model.class.name,
         "OX_REPO_COMMITREF" => ctx.commitref.to_s,
         "OX_REPO_NAME" => ctx.node.repo.to_s,
       )
-- 
cgit v1.2.3


From 99220b9947946d5ad1e53cba6a343e942ce0c498 Mon Sep 17 00:00:00 2001
From: pv2b <pvz@pvz.pp.se>
Date: Tue, 21 Nov 2017 09:03:48 +0100
Subject: model: Added support for Opnsense (#1111)

* Add OPNsense model

* Fix class name

* Mention support for OPNsense in Supported OS types
---
 docs/Supported-OS-Types.md     |  1 +
 lib/oxidized/model/opnsense.rb | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 lib/oxidized/model/opnsense.rb

(limited to 'lib')

diff --git a/docs/Supported-OS-Types.md b/docs/Supported-OS-Types.md
index 9176f2e..99566c4 100644
--- a/docs/Supported-OS-Types.md
+++ b/docs/Supported-OS-Types.md
@@ -117,6 +117,7 @@
    * [OneOS](/lib/oxidized/model/oneos.rb)
  * Opengear
    * [Opengear](/lib/oxidized/model/opengear.rb)
+ * [OPNsense](/lib/oxidized/model/opnsense.rb)
  * Palo Alto
    * [PANOS](/lib/oxidized/model/panos.rb)
  * [PLANET SG/SGS Switches](/lib/oxidized/model/planet.rb)
diff --git a/lib/oxidized/model/opnsense.rb b/lib/oxidized/model/opnsense.rb
new file mode 100644
index 0000000..b874fca
--- /dev/null
+++ b/lib/oxidized/model/opnsense.rb
@@ -0,0 +1,21 @@
+class OpnSense < Oxidized::Model
+
+  # minimum required permissions: "System: Shell account access"
+  # must enable SSH and password-based SSH access
+  
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-1].join
+  end
+  
+  cmd 'cat /conf/config.xml' do |cfg|
+    cfg.gsub! /\s<revision>\s*<time>\d*<\/time>\s*.*\s*.*\s*<\/revision>/, ''
+    cfg.gsub! /\s<last_rule_upd_time>\d*<\/last_rule_upd_time>/, ''
+    cfg
+  end
+  
+  cfg :ssh do
+    exec true
+    pre_logout 'exit'
+  end
+ 
+end
-- 
cgit v1.2.3


From da8923512737f0d9383feaebaf43e781e914b71e Mon Sep 17 00:00:00 2001
From: Michael Baker <elmobp@users.noreply.github.com>
Date: Thu, 23 Nov 2017 06:18:41 +0800
Subject: fix: GPG bug fix when loading file (#1109)

* GPG bug fix

* Update Sources.md

* Update README.md
---
 README.md                  |  3 ---
 docs/Sources.md            | 25 +++++++++++++++++++++++++
 lib/oxidized/source/csv.rb |  4 ++--
 3 files changed, 27 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/README.md b/README.md
index 2262d79..d501cb5 100644
--- a/README.md
+++ b/README.md
@@ -246,15 +246,12 @@ oxidized
 
 Now tell Oxidized where it finds a list of network devices to backup configuration from. You can either use CSV or SQLite as source. To create a CSV source add the following snippet:
 
-Note: If gpg is set to anything other than false it will attempt to decrypt the file contents
 ```
 source:
   default: csv
   csv:
     file: ~/.config/oxidized/router.db
     delimiter: !ruby/regexp /:/
-    gpg: false
-    gpg_password: 'password'
     map:
       name: 0
       model: 1
diff --git a/docs/Sources.md b/docs/Sources.md
index b04261c..7029b72 100644
--- a/docs/Sources.md
+++ b/docs/Sources.md
@@ -26,6 +26,31 @@ Example csv `/var/lib/oxidized/router.db`:
 rtr01.local:192.168.1.1:ios:oxidized:5uP3R53cR3T:T0p53cR3t
 ```
 
+If you would like to use a GPG encrypted file as the source then you can use the following example:
+
+```yaml
+source:
+  default: csv
+  csv:
+    file: ~/.config/oxidized/router.db
+    delimiter: !ruby/regexp /:/
+    gpg: true
+    gpg_password: 'password'
+    map:
+      name: 0
+      model: 1
+```
+
+> Please note, if you are running GPG v2 then you will be prompted for your gpg password on start up, if you use GPG >= 2.1 then you can add the following config to stop that behaviour:
+
+> Within `~/.gnupg/gpg-agent.conf`
+
+> `allow-loopback-pinentry`
+
+> and within: `~/.gnupg/gpg.conf`
+
+> `pinentry-mode loopback`
+
 ### Source: SQL
  Oxidized uses the `sequel` ruby gem. You can use a variety of databases that aren't explicitly listed. For more information visit https://github.com/jeremyevans/sequel Make sure you have the correct adapter!
 ### Source: MYSQL
diff --git a/lib/oxidized/source/csv.rb b/lib/oxidized/source/csv.rb
index c1e310a..27cb49e 100644
--- a/lib/oxidized/source/csv.rb
+++ b/lib/oxidized/source/csv.rb
@@ -21,9 +21,9 @@ class CSV < Source
   def load
     nodes = []
     file = File.expand_path(@cfg.file)
-    file = if @cfg.gpg?
+    if @cfg.gpg?
       crypto = GPGME::Crypto.new password: @cfg.gpg_password
-      crypto.decrypt(file).to_s
+      file = crypto.decrypt(File.open(file)).to_s
     else
       open(file)
     end  
-- 
cgit v1.2.3


From 919c46b85a78b63fc770bde1aaee91bcdd66dc84 Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Thu, 23 Nov 2017 08:16:00 +0000
Subject: fixed csv source (#1113)

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

(limited to 'lib')

diff --git a/lib/oxidized/source/csv.rb b/lib/oxidized/source/csv.rb
index 27cb49e..4814bd7 100644
--- a/lib/oxidized/source/csv.rb
+++ b/lib/oxidized/source/csv.rb
@@ -21,7 +21,7 @@ class CSV < Source
   def load
     nodes = []
     file = File.expand_path(@cfg.file)
-    if @cfg.gpg?
+    file = if @cfg.gpg?
       crypto = GPGME::Crypto.new password: @cfg.gpg_password
       file = crypto.decrypt(File.open(file)).to_s
     else
-- 
cgit v1.2.3


From d2a9c75b02eb18f13121c9f653a443f58682505b Mon Sep 17 00:00:00 2001
From: Mikaël Mantel <mikaelmantel@users.noreply.github.com>
Date: Mon, 4 Dec 2017 21:18:27 +0100
Subject: model: Added support for SLX-OS (#1056)

* Add support for SLX-OS

* Remove commented code

* Add SLX-OS on the list of Supported OS Types

* Replace tabs with spaces

* Regex modification for remove the display of uptime
---
 docs/Supported-OS-Types.md  | 11 ++++----
 lib/oxidized/model/slxos.rb | 61 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 lib/oxidized/model/slxos.rb

(limited to 'lib')

diff --git a/docs/Supported-OS-Types.md b/docs/Supported-OS-Types.md
index 99566c4..a6ee713 100644
--- a/docs/Supported-OS-Types.md
+++ b/docs/Supported-OS-Types.md
@@ -27,11 +27,12 @@
    * [VOSS (VSP Operating System Software)](/lib/oxidized/model/voss.rb)
    * [BOSS (Baystack Operating System Software)](/lib/oxidized/model/boss.rb)
  * Brocade
-   * [FabricOS](/lib/oxidized/model/fabricos.rb)
-   * [Ironware](/lib/oxidized/model/ironware.rb)
-   * [NOS (Network Operating System)](/lib/oxidized/model/nos.rb)
-   * [Vyatta](/lib/oxidized/model/vyatta.rb)
-   * [6910](/lib/oxidized/model/br6910.rb)
+   * [FabricOS](lib/oxidized/model/fabricos.rb)
+   * [Ironware](lib/oxidized/model/ironware.rb)
+   * [NOS (Network Operating System)](lib/oxidized/model/nos.rb)
+   * [Vyatta](lib/oxidized/model/vyatta.rb)
+   * [6910](lib/oxidized/model/br6910.rb)
+   * [SLX-OS](lib/oxidized/model/slxos.rb)
  * Casa
    * [Casa](/lib/oxidized/model/casa.rb)
  * Check Point
diff --git a/lib/oxidized/model/slxos.rb b/lib/oxidized/model/slxos.rb
new file mode 100644
index 0000000..934da5b
--- /dev/null
+++ b/lib/oxidized/model/slxos.rb
@@ -0,0 +1,61 @@
+class SLXOS < Oxidized::Model
+
+  prompt /^.*[>#]\s?$/i
+  comment  '! '
+
+  cmd 'show version' do |cfg|
+    cfg.gsub! /(^((.*)[Ss]ystem [Uu]ptime(.*))$)/, '' #remove unwanted line system uptime
+    cfg.gsub! /[Uu]p\s?[Tt]ime is .*/,''
+
+    comment cfg
+  end
+
+  cmd 'show chassis' do |cfg|
+    cfg.encode!("UTF-8", :invalid => :replace, :undef => :replace) #sometimes ironware returns broken encoding
+        cfg.gsub! /.*Power Usage.*/, '' #remove unwanted lines power usage
+        cfg.gsub! /Time A(live|wake).*/, '' #remove unwanted lines time alive/awake
+    cfg.gsub! /([\[]*)1([\]]*)<->([\[]*)2([\]]*)(<->([\[]*)3([\]]*))*/, ''
+
+    comment cfg
+  end
+
+  cmd 'show system' do |cfg|
+        cfg.gsub! /Up Time.*/, '' #removes uptime line
+        cfg.gsub! /Current Time.*/, '' #remove current time line
+        cfg.gsub! /.*speed is.*/, '' #removes fan speed lines
+
+    comment cfg
+  end
+
+  cmd 'show slots' do |cfg|
+    cfg.gsub! /^-*^$/, '' # some slx devices are fixed config
+        cfg.gsub! /syntax error: element does not exist/, '' # same as above
+
+    comment cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    arr = cfg.each_line.to_a
+    arr[2..-1].join unless arr.length < 2
+  end
+
+  cfg :telnet do
+    # match expected prompts
+    username /^(Please Enter Login Name|Username):/
+    password /^(Please Enter Password ?|Password):/
+  end
+
+  #handle pager with enable
+  cfg :telnet, :ssh do
+    if vars :enable
+      post_login do
+        send "enable\n"
+        cmd vars(:enable)
+      end
+    end
+    post_login ''
+    post_login 'terminal length 0'
+        pre_logout 'exit'
+  end
+
+end
-- 
cgit v1.2.3


From 7e6dc8cce71d6e2753a4e865d8bfbcd347fe1f8a Mon Sep 17 00:00:00 2001
From: Frederik Kriewitz <frederik@kriewitz.eu>
Date: Sun, 10 Dec 2017 21:53:14 +0100
Subject: model: Add support for Broadband Network Platform Software from GCOM
 Technologies Co.,Ltd. (#1097)

* Add support for Broadband Network Platform Software from GCOM Technologies Co.,Ltd.

* requested changes
---
 docs/Supported-OS-Types.md     |  4 ++
 lib/oxidized/model/gcombnps.rb | 85 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+)
 create mode 100644 lib/oxidized/model/gcombnps.rb

(limited to 'lib')

diff --git a/docs/Supported-OS-Types.md b/docs/Supported-OS-Types.md
index a6ee713..c2035b0 100644
--- a/docs/Supported-OS-Types.md
+++ b/docs/Supported-OS-Types.md
@@ -77,6 +77,8 @@
    * [XOS](/lib/oxidized/model/xos.rb)
  * F5
    * [TMOS](/lib/oxidized/model/tmos.rb)
+ * Fiberstore
+   * [S3800](/lib/oxidized/model/gcombnps.rb)
  * Force10
    * [DNOS](/lib/oxidized/model/dnos.rb)
    * [FTOS](/lib/oxidized/model/ftos.rb)
@@ -84,6 +86,8 @@
    * [FortiOS](/lib/oxidized/model/fortios.rb)
  * Fujitsu
    * [PRIMERGY Blade switch 1/10Gbe](/lib/oxidized/model/fujitsupy.rb)
+ * GCOM Technologies
+   * [Broadband Network Platform Software](/lib/oxidized/model/gcombnps.rb)
  * Hatteras
    * [Hatteras](/lib/oxidized/model/hatteras.rb)
  * Hirschmann
diff --git a/lib/oxidized/model/gcombnps.rb b/lib/oxidized/model/gcombnps.rb
new file mode 100644
index 0000000..4a97162
--- /dev/null
+++ b/lib/oxidized/model/gcombnps.rb
@@ -0,0 +1,85 @@
+class GcomBNPS < Oxidized::Model
+  # For switches from GCOM Technologies Co.,Ltd. running the "Broadband Network Platform Software"
+  # Author: Frederik Kriewitz <frederik@kriewitz.eu>
+  #
+  # tested with:
+  #  - S5330 (aka Fiberstore S3800)
+
+  prompt /^\r?([\w.@()-]+?(\(1-16 chars\))?[#>:]\s?)$/ # also match SSH password promt (post_login commands are sent after the first prompt)
+  comment  '! '
+
+# alternative to handle the SSH login, but this breaks telnet
+#  expect /^Password\(1-16 chars\):/ do |data|
+#      send @node.auth[:password] + "\n"
+#      ''
+#  end
+
+  # handle pager (can't be disabled?)
+  expect /^\.\.\.\.press ENTER to next line, CTRL_C to quit, other key to next page\.\.\.\.$/ do |data, re|
+   send ' '
+   data.sub re, ''
+  end
+
+  cmd :all do |cfg|
+    cfg = cfg.gsub " \e[73D\e[K", '' # remove garbage remaining from the pager
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^(snmp-server community)\s+[^\s]+\s+(.*)/, '\\1 <community hidden> \\2'
+    cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg
+  end
+
+  cmd 'show interface sfp' do |cfg|
+    out = []
+    cfg.each_line do |line|
+      next if line.match /^  Temperature/
+      next if line.match /^  Voltage\(V\)/
+      next if line.match /^  Bias Current\(mA\)/
+      next if line.match /^  RX Power\(dBM\)/
+      next if line.match /^  TX Power\(dBM\)/
+      out << line
+    end
+
+    comment out.join
+  end
+
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show system' do |cfg|
+    out = []
+    cfg.each_line do |line|
+      next if line.match /^system run time        :/
+      next if line.match /^switch temperature     :/
+      out << line
+    end
+
+    comment out.join
+  end
+
+  cfg :telnet do
+    username /^Username\(1-32 chars\):/
+    password /^Password\(1-16 chars\):/
+  end
+
+  cfg :ssh do
+    # the switch blindy accepts the SSH connection without password validation and then spawns a telnet login prompt
+    # first thing we've to send is the password
+    post_login do
+      send @node.auth[:password] + "\n"
+    end
+  end
+
+  cfg :telnet, :ssh do
+    pre_logout 'exit'
+  end
+
+end
+
-- 
cgit v1.2.3


From 3fec19ba5b6b9cc2aabb7d57d2c0e2fb2a984cef Mon Sep 17 00:00:00 2001
From: Bruno Brito Carvalho <brunoricardobritocarvalho@gmail.com>
Date: Sun, 10 Dec 2017 21:54:32 +0100
Subject: mode: Hide snmp community for IOS (#1077)

* Hide snmp community

Community is displayed next to this line (old ios versions)

* Updating as suggested

Thanks @ZacharyPuls

* Was missing a /

* Was missing the last /

I missed that one yesterday. Sorry, making those changes from browser, many useless commits.
---
 lib/oxidized/model/ios.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/oxidized/model/ios.rb b/lib/oxidized/model/ios.rb
index 0cb2f3a..4e7d223 100644
--- a/lib/oxidized/model/ios.rb
+++ b/lib/oxidized/model/ios.rb
@@ -26,6 +26,7 @@ class IOS < Oxidized::Model
 
   cmd :secret do |cfg|
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
+    cfg.gsub! /^(snmp-server host \S+( vrf \S+)?( version (1|2c|3))?)\s+\S+((\s+\S*)*)\s*/, '\\1 <secret hidden> \\5'
     cfg.gsub! /^(username \S+ privilege \d+) (\S+).*/, '\\1 <secret hidden>'
     cfg.gsub! /^(username \S+ password \d) (\S+)/, '\\1 <secret hidden>'
     cfg.gsub! /^(username \S+ secret \d) (\S+)/, '\\1 <secret hidden>'
-- 
cgit v1.2.3


From 7b98d724002963e0e9dfce59ce024fd69b19ac13 Mon Sep 17 00:00:00 2001
From: sfini <30525392+sfini@users.noreply.github.com>
Date: Fri, 15 Dec 2017 20:43:56 +0100
Subject: model: Update fortios.rb (#1047)

* Update fortios.rb

Modify script for discard changes private key encryption every time config is downloaded
https://github.com/ytti/oxidized/issues/931

* Update fortios.rb

* Update fortios.rb

* Update fortios.rb

Added filter for inter-controller-key and Cluster uptime.
After update to version 5.6 inter-controller-key change every time config is downloaded .
Cluster uptime is now present and change every time config is downloaded .

* Update fortios.rb

Added rsso secret configuration remove

* Update fortios.rb

Added (Virus-DB|Extended DB|IPS-DB|IPS-ETDB|APP-DB|INDUSTRIAL-DB|Botnet DB|IPS Malicious URL Database) to the script , as suggested in #1119
---
 lib/oxidized/model/fortios.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/oxidized/model/fortios.rb b/lib/oxidized/model/fortios.rb
index 605a596..bffaf3c 100644
--- a/lib/oxidized/model/fortios.rb
+++ b/lib/oxidized/model/fortios.rb
@@ -15,9 +15,12 @@ class FortiOS < Oxidized::Model
   end
 
   cmd :secret do |cfg|
-    cfg.gsub! /(set (?:passwd|password|secondary-secret|rsso-secret|psksecret|secret|key ENC)).*/, '\\1 <configuration removed>'
+    cfg.gsub! /(set (?:passwd|password|psksecret|secret|key|group-password|secondary-secret|tertiary-secret|auth-password-l1|auth-password-l2|rsso|history0|history1|inter-controller-key ENC)).*/, '\\1 <configuration removed>'
     cfg.gsub! /(set private-key).*-+END ENCRYPTED PRIVATE KEY-*"$/m , '\\1 <configuration removed>'
-    cfg.gsub! /(IPS Malicious URL Database).*/, '\\1 <configuration removed>'
+    cfg.gsub! /(set ca ).*-+END CERTIFICATE-*"$/m , '\\1 <configuration removed>'
+    cfg.gsub! /(set csr ).*-+END CERTIFICATE REQUEST-*"$/m , '\\1 <configuration removed>'
+    cfg.gsub! /(Virus-DB|Extended DB|IPS-DB|IPS-ETDB|APP-DB|INDUSTRIAL-DB|Botnet DB|IPS Malicious URL Database).*/, '\\1 <configuration removed>'
+    cfg.gsub! /(Cluster uptime:).*/, '\\1 <configuration removed>'
     cfg
   end
 
@@ -46,7 +49,7 @@ class FortiOS < Oxidized::Model
 
 cfg << cmd('end') if @vdom_enabled
 
-    cfg << cmd('show')
+    cfg << cmd('show full-configuration')
     cfg.join "\n"
   end
 
-- 
cgit v1.2.3


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

* Create awplus.rb

Added support for Allied Telesis AW+ switches and routers

* Add support for Allied Telesis Alliedware Plus products

* Add Allied Telesis to Supported Products

* Add Allied Telesis to supported models

Feature support included:

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

(limited to 'lib')

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


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

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

(limited to 'lib')

diff --git a/lib/oxidized/model/routeros.rb b/lib/oxidized/model/routeros.rb
index f391fb9..6717446 100644
--- a/lib/oxidized/model/routeros.rb
+++ b/lib/oxidized/model/routeros.rb
@@ -19,6 +19,7 @@ class RouterOS < Oxidized::Model
     cmd run_cmd do |cfg|
       cfg.gsub! /\x1B\[([0-9]{1,3}((;[0-9]{1,3})*)?)?[m|K]/, '' # strip ANSI colours
       cfg.gsub! /\\\r\n\s+/, ''   # strip new line
+      cfg.gsub! /# inactive time\r\n/, ''   # Remove time based system comment
       cfg = cfg.split("\n").select { |line| not line[/^\#\s\w{3}\/\d{2}\/\d{4}.*$/] }
       cfg.join("\n") + "\n"
     end
-- 
cgit v1.2.3


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

* FTP Passive/Active mode added

* Documentation for Xyzel XGS4600 series
---
 docs/Configuration.md             |  9 +++++++++
 docs/Model-Notes/README.md        |  1 +
 docs/Model-Notes/XGS4600-Zyxel.md | 24 ++++++++++++++++++++++++
 lib/oxidized/config.rb            |  1 +
 lib/oxidized/input/ftp.rb         |  4 +++-
 5 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 docs/Model-Notes/XGS4600-Zyxel.md

(limited to 'lib')

diff --git a/docs/Configuration.md b/docs/Configuration.md
index db71bc7..e2db05e 100644
--- a/docs/Configuration.md
+++ b/docs/Configuration.md
@@ -74,6 +74,15 @@ vars_map:
 ...
 ```
 
+### FTP Passive Mode
+
+Oxidized uses ftp passive mode by default. Some devices require passive mode to be disabled. To do so, we can set `input.ftp.passive` to false
+```
+input:
+  ftp:
+    passive: false
+```
+
 ### Advanced Configuration
 
 Below is an advanced example configuration. You will be able to (optionally) override options per device. The router.db format used is `hostname:model:username:password:enable_password`. Hostname and model will be the only required options, all others override the global configuration sections.
diff --git a/docs/Model-Notes/README.md b/docs/Model-Notes/README.md
index d4b917c..f51ed80 100644
--- a/docs/Model-Notes/README.md
+++ b/docs/Model-Notes/README.md
@@ -13,6 +13,7 @@ Vendor          | Model           |Updated
 ----------------|-----------------|----------------
 Huawei|[VRP](VRP-Huawei.md)|17 Nov 2017
 Juniper|[MX/QFX/EX/SRX/J Series](JunOS.md)|18 Jan 2018
+Xyzel|[XGS4600 Series](XGS4600-Zyxel.md)|23 Jan 2018
 
 
 If you discover additional caveats or problems please make sure to consult the [GitHub issues for oxidized](https://github.com/ytti/oxidized/issues) known issues.
diff --git a/docs/Model-Notes/XGS4600-Zyxel.md b/docs/Model-Notes/XGS4600-Zyxel.md
new file mode 100644
index 0000000..0ff2e7d
--- /dev/null
+++ b/docs/Model-Notes/XGS4600-Zyxel.md
@@ -0,0 +1,24 @@
+ZynOS Configuration
+========================
+
+## FTP
+FTP access is only possible as admin, other users can login but cannot pull the files.
+For the XGS4600 series the config file is _config_ and not _config-0_
+
+The following line in _oxidized/lib/oxidized/model/zynos.rb_ with need changing
+```
+  cmd 'config-0'
+
+```
+
+The inclusion of an extra ftp option is also require. Within _input_ add the following
+```
+input:
+  ftp:
+    passive: false
+```
+
+Oxidized can now retrieve your configuration!
+
+
+Back to [Model-Notes](README.md)
diff --git a/lib/oxidized/config.rb b/lib/oxidized/config.rb
index 23af9c2..47544fb 100644
--- a/lib/oxidized/config.rb
+++ b/lib/oxidized/config.rb
@@ -37,6 +37,7 @@ module Oxidized
       asetus.default.input.default    = 'ssh, telnet'
       asetus.default.input.debug      = false # or String for session log file
       asetus.default.input.ssh.secure = false # complain about changed certs
+      asetus.default.input.ftp.passive= true  # ftp passive mode
 
       asetus.default.output.default = 'file'  # file, git
       asetus.default.source.default = 'csv'   # csv, sql
diff --git a/lib/oxidized/input/ftp.rb b/lib/oxidized/input/ftp.rb
index 80de257..cdf3688 100644
--- a/lib/oxidized/input/ftp.rb
+++ b/lib/oxidized/input/ftp.rb
@@ -19,7 +19,9 @@ module Oxidized
       @node       = node
       @node.model.cfg['ftp'].each { |cb| instance_exec(&cb) }
       @log = File.open(Oxidized::Config::Log + "/#{@node.ip}-ftp", 'w') if Oxidized.config.input.debug?
-      @ftp = Net::FTP.new @node.ip, @node.auth[:username], @node.auth[:password]
+      @ftp = Net::FTP.new(@node.ip)
+      @ftp.passive = Oxidized.config.input.ftp.passive
+      @ftp.login  @node.auth[:username], @node.auth[:password]
       connected?
     end
 
-- 
cgit v1.2.3


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

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

(limited to 'lib')

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


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

* Add show commands to ciscosmb

* Update ciscosmb.rb

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

(limited to 'lib')

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


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

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

(limited to 'lib')

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


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

Sanitized output:

```
 Power Supply Status:

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

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

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

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

(limited to 'lib')

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


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

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

(limited to 'lib')

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


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

* Basic support for ArbOS from Arbor Networks.

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

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

Locally validated on Peakflow SP v8.2+

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

* Added model notes for ArbOS
---
 docs/Model-Notes/ArbOS.md   | 10 ++++++++++
 docs/Model-Notes/README.md  |  1 +
 docs/Supported-OS-Types.md  |  2 ++
 lib/oxidized/model/arbos.rb | 27 +++++++++++++++++++++++++++
 4 files changed, 40 insertions(+)
 create mode 100644 docs/Model-Notes/ArbOS.md
 create mode 100644 lib/oxidized/model/arbos.rb

(limited to 'lib')

diff --git a/docs/Model-Notes/ArbOS.md b/docs/Model-Notes/ArbOS.md
new file mode 100644
index 0000000..0f5b628
--- /dev/null
+++ b/docs/Model-Notes/ArbOS.md
@@ -0,0 +1,10 @@
+Arbor Networks ArbOS notes
+==========================
+
+If you are running ArbOS version 7 or lower then you may need to update the model to remove `exec true`:
+
+```
+  cfg :ssh do
+    pre_logout 'exit'
+  end
+```
diff --git a/docs/Model-Notes/README.md b/docs/Model-Notes/README.md
index 6a64058..9d7db32 100644
--- a/docs/Model-Notes/README.md
+++ b/docs/Model-Notes/README.md
@@ -12,6 +12,7 @@ Use the table below for more information on the Vendor/Model caveats.
 Vendor          | Model           |Updated
 ----------------|-----------------|----------------
 3COM|[Comware](Comware.md)|15 Feb 2018
+Arbor Networks|[ArbOS](ArbOS.md)|27 Feb 2018
 Huawei|[VRP](VRP-Huawei.md)|17 Nov 2017
 Juniper|[MX/QFX/EX/SRX/J Series](JunOS.md)|18 Jan 2018
 Xyzel|[XGS4600 Series](XGS4600-Zyxel.md)|23 Jan 2018
diff --git a/docs/Supported-OS-Types.md b/docs/Supported-OS-Types.md
index a12f5ef..d6d718f 100644
--- a/docs/Supported-OS-Types.md
+++ b/docs/Supported-OS-Types.md
@@ -17,6 +17,8 @@
    * [BreezeACCESS](/lib/oxidized/model/alvarion.rb)
  * APC
    * [AOS](/lib/oxidized/model/apc_aos.rb)
+ * Arbor Networks
+   * [ArbOS](/lib/oxidized/model/arbos.rb)
  * Arista
    * [EOS](/lib/oxidized/model/eos.rb)
  * Arris
diff --git a/lib/oxidized/model/arbos.rb b/lib/oxidized/model/arbos.rb
new file mode 100644
index 0000000..389f3f6
--- /dev/null
+++ b/lib/oxidized/model/arbos.rb
@@ -0,0 +1,27 @@
+class ARBOS  < Oxidized::Model
+
+  # Arbor OS model #
+
+  prompt /^[\S\s]+\n([\w.@-]+[:\/#>]+)\s?$/
+  comment  '# '
+
+  cmd 'system hardware' do |cfg|
+    cfg.gsub! /^Boot\ time\:\s.+/, '' # Remove boot timer
+    cfg.gsub! /^Load\ averages\:\s.+/, '' # Remove CPU load info
+    cfg = cfg.each_line.to_a[2..-1].join
+    comment cfg
+  end
+
+  cmd 'system version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'config show' do |cfg|
+    cfg
+  end
+
+  cfg :ssh do
+    exec true
+    pre_logout 'exit'
+  end
+end
-- 
cgit v1.2.3


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

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

(limited to 'lib')

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


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

---
 docs/Hooks.md                   | 2 ++
 lib/oxidized/hook/githubrepo.rb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/docs/Hooks.md b/docs/Hooks.md
index fab4025..080d301 100644
--- a/docs/Hooks.md
+++ b/docs/Hooks.md
@@ -67,6 +67,8 @@ This hook configures the repository `remote` and _push_ the code when the specif
   * `publickey`: publickey for repository auth.
   * `privatekey`: privatekey for repository auth.
 
+It is also possible to set the environment variable `OXIDIZED_SSH_PASSPHRASE` to a passphrase if your keypair requires it.
+
 When using groups repositories, each group must have its own `remote` in the `remote_repo` config.
 
 ``` yaml
diff --git a/lib/oxidized/hook/githubrepo.rb b/lib/oxidized/hook/githubrepo.rb
index d33e54e..f74b22a 100644
--- a/lib/oxidized/hook/githubrepo.rb
+++ b/lib/oxidized/hook/githubrepo.rb
@@ -51,7 +51,7 @@ class GithubRepo < Oxidized::Hook
     else
       if cfg.has_key?('publickey') && cfg.has_key?('privatekey')
         log "Using ssh auth with key", :debug
-        Rugged::Credentials::SshKey.new(username: 'git', publickey: File.expand_path(cfg.publickey), privatekey: File.expand_path(cfg.privatekey))
+        Rugged::Credentials::SshKey.new(username: 'git', publickey: File.expand_path(cfg.publickey), privatekey: File.expand_path(cfg.privatekey), passphrase: ENV["OXIDIZED_SSH_PASSPHRASE"])
       else
         log "Using ssh auth with agentforwarding", :debug
         Rugged::Credentials::SshKeyFromAgent.new(username: 'git')
-- 
cgit v1.2.3