warp-tech/warpgate
1
1
Fork 0
mirror of https://github.com/warp-tech/warpgate.git synced 2025-09-16 19:44:30 +08:00
Code Issues Projects Releases Packages Wiki Activity

fixed #1286 - do not trigger target connection from an agent channel open alone

Browse source
This commit is contained in:
Eugene 2025-08-23 20:32:35 +02:00
parent 0890ac4304
commit 167f001429
No known key found for this signature in database
GPG key ID: 5896FCBBDD1CF4F4
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
warpgate-protocol-ssh/src/server/session.rs
View file

@ -329,6 +329,16 @@ impl ServerSession {
Ok(())
}
/// Start connecting to the target if we aren't already.
///
/// Timing of this call is important because if the client connection is
/// an interactive session *in principle* (e.g a normal interactive OpenSSH
/// session but maybe with some port forwards or agent)
/// Ideally, it needs to be called by the time we already have the interactive
/// channel open if we will ever have one to prevent bugs like
/// https://github.com/warp-tech/warpgate/issues/1286
/// where a PTY channel is required for the host key prompt, but we've connected
/// faster than the client could open one.
pub async fn maybe_connect_remote(&mut self) -> Result<()> {
match self.target.clone() {
TargetSelection::None => {
@ -1330,7 +1340,6 @@ impl ServerSession {
async fn _agent_forward(&mut self, server_channel_id: ServerChannelId) -> Result<()> {
let channel_id = self.map_channel(&server_channel_id)?;
debug!(channel=%channel_id, "Requested Agent Forwarding");
let _ = self.maybe_connect_remote().await;
self.send_command_and_wait(RCCommand::Channel(
channel_id,
ChannelOperation::AgentForward,