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

Work around extra illegal bytes after <starttls...
All checks were successful
moparisthebest/xmpp-proxy/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Travis Burtrum 2023-12-23 02:59:57 -05:00
parent 3122cfb1ff
commit bf6500538e
Signed by: moparisthebest
GPG Key ID: 88C93BFE27BC8229
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tls/incoming.rs
View File

@ -11,11 +11,11 @@ use crate::{
stanzafilter::{StanzaFilter, StanzaReader}, stanzafilter::{StanzaFilter, StanzaReader},
}; };
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use log::{error, info, trace}; use log::{error, info, trace, warn};
use rustls::{ServerConfig, ServerConnection}; use rustls::{ServerConfig, ServerConnection};
use std::{net::SocketAddr, sync::Arc}; use std::{net::SocketAddr, sync::Arc};
use tokio::{ use tokio::{
io::{AsyncWriteExt, BufStream}, io::{AsyncReadExt, AsyncWriteExt, BufStream},
task::JoinHandle, task::JoinHandle,
}; };
use tokio_rustls::TlsAcceptor; use tokio_rustls::TlsAcceptor;
@ -111,7 +111,15 @@ pub async fn handle_tls_connection<S: AsyncReadWritePeekSplit>(mut stream: S, cl
if !proceed_sent { if !proceed_sent {
bail!("stream ended before open"); bail!("stream ended before open");
} }
<S as Split>::combine(in_rd.0, in_wr)? let mut stream = <S as Split>::combine(in_rd.0, in_wr)?;
// though https://datatracker.ietf.org/doc/html/rfc6120#section-5.3.3 says that no data, not even whitespace, should be sent after <starttls...
// some software in the wild actually does send extra stuff, and currently prosody and ejabberd handle this... so we'll read and discard bytes
// until we get to the first byte of the TLS handshake...
while stream.first_bytes_match(&mut in_filter.buf[0..1], |p| p[0] != 0x16).await? {
warn!("{} buggy software connecting, sent byte after <starttls: {}", client_addr.log_to(), &in_filter.buf[0]);
stream.read(&mut in_filter.buf[0..1]).await?;
}
stream
} else { } else {
stream stream
}; };