luckyimnotanigger/tun2proxy
1
0
Fork 0
mirror of https://github.com/tun2proxy/tun2proxy.git synced 2025-06-08 15:47:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ConnectionInfo

Browse source
This commit is contained in:
ssrlive 2023-08-10 14:17:07 +08:00
parent 94835c41a4
commit 489d5fec00
3 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/http.rs
View file

@ -8,7 +8,7 @@ use crate::{
use base64::Engine; use base64::Engine;
use httparse::Response; use httparse::Response;
use smoltcp::wire::IpProtocol; use smoltcp::wire::IpProtocol;
use socks5_impl::protocol::{Address, UserKey}; use socks5_impl::protocol::UserKey;
use std::{ use std::{
cell::RefCell, cell::RefCell,
collections::{hash_map::RandomState, HashMap, VecDeque}, collections::{hash_map::RandomState, HashMap, VecDeque},
@ -52,7 +52,7 @@ pub struct HttpConnection {
digest_state: Rc<RefCell<Option<DigestState>>>, digest_state: Rc<RefCell<Option<DigestState>>>,
before: bool, before: bool,
credentials: Option<UserKey>, credentials: Option<UserKey>,
destination: Address, info: ConnectionInfo,
} }
static PROXY_AUTHENTICATE: &str = "Proxy-Authenticate"; static PROXY_AUTHENTICATE: &str = "Proxy-Authenticate";
@ -80,7 +80,7 @@ impl HttpConnection {
digest_state, digest_state,
before: false, before: false,
credentials, credentials,
destination: info.dst.clone(), info: info.clone(),
}; };
res.send_tunnel_request()?; res.send_tunnel_request()?;
@ -89,9 +89,9 @@ impl HttpConnection {
fn send_tunnel_request(&mut self) -> Result<(), Error> { fn send_tunnel_request(&mut self) -> Result<(), Error> {
self.server_outbuf.extend(b"CONNECT "); self.server_outbuf.extend(b"CONNECT ");
self.server_outbuf.extend(self.destination.to_string().as_bytes()); self.server_outbuf.extend(self.info.dst.to_string().as_bytes());
self.server_outbuf.extend(b" HTTP/1.1\r\nHost: "); self.server_outbuf.extend(b" HTTP/1.1\r\nHost: ");
self.server_outbuf.extend(self.destination.to_string().as_bytes()); self.server_outbuf.extend(self.info.dst.to_string().as_bytes());
self.server_outbuf.extend(b"\r\n"); self.server_outbuf.extend(b"\r\n");
self.send_auth_data(if self.digest_state.borrow().is_none() { self.send_auth_data(if self.digest_state.borrow().is_none() {
@ -111,7 +111,7 @@ impl HttpConnection {
match scheme { match scheme {
AuthenticationScheme::Digest => { AuthenticationScheme::Digest => {
let uri = self.destination.to_string(); let uri = self.info.dst.to_string();
let context = digest_auth::AuthContext::new_with_method( let context = digest_auth::AuthContext::new_with_method(
&credentials.username, &credentials.username,
@ -318,6 +318,10 @@ impl HttpConnection {
} }
impl TcpProxy for HttpConnection { impl TcpProxy for HttpConnection {
fn get_connection_info(&self) -> &ConnectionInfo {
&self.info
}
fn push_data(&mut self, event: IncomingDataEvent<'_>) -> Result<(), Error> { fn push_data(&mut self, event: IncomingDataEvent<'_>) -> Result<(), Error> {
let direction = event.direction; let direction = event.direction;
let buffer = event.buffer; let buffer = event.buffer;

4
src/socks.rs
View file

@ -263,6 +263,10 @@ impl SocksProxyImpl {
} }
impl TcpProxy for SocksProxyImpl { impl TcpProxy for SocksProxyImpl {
fn get_connection_info(&self) -> &ConnectionInfo {
&self.info
}
fn push_data(&mut self, event: IncomingDataEvent<'_>) -> Result<(), Error> { fn push_data(&mut self, event: IncomingDataEvent<'_>) -> Result<(), Error> {
let direction = event.direction; let direction = event.direction;
let buffer = event.buffer; let buffer = event.buffer;

22
src/tun2proxy.rs
View file

@ -18,7 +18,7 @@ use std::{
str::FromStr, str::FromStr,
}; };
#[derive(Hash, Clone, Eq, PartialEq, Debug)] #[derive(Hash, Clone, Eq, PartialEq, PartialOrd, Ord, Debug)]
pub(crate) struct ConnectionInfo { pub(crate) struct ConnectionInfo {
pub(crate) src: SocketAddr, pub(crate) src: SocketAddr,
pub(crate) dst: Address, pub(crate) dst: Address,
@ -36,7 +36,6 @@ impl Default for ConnectionInfo {
} }
impl ConnectionInfo { impl ConnectionInfo {
#[allow(dead_code)]
pub fn new(src: SocketAddr, dst: Address, protocol: IpProtocol) -> Self { pub fn new(src: SocketAddr, dst: Address, protocol: IpProtocol) -> Self {
Self { src, dst, protocol } Self { src, dst, protocol }
} }
@ -133,11 +132,11 @@ fn connection_tuple(frame: &[u8]) -> Result<(ConnectionInfo, bool, usize, usize)
let (ports, first_packet, payload_offset, payload_size) = let (ports, first_packet, payload_offset, payload_size) =
get_transport_info(protocol, header_len, &frame[header_len..])?; get_transport_info(protocol, header_len, &frame[header_len..])?;
let info = ConnectionInfo { let info = ConnectionInfo::new(
src: SocketAddr::new(src_addr, ports.0), SocketAddr::new(src_addr, ports.0),
dst: SocketAddr::new(dst_addr, ports.1).into(), SocketAddr::new(dst_addr, ports.1).into(),
protocol, protocol,
}; );
return Ok((info, first_packet, payload_offset, payload_size)); return Ok((info, first_packet, payload_offset, payload_size));
} }
@ -154,11 +153,11 @@ fn connection_tuple(frame: &[u8]) -> Result<(ConnectionInfo, bool, usize, usize)
let (ports, first_packet, payload_offset, payload_size) = let (ports, first_packet, payload_offset, payload_size) =
get_transport_info(protocol, header_len, &frame[header_len..])?; get_transport_info(protocol, header_len, &frame[header_len..])?;
let info = ConnectionInfo { let info = ConnectionInfo::new(
src: SocketAddr::new(src_addr, ports.0), SocketAddr::new(src_addr, ports.0),
dst: SocketAddr::new(dst_addr, ports.1).into(), SocketAddr::new(dst_addr, ports.1).into(),
protocol, protocol,
}; );
return Ok((info, first_packet, payload_offset, payload_size)); return Ok((info, first_packet, payload_offset, payload_size));
} }
Err("Neither IPv6 nor IPv4 packet".into()) Err("Neither IPv6 nor IPv4 packet".into())
@ -178,6 +177,7 @@ struct TcpConnectState {
} }
pub(crate) trait TcpProxy { pub(crate) trait TcpProxy {
fn get_connection_info(&self) -> &ConnectionInfo;
fn push_data(&mut self, event: IncomingDataEvent<'_>) -> Result<(), Error>; fn push_data(&mut self, event: IncomingDataEvent<'_>) -> Result<(), Error>;
fn consume_data(&mut self, dir: OutgoingDirection, size: usize); fn consume_data(&mut self, dir: OutgoingDirection, size: usize);
fn peek_data(&mut self, dir: OutgoingDirection) -> OutgoingDataEvent; fn peek_data(&mut self, dir: OutgoingDirection) -> OutgoingDataEvent;
@ -193,7 +193,7 @@ pub(crate) trait UdpProxy {
pub(crate) trait ConnectionManager { pub(crate) trait ConnectionManager {
fn handles_connection(&self, info: &ConnectionInfo) -> bool; fn handles_connection(&self, info: &ConnectionInfo) -> bool;
fn new_tcp_proxy(&self, info: &ConnectionInfo, udp_associate: bool) -> Result<Box<dyn TcpProxy>, Error>; fn new_tcp_proxy(&self, info: &ConnectionInfo, udp_associate: bool) -> Result<Box<dyn TcpProxy>>;
fn close_connection(&self, info: &ConnectionInfo); fn close_connection(&self, info: &ConnectionInfo);
fn get_server_addr(&self) -> SocketAddr; fn get_server_addr(&self) -> SocketAddr;
fn get_credentials(&self) -> &Option<UserKey>; fn get_credentials(&self) -> &Option<UserKey>;