handle not existing known_host file in permission check

uyuni-project · Jan 20, 2024 · ee4f492 · ee4f492
1 parent a39afbc
commit ee4f492
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
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
@@ -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
@@ -0,0 +1 @@
+- handle not existing known_host file in permission check