Skip to content

Commit 6bd9180

Browse files
committed
Possible fix for CSB-3783
Signed-off-by: Adriano Machado <[email protected]> Signed-off-by: Jonathan Dowland <[email protected]>
1 parent e4b427f commit 6bd9180

File tree

1 file changed

+24
-2
lines changed
  • modules/run/artifacts/opt/jboss/container/java/run

1 file changed

+24
-2
lines changed

modules/run/artifacts/opt/jboss/container/java/run/run-java.sh

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,26 @@ function configure_passwd() {
225225
if [ -w "$HOME/passwd" ]; then
226226
sed "/^jboss/s/[^:]*/$(id -u)/3" /etc/passwd > "$HOME/passwd"
227227
fi
228+
229+
# Mask secrets before printing
230+
mask_passwords() {
231+
local content="$1"
232+
local result=""
233+
234+
IFS=' ' read -r -a key_value_pairs <<< "$content"
235+
236+
for pair in "${key_value_pairs[@]}"; do
237+
key=$(echo "$pair" | cut -d '=' -f 1)
238+
value=$(echo "$pair" | cut -d '=' -f 2-)
239+
240+
if [[ $key =~ [Pp][Aa][Ss][Ss][Ww][Oo][Rr][Dd] ]]; then
241+
result+="$key=***** "
242+
else
243+
result+="$pair "
244+
fi
245+
done
246+
247+
echo "${result% }"
228248
}
229249

230250
# Start JVM
@@ -242,9 +262,11 @@ startup() {
242262
args="-jar ${JAVA_APP_JAR}"
243263
fi
244264

245-
procname="${JAVA_APP_NAME-java}"
265+
local procname="${JAVA_APP_NAME-java}"
266+
267+
local masked_args=$(mask_passwords "${args}")
246268

247-
log_info "exec -a \"${procname}\" java $(get_java_options) -cp \"$(get_classpath)\" ${args} $*"
269+
log_info "exec -a \"${procname}\" java $(get_java_options) -cp \"$(get_classpath)\" ${masked_args} $*"
248270
log_info "running in $PWD"
249271
exec -a "${procname}" java $(get_java_options) -cp "$(get_classpath)" ${args} $*
250272
}

0 commit comments

Comments
 (0)