Add support for STDIO for windows

This commit is contained in:
Σrebe - Romain GERARD 2023-12-13 22:27:42 +01:00
parent 1eb1d95873
commit 1844ea3106
No known key found for this signature in database
GPG key ID: 7A42B4B97E0332F4
4 changed files with 280 additions and 84 deletions

View file

@ -1,6 +1,5 @@
mod embedded_certificate;
mod socks5;
#[cfg(target_family = "unix")]
mod stdio;
mod tcp;
mod tls;
@ -728,9 +727,8 @@ async fn main() {
});
}
#[cfg(target_family = "unix")]
LocalProtocol::Stdio => {
let server = stdio::run_server().await.unwrap_or_else(|err| {
let server = stdio::server::run_server().await.unwrap_or_else(|err| {
panic!("Cannot start STDIO server: {}", err);
});
tokio::spawn(async move {
@ -745,10 +743,6 @@ async fn main() {
}
});
}
#[cfg(not(target_family = "unix"))]
LocalProtocol::Stdio => {
panic!("stdio is not implemented for non unix platform")
}
LocalProtocol::ReverseTcp => {}
LocalProtocol::ReverseUdp { .. } => {}
LocalProtocol::ReverseSocks5 => {}

View file

@ -1,10 +1,80 @@
use tokio_fd::AsyncFd;
#[cfg(unix)]
pub mod server {
pub async fn run_server() -> Result<(AsyncFd, AsyncFd), anyhow::Error> {
eprintln!("Starting STDIO server");
use tokio_fd::AsyncFd;
pub async fn run_server() -> Result<(AsyncFd, AsyncFd), anyhow::Error> {
eprintln!("Starting STDIO server");
let stdin = AsyncFd::try_from(nix::libc::STDIN_FILENO)?;
let stdout = AsyncFd::try_from(nix::libc::STDOUT_FILENO)?;
let stdin = AsyncFd::try_from(nix::libc::STDIN_FILENO)?;
let stdout = AsyncFd::try_from(nix::libc::STDOUT_FILENO)?;
Ok((stdin, stdout))
Ok((stdin, stdout))
}
}
#[cfg(not(unix))]
pub mod server {
use bytes::BytesMut;
use std::io::{Read, Write};
use std::{io, thread};
use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite};
use tokio::task::LocalSet;
use tokio_stream::wrappers::UnboundedReceiverStream;
use tokio_util::io::StreamReader;
pub async fn run_server() -> Result<(impl AsyncRead, impl AsyncWrite), anyhow::Error> {
eprintln!("Starting STDIO server");
crossterm::terminal::enable_raw_mode()?;
let stdin = io::stdin();
let (send, recv) = tokio::sync::mpsc::unbounded_channel();
thread::spawn(move || {
let stdin = stdin;
let mut stdin = stdin.lock();
let mut buf = [0u8; 65536];
loop {
let n = stdin.read(&mut buf).unwrap();
if n == 0 {
break;
}
if let Err(err) = send.send(Result::<_, io::Error>::Ok(BytesMut::from(&buf[..n]))) {
eprintln!("Failed send inout: {:?}", err);
break;
}
}
});
let stdin = StreamReader::new(UnboundedReceiverStream::new(recv));
let (stdout, mut recv) = tokio::io::duplex(65536);
let rt = tokio::runtime::Handle::current();
thread::spawn(move || {
let task = async move {
let mut stdout = io::stdout().lock();
let mut buf = [0u8; 65536];
loop {
let Ok(n) = recv.read(&mut buf).await else {
break;
};
if n == 0 {
break;
}
if let Err(err) = stdout.write_all(&buf[..n]) {
eprintln!("Failed to write to stdout: {:?}", err);
break;
};
let _ = stdout.flush();
}
};
let local = LocalSet::new();
local.spawn_local(task);
rt.block_on(local);
});
Ok((stdin, stdout))
}
}