clean up and rubocop compliance

1 files changed, 16 insertions, 22 deletions

diff --git a/lib/oxidized/model/fortios.rb b/lib/oxidized/model/fortios.rb
index 59dffb0..7269568 100644
--- a/lib/oxidized/model/fortios.rb
+++ b/lib/oxidized/model/fortios.rb
@@ -1,6 +1,5 @@
 class FortiOS < Oxidized::Model
-
-  comment  '# '
+  comment '# '
 
   prompt /^([-\w\.\~]+(\s[\(\w\-\.\)]+)?\~?\s?[#>$]\s?)$/
 
@@ -15,18 +14,14 @@ class FortiOS < Oxidized::Model
   end
 
   cmd :secret do |cfg|
-    # ENC indicated an encrypted password (Hash), so anything starting with set and ending in ENC followed by a string of characters .+ means that there must be at least one character present, which should be a little safter
+    # ENC indicates an encrypted password, and secret indicates a secret string
     cfg.gsub! /(set .+ ENC) .+/, '\\1 <configuration removed>'
-    # Any line starting with "set", containing a string that ends in "secret" also ends with a password or hash. 
     cfg.gsub! /(set .*secret) .+/, '\\1 <configuration removed>'
-    # The above two simplify this line
-    #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|passphrase ENC|login-passwd ENC|auth-pwd ENC|ldap-pwd ENC|priv-pwd ENC|ldap-password ENC)).*/, '\\1 <configuration removed>'
-    # The remaining secrets to remove
+    # A number of other statements also contains sensitive strings
     cfg.gsub! /(set (?:passwd|password|key|group-password|auth-password-l1|auth-password-l2|rsso|history0|history1)) .+/, '\\1 <configuration removed>'
-    cfg.gsub! /(set private-key).*-+END ENCRYPTED PRIVATE KEY-*"$/m , '\\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>' #Not really secrets, Moved down to get system status
+    cfg.gsub! /(set private-key).*-+END ENCRYPTED PRIVATE KEY-*"$/m, '\\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! /(Cluster uptime:).*/, '\\1 <stripped>'
     cfg
   end
@@ -43,21 +38,21 @@ class FortiOS < Oxidized::Model
     cfg << cmd('config global') if @vdom_enabled
 
     cfg << cmd('get hardware status') do |cfg|
-       comment cfg
+      comment cfg
     end
 
-    #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|
-          cfg.gsub! /(FDS Address\n---------\n).*/, '\\1IP Address removed'
-          comment cfg.each_line.reject { |line| line.match /Last Update|Result/ }.join
-       end
+    # 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|
+        cfg.gsub! /(FDS Address\n---------\n).*/, '\\1IP Address removed'
+        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 full-configuration')
+    cfg << cmd('show full-configuration | grep .')
     cfg.join "\n"
   end
 
@@ -69,5 +64,4 @@ cfg << cmd('end') if @vdom_enabled
   cfg :telnet, :ssh do
     pre_logout "exit\n"
   end
-
 end