filip/Stalwart
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Config file changes

Browse Source
This commit is contained in:
mdecimus
2024-03-20 12:03:10 +01:00
parent 9a4110e343
commit 7e1a95c1ee
21 changed files with 126 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crates/imap-proto/src/protocol/mod.rs
View File

@@ -24,7 +24,7 @@
use std::{cmp::Ordering, fmt::Display};
use ahash::AHashSet;
use chrono::{DateTime, NaiveDateTime, Utc};
use chrono::{DateTime, Utc};
use jmap_proto::types::keyword::Keyword;
use crate::{Command, ResponseCode, ResponseType, StatusResponse};
@@ -218,13 +218,11 @@ pub fn literal_string(buf: &mut Vec<u8>, text: &[u8]) {
pub fn quoted_timestamp(buf: &mut Vec<u8>, timestamp: i64) {
buf.push(b'"');
buf.extend_from_slice(
DateTime::<Utc>::from_naive_utc_and_offset(
NaiveDateTime::from_timestamp_opt(timestamp, 0).unwrap_or_default(),
Utc,
)
.format("%d-%b-%Y %H:%M:%S %z")
.to_string()
.as_bytes(),
DateTime::<Utc>::from_timestamp(timestamp, 0)
.unwrap_or_default()
.format("%d-%b-%Y %H:%M:%S %z")
.to_string()
.as_bytes(),
);
buf.push(b'"');
}

9
crates/imap/src/lib.rs
View File

@@ -44,9 +44,10 @@ static SERVER_GREETING: &str = concat!(
impl IMAP {
pub async fn init(config: &Config) -> utils::config::Result<Arc<Self>> {
let shard_amount = config
.property::<u64>("global.shared-map.shard")?
.property::<u64>("cache.shard")?
.unwrap_or(32)
.next_power_of_two() as usize;
let capacity = config.property("cache.capacity")?.unwrap_or(100);
Ok(Arc::new(IMAP {
max_request_size: config.property_or_static("imap.request.max-size", "52428800")?,
@@ -69,7 +70,7 @@ impl IMAP {
})
.into_bytes(),
rate_limiter: DashMap::with_capacity_and_hasher_and_shard_amount(
config.property("cache.rate-limit.size")?.unwrap_or(2048),
capacity,
RandomState::default(),
shard_amount,
),
@@ -77,10 +78,10 @@ impl IMAP {
rate_concurrent: config.property("imap.rate-limit.concurrent")?.unwrap_or(4),
allow_plain_auth: config.property_or_static("imap.auth.allow-plain-text", "false")?,
cache_account: LruCache::with_capacity(
config.property("cache.messages.size")?.unwrap_or(2048),
config.property("cache.account.size")?.unwrap_or(2048),
),
cache_mailbox: LruCache::with_capacity(
config.property("cache.messages.size")?.unwrap_or(2048),
config.property("cache.mailbox.size")?.unwrap_or(2048),
),
}))
}

14
crates/jmap/src/api/config.rs
View File

@@ -33,7 +33,7 @@ impl crate::Config {
let mut config = Self {
default_language: Language::from_iso_639(
settings
.value("storage.fts.default-language")
.value("storage.full-text.default-language")
.unwrap_or("en"),
)
.unwrap_or(Language::English),
@@ -102,7 +102,7 @@ impl crate::Config {
rate_authenticated: settings
.property_or_static("jmap.rate-limit.account", "1000/1m")?,
rate_authenticate_req: settings
.property_or_static("jmap.rate-limit.authentication", "10/1m")?,
.property_or_static("authentication.rate-limit", "10/1m")?,
rate_anonymous: settings.property_or_static("jmap.rate-limit.anonymous", "100/1m")?,
rate_use_forwarded: settings
.property("jmap.rate-limit.use-forwarded")?
@@ -143,7 +143,7 @@ impl crate::Config {
.unwrap_or(true),
encrypt: settings.property_or_static("storage.encryption.enable", "true")?,
encrypt_append: settings.property_or_static("storage.encryption.append", "false")?,
spam_header: settings.value("storage.spam.header").and_then(|v| {
spam_header: settings.value("spam.header.is-spam").and_then(|v| {
v.split_once(':').map(|(k, v)| {
(
mail_parser::HeaderName::parse(k.trim().to_string()).unwrap(),
@@ -152,26 +152,26 @@ impl crate::Config {
})
}),
http_headers: settings
.values("jmap.http.headers")
.values("server.http.headers")
.map(|(_, v)| {
if let Some((k, v)) = v.split_once(':') {
Ok((
hyper::header::HeaderName::from_str(k.trim()).map_err(|err| {
format!(
"Invalid header found in property \"jmap.http.headers\": {}",
"Invalid header found in property \"server.http.headers\": {}",
err
)
})?,
hyper::header::HeaderValue::from_str(v.trim()).map_err(|err| {
format!(
"Invalid header found in property \"jmap.http.headers\": {}",
"Invalid header found in property \"server.http.headers\": {}",
err
)
})?,
))
} else {
Err(format!(
"Invalid header found in property \"jmap.http.headers\": {}",
"Invalid header found in property \"server.http.headers\": {}",
v
))
}

22
crates/jmap/src/lib.rs
View File

@@ -191,9 +191,10 @@ impl JMAP {
let (state_tx, state_rx) = init_state_manager();
let (housekeeper_tx, housekeeper_rx) = init_housekeeper();
let shard_amount = config
.property::<u64>("global.shared-map.shard")?
.property::<u64>("cache.shard")?
.unwrap_or(32)
.next_power_of_two() as usize;
let capacity = config.property("cache.capacity")?.unwrap_or(100);
let jmap_server = Arc::new(JMAP {
directory: directories
@@ -213,25 +214,16 @@ impl JMAP {
blob_store: stores.get_blob_store(config, "storage.blob")?,
lookup_store: stores.get_lookup_store(config, "storage.lookup")?,
config: Config::new(config).failed("Invalid configuration file"),
sessions: TtlDashMap::with_capacity(
config.property("cache.session.size")?.unwrap_or(100),
shard_amount,
),
access_tokens: TtlDashMap::with_capacity(
config.property("cache.session.size")?.unwrap_or(100),
shard_amount,
),
sessions: TtlDashMap::with_capacity(capacity, shard_amount),
access_tokens: TtlDashMap::with_capacity(capacity, shard_amount),
concurrency_limiter: DashMap::with_capacity_and_hasher_and_shard_amount(
config.property("cache.rate-limit.size")?.unwrap_or(1024),
capacity,
RandomState::default(),
shard_amount,
),
oauth_codes: TtlDashMap::with_capacity(
config.property("cache.oauth.size")?.unwrap_or(128),
shard_amount,
),
oauth_codes: TtlDashMap::with_capacity(capacity, shard_amount),
cache_threads: LruCache::with_capacity(
config.property("cache.messages.size")?.unwrap_or(2048),
config.property("cache.thread.size")?.unwrap_or(2048),
),
state_tx,
housekeeper_tx,

7
crates/main/src/main.rs
View File

@@ -67,7 +67,12 @@ async fn main() -> std::io::Result<()> {
.failed("Invalid configuration");
// Update configuration
config.update(data_store.config_list("").await.failed("Storage error"));
config.update(
data_store
.config_list("", false)
.await
.failed("Storage error"),
);
// Parse directories
let directory = config

2
crates/smtp/src/config/resolver.rs
View File

@@ -119,7 +119,7 @@ impl ConfigResolver for Config {
let mut capacities = [1024usize; 5];
for (pos, key) in ["txt", "mx", "ipv4", "ipv6", "ptr"].into_iter().enumerate() {
if let Some(capacity) = self.property(("resolver.cache", key))? {
if let Some(capacity) = self.property(("cache.resolver", key))? {
capacities[pos] = capacity;
}
}

19
crates/smtp/src/lib.rs
View File

@@ -96,6 +96,11 @@ impl SMTP {
}
// Build core
let capacity = config.property("cache.capacity")?.unwrap_or(2);
let shard = config
.property::<u64>("cache.shard")?
.unwrap_or(32)
.next_power_of_two() as usize;
let (queue_tx, queue_rx) = mpsc::channel(1024);
let (report_tx, report_rx) = mpsc::channel(1024);
let core = Arc::new(SMTP {
@@ -112,23 +117,17 @@ impl SMTP {
session: SessionCore {
config: session_config,
throttle: DashMap::with_capacity_and_hasher_and_shard_amount(
config.property("global.shared-map.capacity")?.unwrap_or(2),
capacity,
ThrottleKeyHasherBuilder::default(),
config
.property::<u64>("global.shared-map.shard")?
.unwrap_or(32)
.next_power_of_two() as usize,
shard,
),
},
queue: QueueCore {
config: queue_config,
throttle: DashMap::with_capacity_and_hasher_and_shard_amount(
config.property("global.shared-map.capacity")?.unwrap_or(2),
capacity,
ThrottleKeyHasherBuilder::default(),
config
.property::<u64>("global.shared-map.shard")?
.unwrap_or(32)
.next_power_of_two() as usize,
shard,
),
snowflake_id: config
.property::<u64>("storage.cluster.node-id")?

1
crates/store/src/backend/mod.rs
View File

@@ -55,6 +55,7 @@ impl From<std::io::Error> for crate::Error {
}
}
#[allow(dead_code)]
fn deserialize_i64_le(bytes: &[u8]) -> crate::Result<i64> {
Ok(i64::from_le_bytes(bytes[..].try_into().map_err(|_| {
crate::Error::InternalError("Failed to deserialize i64 value.".to_string())

2
crates/store/src/dispatch/blocked.rs
View File

@@ -62,7 +62,7 @@ impl BlockedIps {
pub fn reload(&self, config: &Config) -> utils::config::Result<()> {
self.limiter_rate.store(
config
.property::<Rate>("server.security.fail2ban")?
.property::<Rate>("authentication.fail2ban")?
.map(Arc::new),
);
self.reload_blocked_ips(config.set_values(BLOCKED_IP_KEY))