From f2d0abbdcac471267ebde1a5fc75bf1fb63fcba3 Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Tue, 14 Feb 2017 11:48:53 +0200
Subject: don't use http auth when no user or pw is in cfg

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

diff --git a/lib/oxidized/source/http.rb b/lib/oxidized/source/http.rb
index 7186f98..6c12f29 100644
--- a/lib/oxidized/source/http.rb
+++ b/lib/oxidized/source/http.rb
@@ -29,7 +29,7 @@ class HTTP < Source
     end
 
     request = Net::HTTP::Get.new(uri.request_uri, headers)
-    if (@cfg.user && @cfg.pass)
+    if (@cfg.user? && @cfg.pass?)
         request.basic_auth(@cfg.user,@cfg.pass)
     end
 
-- 
cgit v1.2.1


From 38151b82d2df294bdfcb2876120d0ca23462dca3 Mon Sep 17 00:00:00 2001
From: boudreau <yves.boudreau@mcgill.ca>
Date: Tue, 14 Feb 2017 10:18:35 -0500
Subject: Update opengear.rb

With new update :
OpenGear/CM71xx Version 3.16.6u1 e02e2d59 --  Mon Nov 14 17:44:05 EST 2016

the backup wasn't working anymore, needed a prompt
---
 lib/oxidized/model/opengear.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/oxidized/model/opengear.rb b/lib/oxidized/model/opengear.rb
index 7f801f8..b7c697f 100644
--- a/lib/oxidized/model/opengear.rb
+++ b/lib/oxidized/model/opengear.rb
@@ -1,6 +1,8 @@
 class OpenGear < Oxidized::Model
 
   comment  '# '
+  
+  prompt /^(\$\s)?$/
 
   cmd :secret do |cfg|
     cfg.gsub!(/password (\S+)/, 'password <secret removed>')
-- 
cgit v1.2.1


From 4a6a7a98a4101320c429235d15f637e370f0ce94 Mon Sep 17 00:00:00 2001
From: Tim Pozar <pozar@lns.com>
Date: Tue, 14 Feb 2017 17:57:06 -0800
Subject: Updated timos.rb to ignore "Generated" and "Finished" lines so it
 doesn't look like a new config each time to crawls the box.

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

diff --git a/lib/oxidized/model/timos.rb b/lib/oxidized/model/timos.rb
index d40e845..c230a8f 100644
--- a/lib/oxidized/model/timos.rb
+++ b/lib/oxidized/model/timos.rb
@@ -18,6 +18,8 @@ class TiMOS < Oxidized::Model
   # Show the boot options file.
   #
   cmd 'show bof' do |cfg|
+    cfg.gsub! /# Finished .*/, ''
+    cfg.gsub! /# Generated .*/, ''
     comment cfg
   end
 
@@ -29,6 +31,8 @@ class TiMOS < Oxidized::Model
     # Strip uptime.
     #
     cfg.sub! /^System Up Time.*\n/, ''
+    cfg.gsub! /# Finished .*/, ''
+    cfg.gsub! /# Generated .*/, ''
     comment cfg
   end
 
@@ -36,6 +40,8 @@ class TiMOS < Oxidized::Model
   # Show the card state.
   #
   cmd 'show card state' do |cfg|
+    cfg.gsub! /# Finished .*/, ''
+    cfg.gsub! /# Generated .*/, ''
     comment cfg
   end
 
@@ -48,6 +54,8 @@ class TiMOS < Oxidized::Model
     #
     cfg.gsub! /\r/, ''
     cfg.gsub! /[\b][\b][\b]/, "\n"
+    cfg.gsub! /# Finished .*/, ''
+    cfg.gsub! /# Generated .*/, ''
     comment cfg
   end
 
@@ -55,6 +63,8 @@ class TiMOS < Oxidized::Model
   # Show the running debug configuration.
   #
   cmd 'show debug' do |cfg|
+    cfg.gsub! /# Finished .*/, ''
+    cfg.gsub! /# Generated .*/, ''
     comment cfg
   end
 
@@ -66,6 +76,8 @@ class TiMOS < Oxidized::Model
     # Strip carriage returns.
     #
     cfg.gsub! /\r/, ''
+    cfg.gsub! /# Finished .*/, ''
+    cfg.gsub! /# Generated .*/, ''
     comment cfg
   end
 
@@ -77,6 +89,8 @@ class TiMOS < Oxidized::Model
     # Strip carriage returns.
     #
     cfg.gsub! /\r/, ''
+    cfg.gsub! /# Finished .*/, ''
+    cfg.gsub! /# Generated .*/, ''
     comment cfg
   end
 
@@ -88,6 +102,8 @@ class TiMOS < Oxidized::Model
     # Strip carriage returns.
     #
     cfg.gsub! /\r/, ''
+    cfg.gsub! /# Finished .*/, ''
+    cfg.gsub! /# Generated .*/, ''
   end
 
   cfg :telnet do
-- 
cgit v1.2.1


From 3e534bd69c9e4379e49960dc203390f8adf8efe0 Mon Sep 17 00:00:00 2001
From: Nat Morris <nat@nuqe.net>
Date: Wed, 15 Feb 2017 21:30:13 +0000
Subject: Support docker container build from any branch or fork

---
 Dockerfile | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 905825e..5bb2a4c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,9 +3,22 @@ MAINTAINER Samer Abdel-Hafez <sam@arahant.net>
 
 RUN add-apt-repository ppa:brightbox/ruby-ng && \
 	apt-get update && \
-  apt-get install -y ruby2.3 ruby2.3-dev libsqlite3-dev libssl-dev pkg-config make cmake libssh2-1-dev
+  apt-get install -y ruby2.3 ruby2.3-dev libsqlite3-dev libssl-dev pkg-config make cmake libssh2-1-dev git
 
-RUN gem install oxidized oxidized-web --no-ri --no-rdoc
+RUN mkdir -p /tmp/oxidized
+COPY . /tmp/oxidized/
+WORKDIR /tmp/oxidized
+
+RUN gem build oxidized.gemspec
+RUN gem install oxidized-*.gem
+
+# web interface
+RUN gem install oxidized-web --no-ri --no-rdoc
+
+# dependencies for hooks
+RUN gem install aws-sdk
+
+RUN rm -rf /tmp/oxidized
 
 RUN apt-get remove -y ruby-dev pkg-config make cmake
 
-- 
cgit v1.2.1


From c89503a8b2c53d9ee2a1fc8020ecc5fba600a891 Mon Sep 17 00:00:00 2001
From: root <oh@onsteroids.net>
Date: Thu, 16 Feb 2017 09:08:08 +0100
Subject: added psk and private-key removal to secret section

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

diff --git a/lib/oxidized/model/fortios.rb b/lib/oxidized/model/fortios.rb
index cdb50d5..3cfd102 100644
--- a/lib/oxidized/model/fortios.rb
+++ b/lib/oxidized/model/fortios.rb
@@ -15,7 +15,8 @@ class FortiOS < Oxidized::Model
   end
 
   cmd :secret do |cfg|
-    cfg.gsub! /(set (?:passwd|password)).*/, '\\1 <configuration removed>'
+    cfg.gsub! /(set (?:passwd|password|psksecret)).*/, '\\1 <configuration removed>'
+    cfg.gsub! /(set private-key).*-+END ENCRYPTED PRIVATE KEY-*"$/m , '\\1 <configuration removed>'
     cfg
   end
 
-- 
cgit v1.2.1


From 98c7fc45c983b9e424e32bc2f426e395e1ec98bc Mon Sep 17 00:00:00 2001
From: root <oh@onsteroids.net>
Date: Tue, 7 Feb 2017 16:38:47 +0100
Subject: added tplink model

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

diff --git a/lib/oxidized/model/tplink.rb b/lib/oxidized/model/tplink.rb
new file mode 100644
index 0000000..9286ea4
--- /dev/null
+++ b/lib/oxidized/model/tplink.rb
@@ -0,0 +1,65 @@
+class TPLink < Oxidized::Model
+
+  # tp-link prompt
+  prompt /^\r?([\w.@()-]+[#>]\s?)$/
+  comment  '! '
+
+  # handle paging
+  # workaround for sometimes missing whitespaces with "\s?"
+  expect /Press\s?any\s?key\s?to\s?continue\s?\(Q\s?to\s?quit\)/ do |data, re|
+   send ' '
+   data.sub re, ''
+  end
+
+  # send carriage return because \n with the command is not enough
+  # checks if line ends with prompt >,# or \r,\nm otherwise send \r
+  expect /[^>#\r\n]$/ do |data, re|
+   send "\r"
+   data.sub re, ''
+  end
+
+  cmd :all do |cfg|
+    # normalize linefeeds
+    cfg.gsub! /(\r|\r\n|\n\r)/,"\n"
+    # remove empty lines
+    cfg.each_line.reject { |line| line.match /^[\r\n\s\u0000#]+$/ }.join
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
+    cfg.gsub! /secret (\d+) (\S+).*/, '<secret hidden>'
+    cfg
+  end
+
+  cmd 'show system-info'  do |cfg|
+    comment cfg.each_line.to_a[3..-3].join
+  end
+
+  cmd 'show running-config' do |cfg|
+    lines = cfg.each_line.to_a[1..-1]
+    # cut config after "end"
+    lines[0..lines.index("end\n")].join
+  end
+
+  cfg :telnet, :ssh do
+    username /^User ?[nN]ame:/
+    password /^\r?Password:/
+  end
+
+  cfg :telnet, :ssh do
+    if vars :enable
+      post_login do
+        send "enable\r"
+        send vars(:enable) + "\r"
+      end
+    end
+
+    pre_logout do
+      send "exit\r"
+      send "logout\r"
+    end
+
+  end
+
+end
+
-- 
cgit v1.2.1


From 261e6d41f1daa6f37c2a0c5e3b059cbfd77dc895 Mon Sep 17 00:00:00 2001
From: root <oh@onsteroids.net>
Date: Thu, 16 Feb 2017 14:28:59 +0100
Subject: added variable fortios_autoupdate, to control inclusion of autoupdate
 messages

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

diff --git a/lib/oxidized/model/fortios.rb b/lib/oxidized/model/fortios.rb
index 3cfd102..2415537 100644
--- a/lib/oxidized/model/fortios.rb
+++ b/lib/oxidized/model/fortios.rb
@@ -31,14 +31,18 @@ class FortiOS < Oxidized::Model
     cfg << cmd('config global') if @vdom_enabled
 
     cfg << cmd('get hardware status') do |cfg|
-      comment cfg
+       comment cfg
     end
 
-    cfg << cmd('diagnose autoupdate version') do |cfg|
-      comment cfg.each_line.reject { |line| line.match /Last Update|Result/ }.join
+    #default behaviour: include autoupdate output (backwards compatibility)
+    #do not include if variable "show_autoupdate" is set to false
+    if  defined?(vars(:fortios_autoupdate)).nil? || vars(:fortios_autoupdate)
+       cfg << cmd('diagnose autoupdate version') do |cfg|
+          comment cfg.each_line.reject { |line| line.match /Last Update|Result/ }.join
+       end
     end
 
-    cfg << cmd('end') if @vdom_enabled
+cfg << cmd('end') if @vdom_enabled
 
     cfg << cmd('show')
     cfg.join "\n"
@@ -54,3 +58,4 @@ class FortiOS < Oxidized::Model
   end
 
 end
+
-- 
cgit v1.2.1


From cb6e34bf14658bf08d0c1dd67bc5f4168c2c0727 Mon Sep 17 00:00:00 2001
From: root <oh@onsteroids.net>
Date: Thu, 16 Feb 2017 14:43:12 +0100
Subject: changed README and enable behaviour to cmd instead of send

---
 README.md                    | 2 ++
 lib/oxidized/model/tplink.rb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cfc5040..e1d53fc 100644
--- a/README.md
+++ b/README.md
@@ -148,6 +148,8 @@ Oxidized is a network device configuration backup tool. It's a RANCID replacemen
    * [Supermicro](lib/oxidized/model/supermicro.rb)
  * Trango Systems
    * [Trango](lib/oxidized/model/trango.rb)
+ * TPLink
+   * [TPLink](lib/oxidized/model/tplink.rb)
  * Ubiquiti
    * [AirOS](lib/oxidized/model/airos.rb)
    * [Edgeos](lib/oxidized/model/edgeos.rb)
diff --git a/lib/oxidized/model/tplink.rb b/lib/oxidized/model/tplink.rb
index 9286ea4..bf13803 100644
--- a/lib/oxidized/model/tplink.rb
+++ b/lib/oxidized/model/tplink.rb
@@ -50,7 +50,7 @@ class TPLink < Oxidized::Model
     if vars :enable
       post_login do
         send "enable\r"
-        send vars(:enable) + "\r"
+        cmd vars(:enable)
       end
     end
 
-- 
cgit v1.2.1