Merge branch 'master' into cpu-pinning-2022-03-30

aquatic_http/Cargo.toml

@@ -16,10 +16,10 @@ name = "aquatic_http"
 name = "aquatic_http"
 
 [dependencies]
-aquatic_cli_helpers = "0.2.0"
-aquatic_common = { version = "0.2.0", features = ["with-glommio"] }
-aquatic_http_protocol = "0.2.0"
-aquatic_toml_config = "0.2.0"
+aquatic_cli_helpers = { version = "0.2.0", path = "../aquatic_cli_helpers" }
+aquatic_common = { version = "0.2.0", path = "../aquatic_common", features = ["rustls-config", "with-glommio"] }
+aquatic_http_protocol = { version = "0.2.0", path = "../aquatic_http_protocol" }
+aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" }
 
 anyhow = "1"
 cfg-if = "1"

aquatic_http/src/common.rs

@@ -10,8 +10,6 @@ use aquatic_http_protocol::{
     response::{AnnounceResponse, ScrapeResponse},
 };
 
-pub type TlsConfig = futures_rustls::rustls::ServerConfig;
-
 #[derive(Copy, Clone, Debug)]
 pub struct ConsumerId(pub usize);
 

aquatic_http/src/lib.rs

@@ -5,15 +5,12 @@ use aquatic_common::{
         WorkerIndex,
     },
     privileges::drop_privileges_after_socket_binding,
+    rustls_config::create_rustls_config,
 };
-use common::{State, TlsConfig};
+use common::State;
 use glommio::{channels::channel_mesh::MeshBuilder, prelude::*};
 use signal_hook::{consts::SIGUSR1, iterator::Signals};
-use std::{
-    fs::File,
-    io::BufReader,
-    sync::{atomic::AtomicUsize, Arc},
-};
+use std::sync::{atomic::AtomicUsize, Arc};
 
 use crate::config::Config;
 
@@ -68,7 +65,10 @@ pub fn run_inner(config: Config, state: State) -> anyhow::Result<()> {
 
     let num_bound_sockets = Arc::new(AtomicUsize::new(0));
 
-    let tls_config = Arc::new(create_tls_config(&config).unwrap());
+    let tls_config = Arc::new(create_rustls_config(
+        &config.network.tls_certificate_path,
+        &config.network.tls_private_key_path,
+    )?);
 
     let mut executors = Vec::new();
 
@@ -154,32 +154,3 @@ pub fn run_inner(config: Config, state: State) -> anyhow::Result<()> {
 
     Ok(())
 }
-
-fn create_tls_config(config: &Config) -> anyhow::Result<TlsConfig> {
-    let certs = {
-        let f = File::open(&config.network.tls_certificate_path)?;
-        let mut f = BufReader::new(f);
-
-        rustls_pemfile::certs(&mut f)?
-            .into_iter()
-            .map(|bytes| futures_rustls::rustls::Certificate(bytes))
-            .collect()
-    };
-
-    let private_key = {
-        let f = File::open(&config.network.tls_private_key_path)?;
-        let mut f = BufReader::new(f);
-
-        rustls_pemfile::pkcs8_private_keys(&mut f)?
-            .first()
-            .map(|bytes| futures_rustls::rustls::PrivateKey(bytes.clone()))
-            .ok_or(anyhow::anyhow!("No private keys in file"))?
-    };
-
-    let tls_config = futures_rustls::rustls::ServerConfig::builder()
-        .with_safe_defaults()
-        .with_no_client_auth()
-        .with_single_cert(certs, private_key)?;
-
-    Ok(tls_config)
-}

aquatic_http/src/workers/request.rs

@@ -337,6 +337,7 @@ pub fn handle_announce_request(
                 announce_interval: config.protocol.peer_announce_interval,
                 peers: ResponsePeerListV4(response_peers),
                 peers6: ResponsePeerListV6(vec![]),
+                warning_message: None,
             };
 
             response
@@ -366,6 +367,7 @@ pub fn handle_announce_request(
                 announce_interval: config.protocol.peer_announce_interval,
                 peers: ResponsePeerListV4(vec![]),
                 peers6: ResponsePeerListV6(response_peers),
+                warning_message: None,
             };
 
             response

aquatic_http/src/workers/socket.rs

@@ -7,6 +7,7 @@ use std::sync::Arc;
 use std::time::{Duration, Instant};
 
 use aquatic_common::access_list::{create_access_list_cache, AccessListArcSwap, AccessListCache};
+use aquatic_common::rustls_config::RustlsConfig;
 use aquatic_common::CanonicalSocketAddr;
 use aquatic_http_protocol::common::InfoHash;
 use aquatic_http_protocol::request::{Request, RequestParseError, ScrapeRequest};
@@ -54,7 +55,7 @@ struct ConnectionReference {
 pub async fn run_socket_worker(
     config: Config,
     state: State,
-    tls_config: Arc<TlsConfig>,
+    tls_config: Arc<RustlsConfig>,
     request_mesh_builder: MeshBuilder<ChannelRequest, Partial>,
     response_mesh_builder: MeshBuilder<ChannelResponse, Partial>,
     num_bound_sockets: Arc<AtomicUsize>,
@@ -195,7 +196,7 @@ impl Connection {
         response_receiver: LocalReceiver<ChannelResponse>,
         response_consumer_id: ConsumerId,
         connection_id: ConnectionId,
-        tls_config: Arc<TlsConfig>,
+        tls_config: Arc<RustlsConfig>,
         connection_slab: Rc<RefCell<Slab<ConnectionReference>>>,
         stream: TcpStream,
     ) -> anyhow::Result<()> {