fixed #112 - parse and handle hostkeys-00@openssh.com requests

Author: Eugeny

russh/src/client/encrypted.rs

@@ -16,6 +16,7 @@ use std::cell::RefCell;
 
 use russh_cryptovec::CryptoVec;
 use russh_keys::encoding::{Encoding, Reader};
+use russh_keys::key::parse_public_key;
 use tokio::sync::mpsc::unbounded_channel;
 
 use crate::client::{Handler, Msg, Reply, Session};
@@ -520,6 +521,34 @@ impl Session {
                         } else {
                             warn!("Received keepalive without reply request!");
                         }
+                    } else if req == b"hostkeys-00@openssh.com" {
+                        let mut keys = vec![];
+                        loop {
+                            match r.read_string() {
+                                Ok(key) => {
+                                    let key2 = key.clone();
+                                    #[cfg(not(feature = "openssl"))]
+                                    let key = parse_public_key(key).map_err(crate::Error::from);
+                                    #[cfg(feature = "openssl")]
+                                    let key =
+                                        parse_public_key(key, None).map_err(crate::Error::from);
+                                    match key {
+                                        Ok(key) => keys.push(key),
+                                        Err(err) => {
+                                            debug!(
+                                                "failed to parse announced host key {:?}: {:?}",
+                                                key2, err
+                                            )
+                                        }
+                                    }
+                                }
+                                Err(russh_keys::Error::IndexOutOfBounds) => break,
+                                x => {
+                                    x.map_err(crate::Error::from)?;
+                                }
+                            }
+                        }
+                        return client.openssh_ext_host_keys_announced(keys, self).await;
                     } else {
                         warn!(
                             "Unhandled global request: {:?} {:?}",

russh/src/client/mod.rs

@@ -92,7 +92,7 @@ use russh_cryptovec::CryptoVec;
 use russh_keys::encoding::Reader;
 #[cfg(feature = "openssl")]
 use russh_keys::key::SignatureHash;
-use russh_keys::key::{self, parse_public_key};
+use russh_keys::key::{self, parse_public_key, PublicKey};
 use tokio;
 use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt};
 use tokio::net::{TcpStream, ToSocketAddrs};
@@ -1473,4 +1473,15 @@ pub trait Handler: Sized + Send {
     fn adjust_window(&mut self, channel: ChannelId, window: u32) -> u32 {
         window
     }
+
+    /// Called when the server signals success.
+    #[allow(unused_variables)]
+    async fn openssh_ext_host_keys_announced(
+        self,
+        keys: Vec<PublicKey>,
+        session: Session,
+    ) -> Result<(Self, Session), Self::Error> {
+        debug!("openssh_ext_hostkeys_announced: {:?}", keys);
+        Ok((self, session))
+    }
 }