Merge branch 'master' into ArubaIAP_MAS

1 files changed, 6 insertions, 1 deletions

diff --git a/lib/oxidized/model/fortios.rb b/lib/oxidized/model/fortios.rb
index cd379b7..cdb50d5 100644
--- a/lib/oxidized/model/fortios.rb
+++ b/lib/oxidized/model/fortios.rb
@@ -14,6 +14,11 @@ class FortiOS < Oxidized::Model
     new_cfg << cfg.each_line.to_a[1..-2].map { |line| line.gsub(/(conf_file_ver=)(.*)/, '\1<stripped>\3') }.join
   end
 
+  cmd :secret do |cfg|
+    cfg.gsub! /(set (?:passwd|password)).*/, '\\1 <configuration removed>'
+    cfg
+  end
+
   cmd 'get system status' do |cfg|
     @vdom_enabled = cfg.include? 'Virtual domain configuration: enable'
     cfg.gsub!(/(System time: )(.*)/, '\1<stripped>\3')
@@ -29,7 +34,7 @@ class FortiOS < Oxidized::Model
     end
 
     cfg << cmd('diagnose autoupdate version') do |cfg|
-      comment cfg
+      comment cfg.each_line.reject { |line| line.match /Last Update|Result/ }.join
     end
 
     cfg << cmd('end') if @vdom_enabled