paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Rspamd] Prefix quarantine error_log messages with "QUARANTINE" 

[Rspamd] Fix quarantine max size check (it was ignored)
master
André 2018-10-11 11:55:52 +02:00
parent c0b590fff6
commit 32f7ae1d2e
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
data/conf/rspamd/meta_exporter/pipe.php
View File

@ -17,6 +17,7 @@ try {
$pdo = new PDO($dsn, $database_user, $database_pass, $opt); $pdo = new PDO($dsn, $database_user, $database_pass, $opt);
} }
catch (PDOException $e) { catch (PDOException $e) {
error_log("QUARANTINE: " . $e);
http_response_code(501); http_response_code(501);
exit; exit;
} }
@ -61,12 +62,11 @@ $symbols = $headers['X-Rspamd-Symbols'];
$raw_size = (int)$_SERVER['CONTENT_LENGTH']; $raw_size = (int)$_SERVER['CONTENT_LENGTH'];
try { try {
if ($max_size = $redis->Get('Q_MAX_SIZE')) { $max_size = (int)$redis->Get('Q_MAX_SIZE');
if (!empty($max_size) && ($max_size * 1048576) < $raw_size) { if (($max_size * 1048576) < $raw_size) {
error_log(sprintf("Message too large: %d exceeds %d", $raw_size, ($max_size * 1048576))); error_log(sprintf("QUARANTINE: Message too large: %d b exceeds %d b", $raw_size, ($max_size * 1048576)));
http_response_code(505); http_response_code(505);
exit; exit;
}
} }
if ($exclude_domains = $redis->Get('Q_EXCLUDE_DOMAINS')) { if ($exclude_domains = $redis->Get('Q_EXCLUDE_DOMAINS')) {
$exclude_domains = json_decode($exclude_domains, true); $exclude_domains = json_decode($exclude_domains, true);
@ -74,7 +74,7 @@ try {
$retention_size = (int)$redis->Get('Q_RETENTION_SIZE'); $retention_size = (int)$redis->Get('Q_RETENTION_SIZE');
} }
catch (RedisException $e) { catch (RedisException $e) {
error_log($e); error_log("QUARANTINE: " . $e);
http_response_code(504); http_response_code(504);
exit; exit;
} }
@ -93,14 +93,14 @@ foreach (json_decode($rcpts, true) as $rcpt) {
} }
} }
catch (RedisException $e) { catch (RedisException $e) {
error_log($e); error_log("QUARANTINE: " . $e);
http_response_code(504); http_response_code(504);
exit; exit;
} }
// Skip if domain is excluded // Skip if domain is excluded
if (in_array($parsed_rcpt['domain'], $exclude_domains)) { if (in_array($parsed_rcpt['domain'], $exclude_domains)) {
error_log(sprintf("Skipped domain %s", $parsed_rcpt['domain'])); error_log(sprintf("QUARANTINE: Skipped domain %s", $parsed_rcpt['domain']));
continue; continue;
} }
@ -135,12 +135,12 @@ foreach (json_decode($rcpts, true) as $rcpt) {
// Loop through all found gotos // Loop through all found gotos
foreach ($gotos_array as $index => &$goto) { foreach ($gotos_array as $index => &$goto) {
error_log("quarantine pipe: query " . $goto . " as username from mailbox"); error_log("QUARANTINE: quarantine pipe: query " . $goto . " as username from mailbox");
$stmt = $pdo->prepare("SELECT `username` FROM `mailbox` WHERE `username` = :goto AND `active`= '1';"); $stmt = $pdo->prepare("SELECT `username` FROM `mailbox` WHERE `username` = :goto AND `active`= '1';");
$stmt->execute(array(':goto' => $goto)); $stmt->execute(array(':goto' => $goto));
$username = $stmt->fetch(PDO::FETCH_ASSOC)['username']; $username = $stmt->fetch(PDO::FETCH_ASSOC)['username'];
if (!empty($username)) { if (!empty($username)) {
error_log("quarantine pipe: mailbox found: " . $username); error_log("QUARANTINE: quarantine pipe: mailbox found: " . $username);
// Current goto is a mailbox, save to rcpt_final_mailboxes if not a duplicate // Current goto is a mailbox, save to rcpt_final_mailboxes if not a duplicate
if (!in_array($username, $rcpt_final_mailboxes)) { if (!in_array($username, $rcpt_final_mailboxes)) {
$rcpt_final_mailboxes[] = $username; $rcpt_final_mailboxes[] = $username;
@ -149,13 +149,13 @@ foreach (json_decode($rcpts, true) as $rcpt) {
else { else {
$parsed_goto = parse_email($goto); $parsed_goto = parse_email($goto);
if (!$redis->hGet('DOMAIN_MAP', $parsed_goto['domain'])) { if (!$redis->hGet('DOMAIN_MAP', $parsed_goto['domain'])) {
error_log($goto . " is not a mailcow handled mailbox or alias address"); error_log("QUARANTINE:" . $goto . " is not a mailcow handled mailbox or alias address");
} }
else { else {
$stmt = $pdo->prepare("SELECT `goto` FROM `alias` WHERE `address` = :goto AND `active` = '1'"); $stmt = $pdo->prepare("SELECT `goto` FROM `alias` WHERE `address` = :goto AND `active` = '1'");
$stmt->execute(array(':goto' => $goto)); $stmt->execute(array(':goto' => $goto));
$goto_branch = $stmt->fetch(PDO::FETCH_ASSOC)['goto']; $goto_branch = $stmt->fetch(PDO::FETCH_ASSOC)['goto'];
error_log("quarantine pipe: goto address " . $goto . " is a alias branch for " . $goto_branch); error_log("QUARANTINE: quarantine pipe: goto address " . $goto . " is a alias branch for " . $goto_branch);
$goto_branch_array = explode(',', $goto_branch); $goto_branch_array = explode(',', $goto_branch);
} }
} }
@ -175,18 +175,18 @@ foreach (json_decode($rcpts, true) as $rcpt) {
// Force exit if loop cannot be solved // Force exit if loop cannot be solved
// Postfix does not allow for alias loops, so this should never happen. // Postfix does not allow for alias loops, so this should never happen.
$loop_c++; $loop_c++;
error_log("quarantine pipe: goto array count on loop #". $loop_c . " is " . count($gotos_array)); error_log("QUARANTINE: quarantine pipe: goto array count on loop #". $loop_c . " is " . count($gotos_array));
} }
} }
catch (PDOException $e) { catch (PDOException $e) {
error_log($e->getMessage()); error_log("QUARANTINE: " . $e->getMessage());
http_response_code(502); http_response_code(502);
exit; exit;
} }
} }
foreach ($rcpt_final_mailboxes as $rcpt) { foreach ($rcpt_final_mailboxes as $rcpt) {
error_log("quarantine pipe: processing quarantine message for rcpt " . $rcpt); error_log("QUARANTINE: quarantine pipe: processing quarantine message for rcpt " . $rcpt);
try { try {
$stmt = $pdo->prepare("INSERT INTO `quarantine` (`qid`, `score`, `sender`, `rcpt`, `symbols`, `user`, `ip`, `msg`, `action`) $stmt = $pdo->prepare("INSERT INTO `quarantine` (`qid`, `score`, `sender`, `rcpt`, `symbols`, `user`, `ip`, `msg`, `action`)
VALUES (:qid, :score, :sender, :rcpt, :symbols, :user, :ip, :msg, :action)"); VALUES (:qid, :score, :sender, :rcpt, :symbols, :user, :ip, :msg, :action)");
@ -218,7 +218,7 @@ foreach ($rcpt_final_mailboxes as $rcpt) {
)); ));
} }
catch (PDOException $e) { catch (PDOException $e) {
error_log($e->getMessage()); error_log("QUARANTINE: " . $e->getMessage());
http_response_code(503); http_response_code(503);
exit; exit;
} }