Merge branch 'master' into 3.0.0

Author: tomaswolf

pom.xml

@@ -92,7 +92,7 @@
         <required.java.version>[${java.sdk.version},)</required.java.version>
 
         <groovy.version>4.0.17</groovy.version>
-        <bouncycastle.version>1.81</bouncycastle.version>
+        <bouncycastle.version>1.82</bouncycastle.version>
             <!-- NOTE: upgrading slf4j beyond this version causes
 
             Execution verify-style of goal org.apache.maven.plugins:maven-checkstyle-plugin:3.1.2:check failed.: NullPointerException
@@ -215,7 +215,7 @@
                     <plugin>
                         <groupId>org.owasp</groupId>
                         <artifactId>dependency-check-maven</artifactId>
-                        <version>12.1.3</version>
+                        <version>12.1.6</version>
                             <!-- see https://jeremylong.github.io/DependencyCheck/dependency-check-maven/configuration.html -->
                         <configuration>
                                 <!-- see https://github.com/jeremylong/DependencyCheck/issues/1394 -->
@@ -269,7 +269,7 @@
                             <dependency>
                                 <groupId>com.google.errorprone</groupId>
                                 <artifactId>error_prone_core</artifactId>
-                                <version>2.41.0</version>
+                                <version>2.42.0</version>
                             </dependency>
                         </dependencies>
                     </plugin>

sshd-common/src/main/java/org/apache/sshd/client/config/hosts/KnownHostEntry.java

@@ -24,7 +24,6 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.io.StreamCorruptedException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -34,12 +33,13 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.sshd.common.config.ConfigFileReaderSupport;
 import org.apache.sshd.common.config.keys.PublicKeyEntry;
 import org.apache.sshd.common.util.GenericUtils;
 import org.apache.sshd.common.util.ValidateUtils;
 import org.apache.sshd.common.util.io.input.NoCloseInputStream;
 import org.apache.sshd.common.util.io.input.NoCloseReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Contains a representation of an entry in the <code>known_hosts</code> file
@@ -58,6 +58,8 @@ public class KnownHostEntry extends HostPatternsHolder {
      */
     public static final String STD_HOSTS_FILENAME = "known_hosts";
 
+    private static final Logger LOG = LoggerFactory.getLogger(KnownHostEntry.class);
+
     private static final class LazyDefaultConfigFileHolder {
         private static final Path HOSTS_FILE = PublicKeyEntry.getDefaultKeysFolderPath().resolve(STD_HOSTS_FILENAME);
 
@@ -181,17 +183,6 @@ public static List<KnownHostEntry> readKnownHostEntries(BufferedReader rdr) thro
             if (GenericUtils.isEmpty(line)) {
                 continue;
             }
-
-            int pos = line.indexOf(ConfigFileReaderSupport.COMMENT_CHAR);
-            if (pos == 0) {
-                continue;
-            }
-
-            if (pos > 0) {
-                line = line.substring(0, pos);
-                line = line.trim();
-            }
-
             try {
                 KnownHostEntry entry = parseKnownHostEntry(line);
                 if (entry == null) {
@@ -202,9 +193,8 @@ public static List<KnownHostEntry> readKnownHostEntries(BufferedReader rdr) thro
                     entries = new ArrayList<>();
                 }
                 entries.add(entry);
-            } catch (RuntimeException | Error e) { // TODO consider consulting a user callback
-                throw new StreamCorruptedException("Failed (" + e.getClass().getSimpleName() + ") to parse line #"
-                                                   + lineNumber + " '" + line + "': " + e.getMessage());
+            } catch (RuntimeException e) { // TODO consider consulting a user callback
+                LOG.warn("Invalid known_hosts line #" + lineNumber + " '" + line + "': " + e.getMessage());
             }
         }
 
@@ -216,43 +206,50 @@ public static List<KnownHostEntry> readKnownHostEntries(BufferedReader rdr) thro
     }
 
     public static KnownHostEntry parseKnownHostEntry(String line) {
-        return parseKnownHostEntry(GenericUtils.isEmpty(line) ? null : new KnownHostEntry(), line);
-    }
-
-    public static <E extends KnownHostEntry> E parseKnownHostEntry(E entry, String data) {
-        String line = GenericUtils.replaceWhitespaceAndTrim(data);
-        if (GenericUtils.isEmpty(line) || (line.charAt(0) == PublicKeyEntry.COMMENT_CHAR)) {
-            return entry;
+        if (line == null) {
+            return null;
+        }
+        String tmp = GenericUtils.replaceWhitespaceAndTrim(line);
+        int i = tmp.indexOf(PublicKeyEntry.COMMENT_CHAR);
+        if (i >= 0) {
+            tmp = tmp.substring(0, i).trim();
+        }
+        if (GenericUtils.isEmpty(tmp)) {
+            return null;
         }
 
+        KnownHostEntry entry = new KnownHostEntry();
         entry.setConfigLine(line);
 
-        if (line.charAt(0) == MARKER_INDICATOR) {
-            int pos = line.indexOf(' ');
-            ValidateUtils.checkTrue(pos > 0, "Missing marker name end delimiter in line=%s", data);
-            ValidateUtils.checkTrue(pos > 1, "No marker name after indicator in line=%s", data);
-            entry.setMarker(line.substring(1, pos));
-            line = line.substring(pos + 1).trim();
+        if (tmp.charAt(0) == MARKER_INDICATOR) {
+            int pos = tmp.indexOf(' ');
+            ValidateUtils.checkTrue(pos > 0, "Missing marker name end delimiter in line=%s", line);
+            ValidateUtils.checkTrue(pos > 1, "No marker name after indicator in line=%s", line);
+            entry.setMarker(tmp.substring(1, pos));
+            tmp = tmp.substring(pos + 1).trim();
         } else {
             entry.setMarker(null);
         }
 
-        int pos = line.indexOf(' ');
-        ValidateUtils.checkTrue(pos > 0, "Missing host patterns end delimiter in line=%s", data);
-        String hostPattern = line.substring(0, pos);
-        line = line.substring(pos + 1).trim();
+        int pos = tmp.indexOf(' ');
+        ValidateUtils.checkTrue(pos > 0, "Missing host patterns end delimiter in line=%s", line);
+        String hostPattern = tmp.substring(0, pos);
+        tmp = tmp.substring(pos + 1).trim();
 
         if (hostPattern.charAt(0) == KnownHostHashValue.HASHED_HOST_DELIMITER) {
             KnownHostHashValue hash = ValidateUtils.checkNotNull(KnownHostHashValue.parse(hostPattern),
-                    "Failed to extract host hash value from line=%s", data);
+                    "Failed to extract host hash value from line=%s", line);
             entry.setHashedEntry(hash);
             entry.setPatterns(null);
         } else {
             entry.setHashedEntry(null);
             entry.setPatterns(parsePatterns(GenericUtils.split(hostPattern, ',')));
         }
         PublicKeyEntry key = PublicKeyEntry.parsePublicKeyEntry(
-                ValidateUtils.checkNotNullAndNotEmpty(line, "No valid key entry recovered from line=%s", data));
+                ValidateUtils.checkNotNullAndNotEmpty(tmp, "No valid key entry recovered from line=%s", line));
+        if (key == null) {
+            return null;
+        }
         entry.setKeyEntry(key);
         return entry;
     }

sshd-contrib/pom.xml

@@ -98,7 +98,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.27.5</version>
+            <version>3.27.6</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

sshd-core/src/test/java/org/apache/sshd/client/keyverifier/KnownHostsUnsupportedKeysTest.java

@@ -70,6 +70,23 @@ void unknownExistingKey() throws Exception {
         assertTrue(invokeVerifier(verifier, new SshdSocketAddress("127.0.0.1", 2222), key));
     }
 
+    @Test
+    void invalidLineIgnored() throws Exception {
+        Path knownHosts = tmp.resolve("known_hosts");
+        String entry
+                = "[127.0.0.1]:2222 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCbZVVpqEHGLNWMqMeyU1VbWb91XteoamVcgpy4yxNVbZffb5IDdbo1ons/y9KAhcub6LZeLrvXzVUZbXCZiUkg=";
+        List<String> lines = new ArrayList<>();
+        lines.add(entry + entry);
+        lines.add(entry);
+        Files.write(knownHosts, lines);
+        KnownHostsServerKeyVerifier verifier = new KnownHostsServerKeyVerifier(RejectAllServerKeyVerifier.INSTANCE, knownHosts);
+        KnownHostEntry knownHost = KnownHostEntry.parseKnownHostEntry(lines.get(1));
+        PublicKeyEntry keyEntry = knownHost.getKeyEntry();
+        assertNotNull(keyEntry);
+        PublicKey key = keyEntry.resolvePublicKey(null, PublicKeyEntryResolver.FAILING);
+        assertTrue(invokeVerifier(verifier, new SshdSocketAddress("127.0.0.1", 2222), key));
+    }
+
     @Test
     void unknownNewKey() throws Exception {
         KeyPair kp = CommonTestSupportUtils.generateKeyPair(KeyUtils.RSA_ALGORITHM, 1024);