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

Added context to SMTP rate limiter keys

Browse Source
This commit is contained in:
mdecimus
2025-01-19 11:36:13 +01:00
parent 26e00b44a8
commit 3c7caddd98
7 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/smtp/src/queue/quota.rs
View File

@@ -129,7 +129,7 @@ impl HasQueueQuota for Server {
.await
.unwrap_or(false)
{
let key = quota.new_key(envelope);
let key = quota.new_key(envelope, "");
if let Some(max_size) = quota.size {
let used_size = self
.core

6
crates/smtp/src/queue/throttle.rs
View File

@@ -7,7 +7,7 @@
use std::future::Future;
use common::{
config::smtp::QueueRateLimiter, expr::functions::ResolveVariable, Server, KV_RATE_LIMIT_HASH,
config::smtp::QueueRateLimiter, expr::functions::ResolveVariable, Server, KV_RATE_LIMIT_SMTP,
};
use store::write::now;
@@ -37,13 +37,13 @@ impl IsAllowed for Server {
.await
.unwrap_or(false)
{
let key = throttle.new_key(envelope);
let key = throttle.new_key(envelope, "outbound");
match self
.core
.storage
.lookup
.is_rate_allowed(KV_RATE_LIMIT_HASH, key.as_ref(), &throttle.rate, false)
.is_rate_allowed(KV_RATE_LIMIT_SMTP, key.as_ref(), &throttle.rate, false)
.await
{
Ok(Some(next_refill)) => {