moparisthebest/xmpp-proxy
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Some documentation and QUIC updates

Browse Source
This commit is contained in:
Travis Burtrum 2021-05-23 22:27:12 -04:00
parent 0d2313e86f
commit 59f8e628ba
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
README.md
View File

@ -52,6 +52,7 @@ use the provided `xmpp-proxy.toml` configuration as-is.
Edit `/etc/prosody/prosody.cfg.lua`, Add these to modules_enabled: Edit `/etc/prosody/prosody.cfg.lua`, Add these to modules_enabled:
``` ```
"net_proxy"; "net_proxy";
"secure_interfaces";
"s2s_outgoing_proxy"; "s2s_outgoing_proxy";
``` ```
Until prosody-modules is updated, use my new module [mod_s2s_outgoing_proxy.lua](https://www.moparisthebest.com/mod_s2s_outgoing_proxy.lua). Until prosody-modules is updated, use my new module [mod_s2s_outgoing_proxy.lua](https://www.moparisthebest.com/mod_s2s_outgoing_proxy.lua).
@ -71,6 +72,9 @@ s2s_secure_auth = false
-- xmpp-proxy outgoing is listening on this port, make all outgoing s2s connections directly to here -- xmpp-proxy outgoing is listening on this port, make all outgoing s2s connections directly to here
s2s_outgoing_proxy = { "127.0.0.1", 15270 } s2s_outgoing_proxy = { "127.0.0.1", 15270 }
-- trust connections coming from these IPs
secure_interfaces = { "127.0.0.1", "::1" }
-- handle PROXY protocol on these ports -- handle PROXY protocol on these ports
proxy_port_mappings = { proxy_port_mappings = {
[15222] = "c2s", [15222] = "c2s",
@ -134,3 +138,8 @@ To build a reverse proxy only, but supporting all of STARTTLS/TLS/QUIC, run: `ca
GNU/AGPLv3 - Check LICENSE.md for details GNU/AGPLv3 - Check LICENSE.md for details
Thanks [rxml](https://github.com/horazont/rxml) for afl-fuzz seeds Thanks [rxml](https://github.com/horazont/rxml) for afl-fuzz seeds
#### todo
1. sasl external for s2s, initiating and recieving
2. better debug log output
3. websocket incoming and outgoing, maybe even for s2s

35
src/quic.rs
View File

@ -15,7 +15,7 @@ pub async fn quic_connect(target: SocketAddr, server_name: &str, is_c2s: bool) -
endpoint_builder.default_client_config(client_cfg); endpoint_builder.default_client_config(client_cfg);
let (endpoint, _incoming) = endpoint_builder.bind(&bind_addr)?; let (endpoint, _incoming) = endpoint_builder.bind(&bind_addr)?;
// connect to server // connect to server
let quinn::NewConnection { connection, .. } = endpoint.connect(&target, server_name).unwrap().await?; let quinn::NewConnection { connection, .. } = endpoint.connect(&target, server_name)?.await?;
debug!("[client] connected: addr={}", connection.remote_address()); debug!("[client] connected: addr={}", connection.remote_address());
let (wrt, rd) = connection.open_bi().await?; let (wrt, rd) = connection.open_bi().await?;
@ -72,24 +72,27 @@ pub fn spawn_quic_listener(local_addr: SocketAddr, config: CloneableConfig, serv
let mut endpoint_builder = Endpoint::builder(); let mut endpoint_builder = Endpoint::builder();
endpoint_builder.listen(server_config); endpoint_builder.listen(server_config);
let (_endpoint, mut incoming) = endpoint_builder.bind(&local_addr).die("cannot listen on port/interface"); let (_endpoint, mut incoming) = endpoint_builder.bind(&local_addr).die("cannot listen on port/interface");
// accept a single connection
tokio::spawn(async move { tokio::spawn(async move {
let incoming_conn = incoming.next().await.unwrap(); // when could this return None, do we quit?
let mut new_conn = incoming_conn.await.unwrap(); while let Some(incoming_conn) = incoming.next().await {
let client_addr = new_conn.connection.remote_address(); let config = config.clone();
let config = config.clone(); tokio::spawn(async move {
tokio::spawn(async move { if let Ok(mut new_conn) = incoming_conn.await {
println!("INFO: {} quic connected", client_addr); let client_addr = new_conn.connection.remote_address();
println!("INFO: {} quic connected", client_addr);
while let Some(Ok((wrt, rd))) = new_conn.bi_streams.next().await { while let Some(Ok((wrt, rd))) = new_conn.bi_streams.next().await {
let config = config.clone(); let config = config.clone();
tokio::spawn(async move { tokio::spawn(async move {
if let Err(e) = shuffle_rd_wr(rd, wrt, config, local_addr, client_addr).await { if let Err(e) = shuffle_rd_wr(rd, wrt, config, local_addr, client_addr).await {
eprintln!("ERROR: {} {}", client_addr, e); eprintln!("ERROR: {} {}", client_addr, e);
}
});
} }
}); }
} });
}); }
println!("INFO: quic listener shutting down, should never happen????");
#[allow(unreachable_code)] #[allow(unreachable_code)]
Ok(()) Ok(())
}) })