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

Clean up deps, add missing server alpn

Browse Source
This commit is contained in:
Travis Burtrum 2022-02-17 00:37:22 -05:00
parent cff500016d
commit 7df66e2f78
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@ -61,8 +61,8 @@ futures-util = { version = "0.3", default-features = false, features = ["async-a
default = ["incoming", "outgoing", "quic", "websocket", "logging"] default = ["incoming", "outgoing", "quic", "websocket", "logging"]
incoming = ["tokio-rustls", "rustls-pemfile", "rustls"] incoming = ["tokio-rustls", "rustls-pemfile", "rustls"]
outgoing = ["tokio-rustls", "trust-dns-resolver", "rustls-native-certs", "lazy_static", "rustls", "reqwest", "rustls-pemfile"] outgoing = ["tokio-rustls", "trust-dns-resolver", "rustls-native-certs", "lazy_static", "rustls", "reqwest", "rustls-pemfile"]
quic = ["quinn", "rustls-pemfile", "rustls", "rustls-native-certs"] quic = ["quinn", "rustls-pemfile", "rustls"]
websocket = ["tokio-tungstenite", "futures-util", "tokio-rustls", "rustls-pemfile", "rustls", "rustls-native-certs"] websocket = ["tokio-tungstenite", "futures-util", "tokio-rustls", "rustls-pemfile", "rustls"]
logging = ["rand", "env_logger"] logging = ["rand", "env_logger"]
[package.metadata.cargo-all-features] [package.metadata.cargo-all-features]

8
src/main.rs
View File

@ -64,7 +64,7 @@ const IN_BUFFER_SIZE: usize = 8192;
const ALPN_XMPP_CLIENT: &[u8] = b"xmpp-client"; const ALPN_XMPP_CLIENT: &[u8] = b"xmpp-client";
const ALPN_XMPP_SERVER: &[u8] = b"xmpp-server"; const ALPN_XMPP_SERVER: &[u8] = b"xmpp-server";
#[cfg(feature = "webpki-roots")] #[cfg(all(feature = "webpki-roots", not(feature = "rustls-native-certs")))]
pub fn root_cert_store() -> rustls::RootCertStore { pub fn root_cert_store() -> rustls::RootCertStore {
use rustls::{OwnedTrustAnchor, RootCertStore}; use rustls::{OwnedTrustAnchor, RootCertStore};
let mut root_cert_store = RootCertStore::empty(); let mut root_cert_store = RootCertStore::empty();
@ -77,7 +77,7 @@ pub fn root_cert_store() -> rustls::RootCertStore {
root_cert_store root_cert_store
} }
#[cfg(feature = "rustls-native-certs")] #[cfg(all(feature = "rustls-native-certs", not(feature = "webpki-roots")))]
pub fn root_cert_store() -> rustls::RootCertStore { pub fn root_cert_store() -> rustls::RootCertStore {
use rustls::RootCertStore; use rustls::RootCertStore;
let mut root_cert_store = RootCertStore::empty(); let mut root_cert_store = RootCertStore::empty();
@ -194,7 +194,9 @@ impl Config {
let (tls_certs, tls_key) = self.certs_key()?; let (tls_certs, tls_key) = self.certs_key()?;
// todo: request client auth here // todo: request client auth here
let config = ServerConfig::builder().with_safe_defaults().with_no_client_auth().with_single_cert(tls_certs, tls_key)?; let mut config = ServerConfig::builder().with_safe_defaults().with_no_client_auth().with_single_cert(tls_certs, tls_key)?;
config.alpn_protocols.push(ALPN_XMPP_CLIENT.to_vec());
config.alpn_protocols.push(ALPN_XMPP_SERVER.to_vec());
Ok(config) Ok(config)
} }