From 831cf3e4c42d53461ac1e27533ac4c2f456bd52f Mon Sep 17 00:00:00 2001
From: Zmegolaz <zmegolaz@gmail.com>
Date: Fri, 8 Jun 2018 11:06:08 +0200
Subject: Remove more JunOS secrets (#1359)

* Remove more JunOS secrets

* Removed redundant junos secret replacements. Updated changelog.

* Moved this change to Master in the changelog.
---
 CHANGELOG.md                | 1 +
 lib/oxidized/model/junos.rb | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a43cff0..b4d975d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Master
 
 * BUGFIX: model edgecos does not trigger falsepositives due to uptime and memory utilization
+* BUGFIX: Use SECRET-DATA hints for hiding secrets in JunOS (@Zmegolaz)
 
 ## 0.22.0
 
diff --git a/lib/oxidized/model/junos.rb b/lib/oxidized/model/junos.rb
index 737a000..e987930 100644
--- a/lib/oxidized/model/junos.rb
+++ b/lib/oxidized/model/junos.rb
@@ -12,11 +12,8 @@ class JunOS < Oxidized::Model
   end
 
   cmd :secret do |cfg|
-    cfg.gsub!(/encrypted-password (\S+).*/, 'encrypted-password <secret removed>')
-    cfg.gsub!(/pre-shared-key ascii-text (\S+).*/, 'pre-shared-key ascii-text <secret removed>')
-    cfg.gsub!(/pre-shared-key hexadecimal (\S+).*/, 'pre-shared-key hexadecimal <secret removed>')
-    cfg.gsub!(/authentication-key (\S+).*/, 'authentication-key <secret removed>')
     cfg.gsub!(/community (\S+) {/, 'community <hidden> {')
+    cfg.gsub!(/ "\$\d\$\S+; ## SECRET-DATA/, ' <secret removed>;')
     cfg
   end
 
-- 
cgit v1.2.3