magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

propagate config error for cidr range

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-09-01 11:09:36 +00:00
parent 60605e9579
commit 4bac9b33cc
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/service/globals/mod.rs
View file

@ -8,7 +8,7 @@ use std::{
time::Instant, time::Instant,
}; };
use conduit::{error, trace, Config, Result}; use conduit::{err, error, trace, Config, Result};
use data::Data; use data::Data;
use ipaddress::IPAddress; use ipaddress::IPAddress;
use regex::RegexSet; use regex::RegexSet;
@ -79,12 +79,10 @@ impl crate::Service for Service {
let cidr_range_denylist: Vec<_> = config let cidr_range_denylist: Vec<_> = config
.ip_range_denylist .ip_range_denylist
.iter() .iter()
.map(|cidr| { .map(IPAddress::parse)
let cidr = IPAddress::parse(cidr).expect("valid cidr range"); .inspect(|cidr| trace!("Denied CIDR range: {cidr:?}"))
trace!("Denied CIDR range: {:?}", cidr); .collect::<Result<_, String>>()
cidr .map_err(|e| err!(Config("ip_range_denylist", e)))?;
})
.collect();
let mut s = Self { let mut s = Self {
db, db,