diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/PrintableMap.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/PrintableMap.java index 571fa92975..ae2b50bcc7 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/PrintableMap.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/PrintableMap.java @@ -32,6 +32,7 @@ public class PrintableMap { private String entryDelimiter = ","; public static final Set SENSITIVE_KEY; + public static final String PASSWORD_MASK = "*XXX"; static { SENSITIVE_KEY = Sets.newTreeSet(String.CASE_INSENSITIVE_ORDER); @@ -39,6 +40,7 @@ public class PrintableMap { SENSITIVE_KEY.add("kerberos_keytab_content"); SENSITIVE_KEY.add("bos_secret_accesskey"); SENSITIVE_KEY.add("jdbc.password"); + SENSITIVE_KEY.add("elasticsearch.password"); } public PrintableMap(Map map, String keyValueSeparator, @@ -80,7 +82,7 @@ public class PrintableMap { sb.append("\""); } if (hidePassword && SENSITIVE_KEY.contains(entry.getKey())) { - sb.append("*XXX"); + sb.append(PASSWORD_MASK); } else { sb.append(entry.getValue()); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogMgr.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogMgr.java index 255b63526f..a62562acd7 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogMgr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogMgr.java @@ -396,7 +396,11 @@ public class CatalogMgr implements Writable, GsonPostProcessable { rows.add(Arrays.asList("resource", catalog.getResource())); } for (Map.Entry elem : catalog.getProperties().entrySet()) { - rows.add(Arrays.asList(elem.getKey(), elem.getValue())); + if (PrintableMap.SENSITIVE_KEY.contains(elem.getKey())) { + rows.add(Arrays.asList(elem.getKey(), PrintableMap.PASSWORD_MASK)); + } else { + rows.add(Arrays.asList(elem.getKey(), elem.getValue())); + } } } } finally {