Merge branch '2.5.x' into 2.6.x

Closes gh-29371
2022-01-12 14:07:31 -08:00
parent 3ae7c45900 9cf55808fb
commit 72696cdb0f
3 changed files with 7 additions and 0 deletions
--- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools/launch.script
+++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools/launch.script
@@ -128,6 +128,9 @@ log_file="$LOG_FOLDER/$LOG_FILENAME"
 # shellcheck disable=SC2012
 [[ $(id -u) == "0" ]] && run_user=$(ls -ld "$jarfile" | awk '{print $3}')

+# Ensure the user actually exists
+id -u "$run_user" &> /dev/null || unset run_user
+
 # Run as user specified in RUN_AS_USER
 if [[ -n "$RUN_AS_USER" ]]; then
    if ! [[ "$action" =~ ^(status|run)$ ]]; then