aquatic_http: check access list in announce request handler

aquatic_http/src/lib/common.rs

@@ -112,19 +112,18 @@ pub type TorrentMap<I> = HashMap<InfoHash, TorrentData<I>>;
 pub struct TorrentMaps {
     pub ipv4: TorrentMap<Ipv4Addr>,
     pub ipv6: TorrentMap<Ipv6Addr>,
+    pub access_list: AccessList,
 }
 
 #[derive(Clone)]
 pub struct State {
     pub torrent_maps: Arc<Mutex<TorrentMaps>>,
-    pub access_list: Arc<Mutex<AccessList>>,
 }
 
 impl Default for State {
     fn default() -> Self {
         Self {
             torrent_maps: Arc::new(Mutex::new(TorrentMaps::default())),
-            access_list: Arc::new(Mutex::new(AccessList::default())),
         }
     }
 }

aquatic_http/src/lib/handler.rs

@@ -105,11 +105,16 @@ pub fn handle_announce_requests(
     let valid_until = ValidUntil::new(config.cleaning.max_peer_age);
 
     for (meta, request) in requests {
+        let info_hash_allowed = torrent_maps
+            .access_list
+            .allows(config.access_list.mode, &request.info_hash.0);
+
+        let response = if info_hash_allowed {
             let peer_ip = convert_ipv4_mapped_ipv6(meta.peer_addr.ip());
 
             ::log::debug!("peer ip: {:?}", peer_ip);
 
-        let response = match peer_ip {
+            match peer_ip {
                 IpAddr::V4(peer_ip_address) => {
                     let torrent_data: &mut TorrentData<Ipv4Addr> =
                         torrent_maps.ipv4.entry(request.info_hash).or_default();
@@ -168,6 +173,9 @@ pub fn handle_announce_requests(
 
                     Response::Announce(response)
                 }
+            }
+        } else {
+            Response::Failure(FailureResponse::new("Info hash not allowed"))
         };
 
         response_channel_sender.send(meta, response);

aquatic_http/src/lib/lib.rs

@@ -27,8 +27,9 @@ pub fn run(config: Config) -> anyhow::Result<()> {
     match config.access_list.mode {
         AccessListMode::Require | AccessListMode::Forbid => {
             state
-                .access_list
+                .torrent_maps
                 .lock()
+                .access_list
                 .update_from_path(&config.access_list.path)?;
         }
         AccessListMode::Ignore => {}

aquatic_http_protocol/src/response.rs

@@ -135,6 +135,12 @@ pub struct FailureResponse {
 }
 
 impl FailureResponse {
+    pub fn new(reason: &str) -> Self {
+        Self {
+            failure_reason: reason.into()
+        }
+    }
+
     fn write<W: Write>(&self, output: &mut W) -> ::std::io::Result<usize> {
         let mut bytes_written = 0usize;