fix: Assure ReadlineBufRead::readline_str() calls our implementation for Box<T: ReadlineBufRead> as well.

This fixes a bug where the HTTP implementation would incorrectly concatenate packetlines without newlines
as sent by the server for shallow info lines.

Author: Byron

gix-transport/src/client/async_io/bufread_ext.rs

@@ -94,7 +94,7 @@ impl<T: AsyncRead + Unpin> ReadlineBufRead for gix_packetline::read::WithSideban
         self.read_data_line().await
     }
     async fn readline_str(&mut self, line: &mut String) -> io::Result<usize> {
-        self.read_line(line).await
+        self.read_line_to_string(line).await
     }
 }
 
@@ -104,7 +104,7 @@ impl<'a, T: AsyncRead + Unpin> ReadlineBufRead for gix_packetline::read::WithSid
         self.read_data_line().await
     }
     async fn readline_str(&mut self, line: &mut String) -> io::Result<usize> {
-        self.read_line(line).await
+        self.read_line_to_string(line).await
     }
 }
 

gix-transport/src/client/blocking_io/bufread_ext.rs

@@ -1,4 +1,3 @@
-use std::io::BufRead;
 use std::{
     io,
     ops::{Deref, DerefMut},
@@ -58,7 +57,7 @@ impl<'a, T: ReadlineBufRead + ?Sized + 'a> ReadlineBufRead for Box<T> {
         ReadlineBufRead::readline(self.deref_mut())
     }
     fn readline_str(&mut self, line: &mut String) -> io::Result<usize> {
-        self.read_line(line)
+        ReadlineBufRead::readline_str(self.deref_mut(), line)
     }
 }
 
@@ -86,7 +85,7 @@ impl<T: io::Read> ReadlineBufRead for gix_packetline::read::WithSidebands<'_, T,
     }
 
     fn readline_str(&mut self, line: &mut String) -> io::Result<usize> {
-        self.read_line(line)
+        self.read_line_to_string(line)
     }
 }
 
@@ -96,7 +95,7 @@ impl<'a, T: io::Read> ReadlineBufRead for gix_packetline::read::WithSidebands<'a
     }
 
     fn readline_str(&mut self, line: &mut String) -> io::Result<usize> {
-        self.read_line(line)
+        self.read_line_to_string(line)
     }
 }
 

gix-transport/src/client/blocking_io/ssh/tests.rs

@@ -126,22 +126,22 @@ mod program_kind {
                     &["ssh", "-o", "SendEnv=GIT_PROTOCOL", "host"][..],
                 ),
             ] {
-                assert_eq!(call_args(ProgramKind::Ssh, url, protocol), quoted(expected));
+                assert_eq!(call_args(ProgramKind::Ssh, url, protocol), joined(expected));
             }
         }
 
         #[test]
         fn tortoise_plink_has_batch_command() {
             assert_eq!(
                 call_args(ProgramKind::TortoisePlink, "ssh://user@host:42/p", Protocol::V2),
-                quoted(&["tortoiseplink.exe", "-batch", "-P", "42", "user@host"])
+                joined(&["tortoiseplink.exe", "-batch", "-P", "42", "user@host"])
             );
         }
 
         #[test]
         fn port_for_all() {
             for kind in [ProgramKind::TortoisePlink, ProgramKind::Plink, ProgramKind::Putty] {
-                assert!(call_args(kind, "ssh://user@host:43/p", Protocol::V2).ends_with(r#""-P" "43" "user@host""#));
+                assert!(call_args(kind, "ssh://user@host:43/p", Protocol::V2).ends_with("-P 43 user@host"));
             }
         }
 
@@ -153,7 +153,7 @@ mod program_kind {
             }
             assert_eq!(
                 call_args(ProgramKind::Simple, "ssh://user@host/p", Protocol::V2),
-                quoted(&["simple", "user@host"]),
+                joined(&["simple", "user@host"]),
                 "simple can only do simple invocations"
             );
         }
@@ -191,8 +191,8 @@ mod program_kind {
             Ok(())
         }
 
-        fn quoted(input: &[&str]) -> String {
-            input.iter().map(|s| format!("\"{s}\"")).collect::<Vec<_>>().join(" ")
+        fn joined(input: &[&str]) -> String {
+            input.iter().copied().collect::<Vec<_>>().join(" ")
         }
         fn try_call(
             kind: ProgramKind,
@@ -207,7 +207,15 @@ mod program_kind {
             try_call(kind, url, version).expect("no error")
         }
         fn call_args(kind: ProgramKind, url: &str, version: Protocol) -> String {
-            format!("{:?}", std::process::Command::from(call(kind, url, version)))
+            let cmd = std::process::Command::from(call(kind, url, version));
+            format!(
+                "{} {}",
+                cmd.get_program().to_string_lossy(),
+                cmd.get_args()
+                    .map(|arg| arg.to_string_lossy().into_owned())
+                    .collect::<Vec<_>>()
+                    .join(" ")
+            )
         }
 
         type Result = std::result::Result<(), ssh::invocation::Error>;