From ee4f492704afef1c27951c34912a09adb79a18a2 Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Tue, 16 Jan 2024 18:06:31 +0100 Subject: [PATCH] handle not existing known_host file in permission check --- .../controllers/bootstrap/AbstractMinionBootstrapper.java | 5 +++++ ...pacewalk-java.changes.mc.Manager-4.3-fix-known_hosts-test | 1 + 2 files changed, 6 insertions(+) create mode 100644 java/spacewalk-java.changes.mc.Manager-4.3-fix-known_hosts-test diff --git a/java/code/src/com/suse/manager/webui/controllers/bootstrap/AbstractMinionBootstrapper.java b/java/code/src/com/suse/manager/webui/controllers/bootstrap/AbstractMinionBootstrapper.java index fb67193496ad..3bf706124e00 100644 --- a/java/code/src/com/suse/manager/webui/controllers/bootstrap/AbstractMinionBootstrapper.java +++ b/java/code/src/com/suse/manager/webui/controllers/bootstrap/AbstractMinionBootstrapper.java @@ -54,6 +54,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -136,6 +137,10 @@ private boolean hasCorrectSSHFileOwnership() throws IOException, CommandExecutio try { if (prc.waitFor() != 0) { + String error = new String(prc.getErrorStream().readAllBytes(), StandardCharsets.UTF_8); + if (error.contains("No such file or directory")) { + return true; + } throw new CommandExecutionException("Error running command: " + cmd, prc); } } diff --git a/java/spacewalk-java.changes.mc.Manager-4.3-fix-known_hosts-test b/java/spacewalk-java.changes.mc.Manager-4.3-fix-known_hosts-test new file mode 100644 index 000000000000..797eda8fc5cf --- /dev/null +++ b/java/spacewalk-java.changes.mc.Manager-4.3-fix-known_hosts-test @@ -0,0 +1 @@ +- handle not existing known_host file in permission check