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

move cidr_range_denylist from globals to client service

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-12-03 07:35:48 +00:00
parent 9d9f403ad5
commit c01b049910
6 changed files with 28 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,9 +7,8 @@ use std::{
time::Instant,
};
use conduit::{err, error, trace, Config, Result};
use conduit::{error, Config, Result};
use data::Data;
use ipaddress::IPAddress;
use regex::RegexSet;
use ruma::{
OwnedEventId, OwnedRoomAliasId, OwnedServerName, OwnedUserId, RoomAliasId, RoomVersionId, ServerName, UserId,
@ -22,7 +21,6 @@ pub struct Service {
pub db: Data,
pub config: Config,
pub cidr_range_denylist: Vec<IPAddress>,
jwt_decoding_key: Option<jsonwebtoken::DecodingKey>,
pub stable_room_versions: Vec<RoomVersionId>,
pub unstable_room_versions: Vec<RoomVersionId>,
@ -59,14 +57,6 @@ impl crate::Service for Service {
// Experimental, partially supported room versions
let unstable_room_versions = vec![RoomVersionId::V2, RoomVersionId::V3, RoomVersionId::V4, RoomVersionId::V5];
let cidr_range_denylist: Vec<_> = config
.ip_range_denylist
.iter()
.map(IPAddress::parse)
.inspect(|cidr| trace!("Denied CIDR range: {cidr:?}"))
.collect::<Result<_, String>>()
.map_err(|e| err!(Config("ip_range_denylist", e)))?;
let turn_secret = config
.turn_secret_file
.as_ref()
@ -95,7 +85,6 @@ impl crate::Service for Service {
let mut s = Self {
db,
config: config.clone(),
cidr_range_denylist,
jwt_decoding_key,
stable_room_versions,
unstable_room_versions,
@ -255,17 +244,6 @@ impl Service {
}
}
#[inline]
pub fn valid_cidr_range(&self, ip: &IPAddress) -> bool {
for cidr in &self.cidr_range_denylist {
if cidr.includes(ip) {
return false;
}
}
true
}
/// checks if `user_id` is local to us via server_name comparison
#[inline]
pub fn user_is_local(&self, user_id: &UserId) -> bool { self.server_is_ours(user_id.server_name()) }