Removed local concurrency limiters, switch to global rate limiting
This commit is contained in:
@@ -22,9 +22,6 @@ oauth.key = "0Wn7rO4UdmBoE8mp3cDcD9Qlpz3na74z7fGRoSuq8fVsGPelLl3KrHomBN8h2biA"
|
||||
queue.quota.size.enable = true
|
||||
queue.quota.size.messages = 100000
|
||||
queue.quota.size.size = 10737418240
|
||||
queue.throttle.rcpt.concurrency = 5
|
||||
queue.throttle.rcpt.enable = true
|
||||
queue.throttle.rcpt.key = "rcpt_domain"
|
||||
report.analysis.addresses = "postmaster@*"
|
||||
server.http.permissive-cors = true
|
||||
server.listener.http.bind = "[::]:5002"
|
||||
@@ -46,13 +43,6 @@ server.listener.submission.protocol = "smtp"
|
||||
server.listener.submissions.bind = "[::]:465"
|
||||
server.listener.submissions.protocol = "smtp"
|
||||
server.listener.submissions.tls.implicit = true
|
||||
session.throttle.ip.concurrency = 5
|
||||
session.throttle.ip.enable = true
|
||||
session.throttle.ip.key = "remote_ip"
|
||||
session.throttle.sender.enable = true
|
||||
session.throttle.sender.key.0 = "sender_domain"
|
||||
session.throttle.sender.key.1 = "rcpt"
|
||||
session.throttle.sender.rate = "25/1h"
|
||||
storage.blob = "rocksdb"
|
||||
storage.data = "rocksdb"
|
||||
storage.directory = "internal"
|
||||
|
||||
@@ -7,7 +7,7 @@ test
|
||||
|
||||
<!-- NEXT TEST -->
|
||||
remote_ip 20.11.0.2
|
||||
expect RBL_SENDERSCORE_REPUT_0 RBL_NIXSPAM RBL_SEM RBL_SPAMHAUS_SBL RBL_BARRACUDA RBL_BLOCKLISTDE RBL_VIRUSFREE_BOTNET RBL_SPAMCOP RCVD_IN_DNSWL_MED
|
||||
expect RBL_SENDERSCORE_REPUT_0 RBL_SEM RBL_SPAMHAUS_SBL RBL_BARRACUDA RBL_BLOCKLISTDE RBL_VIRUSFREE_BOTNET RBL_SPAMCOP RCVD_IN_DNSWL_MED
|
||||
|
||||
Subject: test
|
||||
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
[[throttle]]
|
||||
match = "remote_ip == '127.0.0.1'"
|
||||
key = ["remote_ip", "authenticated_as"]
|
||||
concurrency = 100
|
||||
rate = "50/30s"
|
||||
enable = true
|
||||
|
||||
[[throttle]]
|
||||
key = "sender_domain"
|
||||
concurrency = 10000
|
||||
rate = "50/30s"
|
||||
enable = true
|
||||
|
||||
|
||||
Reference in New Issue
Block a user