Apply bash string escapes after calculating MD5 hash of env value
Signed-off-by: Mykola Mandra <mykola.mandra@cloudsoftcorp.com>
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java
index b599906..8a7182f 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java
@@ -359,11 +359,13 @@
public static WrappedStream tagForEnvStream(String streamEnv, Map<?, ?> env) {
StringBuilder sb = new StringBuilder();
for (Map.Entry<?,?> kv: env.entrySet()) {
- String stringValue = kv.getValue() != null ? BashStringEscapes.wrapBash(kv.getValue().toString()) : "";
- Sanitizer.IS_SECRET_PREDICATE.apply(stringValue);
- if (!stringValue.isEmpty() && Sanitizer.IS_SECRET_PREDICATE.apply(kv.getKey())) {
- String md5Checksum = Streams.getMd5Checksum(new ByteArrayInputStream(stringValue.getBytes()));
- stringValue = "<suppressed> (MD5 hash: " + md5Checksum + ")" ;
+ String stringValue = kv.getValue() != null ? kv.getValue().toString() : "";
+ if (!stringValue.isEmpty()) {
+ if (Sanitizer.IS_SECRET_PREDICATE.apply(kv.getKey())) {
+ String md5Checksum = Streams.getMd5Checksum(new ByteArrayInputStream(stringValue.getBytes()));
+ stringValue = "<suppressed> (MD5 hash: " + md5Checksum + ")";
+ }
+ stringValue = BashStringEscapes.wrapBash(stringValue);
}
sb.append(kv.getKey()).append("=").append(stringValue).append("\n");
}
