Expand CIDR block list to support IPv6 ranges

This refactors the `WEB_PAGE_OFFSET_CIDR_BLOCKLIST` block list to also
support IPv6 based CIDR blocks.

Author: justahero

src/config.rs

@@ -1,4 +1,4 @@
-use ipnetwork::Ipv4Network;
+use ipnetwork::IpNetwork;
 
 use crate::publish_rate_limit::PublishRateLimit;
 use crate::{env, env_optional, uploaders::Uploader, Env};
@@ -27,7 +27,7 @@ pub struct Server {
     pub blocked_traffic: Vec<(String, Vec<String>)>,
     pub max_allowed_page_offset: u32,
     pub page_offset_ua_blocklist: Vec<String>,
-    pub page_offset_cidr_blocklist: Vec<Ipv4Network>,
+    pub page_offset_cidr_blocklist: Vec<IpNetwork>,
     pub excluded_crate_names: Vec<String>,
     pub domain_name: String,
     pub allowed_origins: Vec<String>,
@@ -166,21 +166,28 @@ pub(crate) fn domain_name() -> String {
 /// * Only IPv4 blocks are currently supported.
 /// * The minimum number of host prefix bits must be at least 16.
 ///
-fn parse_cidr_blocks(blocks: &[String]) -> Vec<Ipv4Network> {
+fn parse_cidr_blocks(blocks: &[String]) -> Vec<IpNetwork> {
     blocks
         .iter()
-        .map(|block| match block.parse::<Ipv4Network>() {
-            Ok(cidr) => {
-                if cidr.prefix() < 16 {
-                    panic!(
-                        "WEB_PAGE_OFFSET_CIDR_BLOCKLIST must only contain CIDR blocks with \
-                            a host prefix of at least 16 bits."
-                    )
-                } else {
-                    cidr
-                }
+        .map(|block| {
+            let network = block.parse::<IpNetwork>();
+            match network {
+                Ok(cidr) => {
+                    let host_prefix = match cidr {
+                        IpNetwork::V4(_) => 16,
+                        IpNetwork::V6(_) => 64,
+                    };
+                    if cidr.prefix() < host_prefix {
+                        panic!(
+                            "WEB_PAGE_OFFSET_CIDR_BLOCKLIST only allows CIDR blocks with a host prefix \
+                                of at least 16 bits (IPv4) or 64 bits (IPv6)."
+                        );
+                    } else {
+                        cidr
+                    }
+                },
+                Err(_) => panic!("WEB_PAGE_OFFSET_CIDR_BLOCKLIST must contain IPv4 or IPv6 CIDR blocks."),
             }
-            Err(_) => panic!("WEB_PAGE_OFFSET_CIDR_BLOCKLIST only allows IPv4 CIDR blocks"),
         })
         .collect::<Vec<_>>()
 }
@@ -232,23 +239,32 @@ fn parse_cidr_block_list_successfully() {
     let blocks = parse_cidr_blocks(&cidr_blocks);
     assert_eq!(
         vec![
-            "127.0.0.1/24".parse::<Ipv4Network>().unwrap(),
-            "192.168.0.1/31".parse::<Ipv4Network>().unwrap(),
+            "127.0.0.1/24".parse::<IpNetwork>().unwrap(),
+            "192.168.0.1/31".parse::<IpNetwork>().unwrap(),
         ],
         blocks,
     );
 }
 
 #[test]
 #[should_panic]
-fn parse_cidr_blocks_panics_when_host_prefix_is_too_low() {
-    let input = vec!["127.0.0.1/8".to_string()];
-    parse_cidr_blocks(&input);
+fn parse_cidr_blocks_panics_when_host_ipv4_prefix_is_too_low() {
+    parse_cidr_blocks(&vec!["127.0.0.1/8".to_string()]);
 }
 
 #[test]
 #[should_panic]
-fn parse_cidr_blocks_panics_when_ipv6_is_given() {
-    let input = vec!["2002::1234:abcd:ffff:c0a8:101/64".to_string()];
-    parse_cidr_blocks(&input);
+fn parse_cidr_blocks_panics_when_host_ipv6_prefix_is_too_low() {
+    parse_cidr_blocks(&vec![
+        "2001:0db8:0123:4567:89ab:cdef:1234:5678/56".to_string()
+    ]);
+}
+
+#[test]
+fn parse_ipv6_based_cidr_blocks() {
+    let input = vec![
+        "2002::1234:abcd:ffff:c0a8:101/64".to_string(),
+        "2001:0db8:0123:4567:89ab:cdef:1234:5678/92".to_string(),
+    ];
+    assert_eq!(2, parse_cidr_blocks(&input).len());
 }

src/controllers/helpers/pagination.rs

@@ -12,7 +12,7 @@ use diesel::query_dsl::LoadQuery;
 use diesel::sql_types::BigInt;
 use indexmap::IndexMap;
 use serde::{Deserialize, Serialize};
-use std::net::Ipv4Addr;
+use std::net::IpAddr;
 use std::str::FromStr;
 use std::sync::Arc;
 
@@ -274,7 +274,7 @@ fn is_useragent_or_ip_blocked(config: &Server, req: &dyn RequestExt) -> bool {
     }
 
     // check if client ip is blocked, needs to be an IPv4 address
-    if let Ok(client_ip) = Ipv4Addr::from_str(client_ip) {
+    if let Ok(client_ip) = IpAddr::from_str(client_ip) {
         if config
             .page_offset_cidr_blocklist
             .iter()

src/tests/krate/search.rs

@@ -5,7 +5,7 @@ use cargo_registry::models::Category;
 use cargo_registry::schema::crates;
 use diesel::{dsl::*, prelude::*, update};
 use http::StatusCode;
-use ipnetwork::Ipv4Network;
+use ipnetwork::IpNetwork;
 
 #[test]
 fn index() {
@@ -829,8 +829,7 @@ fn pagination_blocks_ip_from_cidr_block_list() {
     let (app, anon, user) = TestApp::init()
         .with_config(|config| {
             config.max_allowed_page_offset = 1;
-            config.page_offset_cidr_blocklist =
-                vec!["127.0.0.1/24".parse::<Ipv4Network>().unwrap()];
+            config.page_offset_cidr_blocklist = vec!["127.0.0.1/24".parse::<IpNetwork>().unwrap()];
         })
         .with_user();
     let user = user.as_model();