You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2018/04/25 07:33:38 UTC
[08/10] flink git commit: [FLINK-8793][REST] Hide configured value
for "password"/"secret"
[FLINK-8793][REST] Hide configured value for "password"/"secret"
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/1bdf5865
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/1bdf5865
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/1bdf5865
Branch: refs/heads/release-1.5
Commit: 1bdf5865ad6b9dafd1098a1d5c4f5576f0dda25a
Parents: 210abee
Author: sihuazhou <su...@163.com>
Authored: Tue Apr 24 13:39:22 2018 +0200
Committer: zentol <ch...@apache.org>
Committed: Wed Apr 25 09:33:22 2018 +0200
----------------------------------------------------------------------
.../flink/runtime/rest/handler/legacy/ClusterConfigHandler.java | 5 +++--
.../flink/runtime/rest/messages/ClusterConfigurationInfo.java | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/1bdf5865/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/ClusterConfigHandler.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/ClusterConfigHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/ClusterConfigHandler.java
index 76221b5..ff2f04e 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/ClusterConfigHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/ClusterConfigHandler.java
@@ -19,6 +19,7 @@
package org.apache.flink.runtime.rest.handler.legacy;
import org.apache.flink.configuration.Configuration;
+import org.apache.flink.configuration.GlobalConfiguration;
import org.apache.flink.runtime.jobmaster.JobManagerGateway;
import org.apache.flink.runtime.rest.messages.ClusterConfigurationInfoEntry;
import org.apache.flink.runtime.rest.messages.ClusterConfigurationInfoHeaders;
@@ -74,8 +75,8 @@ public class ClusterConfigHandler extends AbstractJsonRequestHandler {
String value = config.getString(key, null);
// Mask key values which contain sensitive information
- if (value != null && key.toLowerCase().contains("password")) {
- value = "******";
+ if (value != null && GlobalConfiguration.isSensitive(key)) {
+ value = GlobalConfiguration.HIDDEN_CONTENT;
}
gen.writeStringField(ClusterConfigurationInfoEntry.FIELD_NAME_CONFIG_VALUE, value);
http://git-wip-us.apache.org/repos/asf/flink/blob/1bdf5865/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/ClusterConfigurationInfo.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/ClusterConfigurationInfo.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/ClusterConfigurationInfo.java
index 627dc4c..06e6765 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/ClusterConfigurationInfo.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/ClusterConfigurationInfo.java
@@ -19,6 +19,7 @@
package org.apache.flink.runtime.rest.messages;
import org.apache.flink.configuration.Configuration;
+import org.apache.flink.configuration.GlobalConfiguration;
import org.apache.flink.runtime.rest.handler.legacy.ClusterConfigHandler;
import java.util.ArrayList;
@@ -45,8 +46,8 @@ public class ClusterConfigurationInfo extends ArrayList<ClusterConfigurationInfo
String value = config.getString(key, null);
// Mask key values which contain sensitive information
- if (value != null && key.toLowerCase().contains("password")) {
- value = "******";
+ if (value != null && GlobalConfiguration.isSensitive(key)) {
+ value = GlobalConfiguration.HIDDEN_CONTENT;
}
clusterConfig.add(new ClusterConfigurationInfoEntry(key, value));