Replace cidr-utils crate with ipnetwork

Author: Sebastian Ziebell

Cargo.lock

@@ -35,7 +35,6 @@ cargo-registry-index = { path = "cargo-registry-index" }
 cargo-registry-markdown = { path = "cargo-registry-markdown" }
 cargo-registry-s3 = { path = "cargo-registry-s3" }
 chrono = { version = "=0.4.19", features = ["serde"] }
-cidr-utils = "=0.5.6"
 clap = { version = "=3.1.18", features = ["derive", "unicode"] }
 
 conduit = "=0.10.0"
@@ -62,6 +61,7 @@ hex = "=0.4.3"
 http = "=0.2.7"
 hyper = { version = "=0.14.18", features = ["client", "http1"] }
 indexmap = { version = "=1.8.1", features = ["serde-1"] }
+ipnetwork = "=0.19.0"
 tikv-jemallocator = { version = "=0.4.3", features = ['unprefixed_malloc_on_supported_platforms', 'profiling'] }
 lettre = { version = "=0.10.0-rc.6", default-features = false, features = ["file-transport", "smtp-transport", "native-tls", "hostname", "builder"] }
 minijinja = "=0.15.0"

Cargo.toml

@@ -1,4 +1,4 @@
-use cidr_utils::cidr::Ipv4Cidr;
+use ipnetwork::Ipv4Network;
 
 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<Ipv4Cidr>,
+    pub page_offset_cidr_blocklist: Vec<Ipv4Network>,
     pub excluded_crate_names: Vec<String>,
     pub domain_name: String,
     pub allowed_origins: Vec<String>,
@@ -166,12 +166,12 @@ 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<Ipv4Cidr> {
+fn parse_cidr_blocks(blocks: &[String]) -> Vec<Ipv4Network> {
     blocks
         .iter()
-        .map(|block| match Ipv4Cidr::from_str(block) {
+        .map(|block| match block.parse::<Ipv4Network>() {
             Ok(cidr) => {
-                if cidr.get_bits() < 16 {
+                if cidr.prefix() < 16 {
                     panic!(
                         "WEB_PAGE_OFFSET_CIDR_BLOCKLIST must only contain CIDR blocks with \
                             a host prefix of at least 16 bits."
@@ -232,8 +232,8 @@ fn parse_cidr_block_list_successfully() {
     let blocks = parse_cidr_blocks(&cidr_blocks);
     assert_eq!(
         vec![
-            Ipv4Cidr::from_str("127.0.0.1/24").unwrap(),
-            Ipv4Cidr::from_str("192.168.0.1/31").unwrap(),
+            Ipv4Network::new(std::net::Ipv4Addr::new(127, 0, 0, 1), 24).unwrap(),
+            Ipv4Network::new(std::net::Ipv4Addr::new(192, 168, 0, 1), 31).unwrap(),
         ],
         blocks,
     );

src/config.rs

@@ -3,9 +3,9 @@ use crate::util::{RequestHelper, TestApp};
 use crate::{new_category, new_user};
 use cargo_registry::models::Category;
 use cargo_registry::schema::crates;
-use cidr_utils::cidr::Ipv4Cidr;
 use diesel::{dsl::*, prelude::*, update};
 use http::StatusCode;
+use ipnetwork::Ipv4Network;
 
 #[test]
 fn index() {
@@ -829,7 +829,8 @@ 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![Ipv4Cidr::from_str("127.0.0.1/24").unwrap()];
+            config.page_offset_cidr_blocklist =
+                vec!["127.0.0.1/24".parse::<Ipv4Network>().unwrap()];
         })
         .with_user();
     let user = user.as_model();