Merge pull request #9907 from marekkopecky/WFLY-8161

[WFLY-8161] Fix regexp for system properties passwords in JDR
wildfly · Apr 6, 2017 · 9aa1be7 · 9aa1be7
2 parents c076d61 + e50cb21
commit 9aa1be7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/jdr/jboss-as-jdr/src/main/java/org/jboss/as/jdr/plugins/AS7Plugin.java b/jdr/jboss-as-jdr/src/main/java/org/jboss/as/jdr/plugins/AS7Plugin.java
@@ -45,6 +45,7 @@ public class AS7Plugin implements JdrPlugin {
     public List<JdrCommand> getCommands() throws Exception {
         Sanitizer xmlSanitizer = Sanitizers.xml("//password");
         Sanitizer passwordSanitizer = Sanitizers.pattern("password=.*", "password=*");
+        Sanitizer systemPropertiesPasswordSanitizer = Sanitizers.pattern("([^=]*password[^=]*)=.*", "$1=*");
 
         return Arrays.asList(
             new TreeCommand(),
@@ -63,7 +64,7 @@ public List<JdrCommand> getCommands() throws Exception {
             new CollectFiles("*/modules/system/*/.overlays/.overlays"),
             new CollectFiles("*/.installation/*.conf"),
             new CollectFiles("*/.installation/*.txt"),
-            new SystemProperties().sanitizer(passwordSanitizer),
+            new SystemProperties().sanitizer(systemPropertiesPasswordSanitizer),
             new DeploymentDependencies(),
             new LocalModuleDependencies()
         );