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

[Web] Fix order of fuzzy del and fuzzy add when learning from quarantine, fixes #3844

master
andryyy 2020-11-07 21:46:39 +01:00
parent a73944076c
commit b7956d8a7a
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
1 changed files with 55 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
data/web/inc/functions.quarantine.inc.php
View File

@ -527,7 +527,7 @@ function quarantine($_action, $_data = null) {
if (stripos($response['error'], 'already learned') === false) { if (stripos($response['error'], 'already learned') === false) {
$_SESSION['return'][] = array( $_SESSION['return'][] = array(
'type' => 'danger', 'type' => 'danger',
'log' => array(__FUNCTION__), 'log' => array(__FUNCTION__, $_action, $_data_log),
'msg' => array('ham_learn_error', $response['error']) 'msg' => array('ham_learn_error', $response['error'])
); );
continue; continue;
@ -539,47 +539,39 @@ function quarantine($_action, $_data = null) {
curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($curl, CURLOPT_POST, 1); curl_setopt($curl, CURLOPT_POST, 1);
curl_setopt($curl, CURLOPT_TIMEOUT, 30); curl_setopt($curl, CURLOPT_TIMEOUT, 30);
curl_setopt($curl, CURLOPT_HTTPHEADER, array('Content-Type: text/plain', 'Flag: 13'));
curl_setopt($curl, CURLOPT_URL,"http://rspamd/fuzzyadd");
curl_setopt($curl, CURLOPT_POSTFIELDS, $row['msg']);
$response = curl_exec($curl);
if (!curl_errno($curl)) {
$response = json_decode($response, true);
if (isset($response['error'])) {
if (stripos($response['error'], 'No content to generate fuzzy') === false) {
$_SESSION['return'][] = array(
'type' => 'warning',
'log' => array(__FUNCTION__),
'msg' => array('fuzzy_learn_error', $response['error'])
);
}
}
curl_close($curl);
$curl = curl_init();
curl_setopt($curl, CURLOPT_UNIX_SOCKET_PATH, '/var/lib/rspamd/rspamd.sock');
curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($curl, CURLOPT_POST, 1);
curl_setopt($curl, CURLOPT_TIMEOUT, 30);
curl_setopt($curl, CURLOPT_HTTPHEADER, array('Content-Type: text/plain', 'Flag: 11')); curl_setopt($curl, CURLOPT_HTTPHEADER, array('Content-Type: text/plain', 'Flag: 11'));
curl_setopt($curl, CURLOPT_URL,"http://rspamd/fuzzydel"); curl_setopt($curl, CURLOPT_URL,"http://rspamd/fuzzydel");
curl_setopt($curl, CURLOPT_POSTFIELDS, $row['msg']); curl_setopt($curl, CURLOPT_POSTFIELDS, $row['msg']);
// It is most likely not a spam hash, so we ignore any error/warning response // It is most likely not a spam hash, so we ignore any error/warning response
// $response = curl_exec($curl); // $response = curl_exec($curl);
if (!curl_errno($curl)) {
curl_close($curl);
$curl = curl_init();
curl_setopt($curl, CURLOPT_UNIX_SOCKET_PATH, '/var/lib/rspamd/rspamd.sock');
curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($curl, CURLOPT_POST, 1);
curl_setopt($curl, CURLOPT_TIMEOUT, 30);
curl_setopt($curl, CURLOPT_HTTPHEADER, array('Content-Type: text/plain', 'Flag: 13'));
curl_setopt($curl, CURLOPT_URL,"http://rspamd/fuzzyadd");
curl_setopt($curl, CURLOPT_POSTFIELDS, $row['msg']);
$response = curl_exec($curl);
curl_exec($curl); curl_exec($curl);
// if (!curl_errno($curl)) { if (!curl_errno($curl)) {
// $response = json_decode($response, true); $response = json_decode($response, true);
// if (isset($response['error'])) { if (isset($response['error'])) {
// $_SESSION['return'][] = array( if (stripos($response['error'], 'No content to generate fuzzy') === false) {
// 'type' => 'warning', $_SESSION['return'][] = array(
// 'log' => array(__FUNCTION__), 'type' => 'warning',
// 'msg' => array('fuzzy_learn_error', $response['error']) 'log' => array(__FUNCTION__, $_action, $_data_log),
// ); 'msg' => array('fuzzy_learn_error', $response['error'])
// } );
// } }
}
}
curl_close($curl); curl_close($curl);
$_SESSION['return'][] = array( $_SESSION['return'][] = array(
'type' => 'success', 'type' => 'success',
'log' => array(__FUNCTION__), 'log' => array(__FUNCTION__, $_action, $_data_log),
'msg' => array('learned_ham', $id) 'msg' => array('learned_ham', $id)
); );
continue; continue;
@ -588,7 +580,7 @@ function quarantine($_action, $_data = null) {
curl_close($curl); curl_close($curl);
$_SESSION['return'][] = array( $_SESSION['return'][] = array(
'type' => 'danger', 'type' => 'danger',
'log' => array(__FUNCTION__), 'log' => array(__FUNCTION__, $_action, $_data_log),
'msg' => array('ham_learn_error', 'Curl: ' . curl_strerror(curl_errno($curl))) 'msg' => array('ham_learn_error', 'Curl: ' . curl_strerror(curl_errno($curl)))
); );
continue; continue;
@ -596,7 +588,7 @@ function quarantine($_action, $_data = null) {
curl_close($curl); curl_close($curl);
$_SESSION['return'][] = array( $_SESSION['return'][] = array(
'type' => 'danger', 'type' => 'danger',
'log' => array(__FUNCTION__), 'log' => array(__FUNCTION__, $_action, $_data_log),
'msg' => array('ham_learn_error', 'unknown') 'msg' => array('ham_learn_error', 'unknown')
); );
continue; continue;
@ -604,7 +596,7 @@ function quarantine($_action, $_data = null) {
else { else {
$_SESSION['return'][] = array( $_SESSION['return'][] = array(
'type' => 'danger', 'type' => 'danger',
'log' => array(__FUNCTION__), 'log' => array(__FUNCTION__, $_action, $_data_log),
'msg' => array('ham_learn_error', 'Curl: ' . curl_strerror(curl_errno($curl))) 'msg' => array('ham_learn_error', 'Curl: ' . curl_strerror(curl_errno($curl)))
); );
curl_close($curl); curl_close($curl);
@ -613,7 +605,7 @@ function quarantine($_action, $_data = null) {
curl_close($curl); curl_close($curl);
$_SESSION['return'][] = array( $_SESSION['return'][] = array(
'type' => 'danger', 'type' => 'danger',
'log' => array(__FUNCTION__), 'log' => array(__FUNCTION__, $_action, $_data_log),
'msg' => array('ham_learn_error', 'unknown') 'msg' => array('ham_learn_error', 'unknown')
); );
continue; continue;
@ -647,6 +639,10 @@ function quarantine($_action, $_data = null) {
); );
continue; continue;
} }
$stmt = $pdo->prepare("DELETE FROM `quarantine` WHERE `id` = :id");
$stmt->execute(array(
':id' => $id
));
$curl = curl_init(); $curl = curl_init();
curl_setopt($curl, CURLOPT_UNIX_SOCKET_PATH, '/var/lib/rspamd/rspamd.sock'); curl_setopt($curl, CURLOPT_UNIX_SOCKET_PATH, '/var/lib/rspamd/rspamd.sock');
curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
@ -674,61 +670,39 @@ function quarantine($_action, $_data = null) {
curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($curl, CURLOPT_POST, 1); curl_setopt($curl, CURLOPT_POST, 1);
curl_setopt($curl, CURLOPT_TIMEOUT, 30); curl_setopt($curl, CURLOPT_TIMEOUT, 30);
curl_setopt($curl, CURLOPT_HTTPHEADER, array('Content-Type: text/plain', 'Flag: 11')); curl_setopt($curl, CURLOPT_HTTPHEADER, array('Content-Type: text/plain', 'Flag: 13'));
curl_setopt($curl, CURLOPT_URL,"http://rspamd/fuzzyadd"); curl_setopt($curl, CURLOPT_URL,"http://rspamd/fuzzydel");
curl_setopt($curl, CURLOPT_POSTFIELDS, $row['msg']); curl_setopt($curl, CURLOPT_POSTFIELDS, $row['msg']);
$response = curl_exec($curl); // It is most likely not a spam hash, so we ignore any error/warning response
// $response = curl_exec($curl);
if (!curl_errno($curl)) { if (!curl_errno($curl)) {
$response = json_decode($response, true);
if (isset($response['error'])) {
if (stripos($response['error'], 'No content to generate fuzzy') === false) {
$_SESSION['return'][] = array(
'type' => 'warning',
'log' => array(__FUNCTION__),
'msg' => array('fuzzy_learn_error', $response['error'])
);
}
}
curl_close($curl); curl_close($curl);
$curl = curl_init(); $curl = curl_init();
curl_setopt($curl, CURLOPT_UNIX_SOCKET_PATH, '/var/lib/rspamd/rspamd.sock'); curl_setopt($curl, CURLOPT_UNIX_SOCKET_PATH, '/var/lib/rspamd/rspamd.sock');
curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($curl, CURLOPT_POST, 1); curl_setopt($curl, CURLOPT_POST, 1);
curl_setopt($curl, CURLOPT_TIMEOUT, 30); curl_setopt($curl, CURLOPT_TIMEOUT, 30);
curl_setopt($curl, CURLOPT_HTTPHEADER, array('Content-Type: text/plain', 'Flag: 13')); curl_setopt($curl, CURLOPT_HTTPHEADER, array('Content-Type: text/plain', 'Flag: 11'));
curl_setopt($curl, CURLOPT_URL,"http://rspamd/fuzzydel"); curl_setopt($curl, CURLOPT_URL,"http://rspamd/fuzzyadd");
curl_setopt($curl, CURLOPT_POSTFIELDS, $row['msg']); curl_setopt($curl, CURLOPT_POSTFIELDS, $row['msg']);
// It is most likely not a ham hash, so we ignore any error/warning response $response = curl_exec($curl);
// $response = curl_exec($curl);
curl_exec($curl); curl_exec($curl);
// if (!curl_errno($curl)) { if (!curl_errno($curl)) {
// $response = json_decode($response, true); $response = json_decode($response, true);
// if (isset($response['error'])) { if (isset($response['error'])) {
// $_SESSION['return'][] = array( if (stripos($response['error'], 'No content to generate fuzzy') === false) {
// 'type' => 'warning',
// 'log' => array(__FUNCTION__),
// 'msg' => array('fuzzy_learn_error', $response['error'])
// );
// }
// }
curl_close($curl);
try {
$stmt = $pdo->prepare("DELETE FROM `quarantine` WHERE `id` = :id");
$stmt->execute(array(
':id' => $id
));
}
catch (PDOException $e) {
$_SESSION['return'][] = array( $_SESSION['return'][] = array(
'type' => 'danger', 'type' => 'warning',
'log' => array(__FUNCTION__, $_action, $_data_log), 'log' => array(__FUNCTION__, $_action, $_data_log),
'msg' => array('mysql_error', $e) 'msg' => array('fuzzy_learn_error', $response['error'])
); );
continue;
} }
}
}
curl_close($curl);
$_SESSION['return'][] = array( $_SESSION['return'][] = array(
'type' => 'success', 'type' => 'success',
'log' => array(__FUNCTION__), 'log' => array(__FUNCTION__, $_action, $_data_log),
'msg' => array('qlearn_spam', $id) 'msg' => array('qlearn_spam', $id)
); );
continue; continue;
@ -737,7 +711,7 @@ function quarantine($_action, $_data = null) {
curl_close($curl); curl_close($curl);
$_SESSION['return'][] = array( $_SESSION['return'][] = array(
'type' => 'danger', 'type' => 'danger',
'log' => array(__FUNCTION__), 'log' => array(__FUNCTION__, $_action, $_data_log),
'msg' => array('spam_learn_error', 'Curl: ' . curl_strerror(curl_errno($curl))) 'msg' => array('spam_learn_error', 'Curl: ' . curl_strerror(curl_errno($curl)))
); );
continue; continue;
@ -745,15 +719,15 @@ function quarantine($_action, $_data = null) {
curl_close($curl); curl_close($curl);
$_SESSION['return'][] = array( $_SESSION['return'][] = array(
'type' => 'danger', 'type' => 'danger',
'log' => array(__FUNCTION__), 'log' => array(__FUNCTION__, $_action, $_data_log),
'msg' => array('learn_spam_error', 'unknown') 'msg' => array('spam_learn_error', 'unknown')
); );
continue; continue;
} }
else { else {
$_SESSION['return'][] = array( $_SESSION['return'][] = array(
'type' => 'danger', 'type' => 'danger',
'log' => array(__FUNCTION__), 'log' => array(__FUNCTION__, $_action, $_data_log),
'msg' => array('spam_learn_error', 'Curl: ' . curl_strerror(curl_errno($curl))) 'msg' => array('spam_learn_error', 'Curl: ' . curl_strerror(curl_errno($curl)))
); );
curl_close($curl); curl_close($curl);
@ -762,8 +736,8 @@ function quarantine($_action, $_data = null) {
curl_close($curl); curl_close($curl);
$_SESSION['return'][] = array( $_SESSION['return'][] = array(
'type' => 'danger', 'type' => 'danger',
'log' => array(__FUNCTION__), 'log' => array(__FUNCTION__, $_action, $_data_log),
'msg' => array('learn_spam_error', 'unknown') 'msg' => array('spam_learn_error', 'unknown')
); );
continue; continue;
} }