Browse Source

Example Change the regular expression of the data source password (#11459)

jackfanwan 2 years ago
parent
commit
71b4087421

+ 1 - 1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java

@@ -734,7 +734,7 @@ public final class Constants {
      * dataSource sensitive param
      */
     public static final String DATASOURCE_PASSWORD_REGEX =
-            "(?<=((?i)password((\\\\\":\\\\\")|(=')))).*?(?=((\\\\\")|(')))";
+            "(?<=((?i)password((\":\")|(=')))).*?(?=((\")|(')))";
 
     /**
      * default worker group

+ 4 - 4
dolphinscheduler-log-server/src/test/java/org/apache/dolphinscheduler/server/log/SensitiveDataConverterTest.java

@@ -47,11 +47,11 @@ public class SensitiveDataConverterTest {
             + "\"database\":\"carbond\","
             + "\"jdbcUrl\":\"jdbc:mysql://192.168.xx.xx:3306/ods\","
             + "\"user\":\"view\","
-            + "\"password\":\"******\"}";
+            + "\"password\":\"*****\"}";
 
     @Test
     public void convert() {
-        Assert.assertNotEquals(maskLogMsg, passwordHandler(pwdPattern, logMsg));
+        Assert.assertEquals(maskLogMsg, passwordHandler(pwdPattern, logMsg));
     }
 
     /**
@@ -62,8 +62,8 @@ public class SensitiveDataConverterTest {
         logger.info("parameter : {}", logMsg);
         logger.info("parameter : {}", passwordHandler(pwdPattern, logMsg));
 
-        Assert.assertEquals(logMsg, passwordHandler(pwdPattern, logMsg));
-        Assert.assertNotEquals(maskLogMsg, passwordHandler(pwdPattern, logMsg));
+        Assert.assertNotEquals(logMsg, passwordHandler(pwdPattern, logMsg));
+        Assert.assertEquals(maskLogMsg, passwordHandler(pwdPattern, logMsg));
 
     }