From 27b51f69b7c336c082f80896ee580bd836350960 Mon Sep 17 00:00:00 2001 From: Florian Zschocke Date: Tue, 25 Oct 2022 00:00:03 +0200 Subject: [PATCH] Skip SSH host key files that do not exist Since we now do not generate a DSA host key file anymore, but keep it in the list of potential keys so that existing keys still work, it can happen that the files for DSA (and Ed25519) are getting loaded but they do not exist. This results in an error in the log. So instead check if the file exists and only try to load files that exist. This prevents from errors (which are none) being spammed in the log. --- .../java/com/gitblit/transport/ssh/FileKeyPairProvider.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/gitblit/transport/ssh/FileKeyPairProvider.java b/src/main/java/com/gitblit/transport/ssh/FileKeyPairProvider.java index aaa606ce..0e97f557 100644 --- a/src/main/java/com/gitblit/transport/ssh/FileKeyPairProvider.java +++ b/src/main/java/com/gitblit/transport/ssh/FileKeyPairProvider.java @@ -18,6 +18,7 @@ */ package com.gitblit.transport.ssh; +import java.io.File; import java.io.FileInputStream; import java.io.InputStreamReader; import java.security.KeyFactory; @@ -122,6 +123,11 @@ public class FileKeyPairProvider extends AbstractKeyPairProvider { while (iterator.hasNext()) { String file = iterator.next(); + File f = new File(file); + if (!f.isFile()) { + log.debug("File does not exist, skipping {}", file); + continue; + } nextKeyPair = doLoadKey(file); if (nextKeyPair != null) { nextKeyPairSet = true; -- 2.39.5