public
nobgit
read
NobMail
Based on mailcow: dockerized
Languages
Repository composition by tracked source files.
PHP
49%
JavaScript
35%
HTML
9%
CSS
4%
Shell
2%
Python
1%
Lua
0%
Perl
0%
Ruby
0%
SCSS
0%
Create file
Wiki Documentation
Clone
https://nobgit.com/orgs/nobgit/nobmail.git
ssh://[email protected]:2222/orgs/nobgit/nobmail.git
Commit
[Web] Unlearn spam if released from quarantine, implements #3327
868e9e39
data/web/inc/functions.quarantine.inc.php | 132 ++++++++++++++++++++++++++----
1 file changed, 115 insertions(+), 17 deletions(-)Diff
diff --git a/data/web/inc/functions.quarantine.inc.php b/data/web/inc/functions.quarantine.inc.php
index 7e093460..bb9b4eaa 100644
--- a/data/web/inc/functions.quarantine.inc.php
+++ b/data/web/inc/functions.quarantine.inc.php
@@ -341,7 +341,7 @@ function quarantine($_action, $_data = null) {
);
}
// Release item
- elseif ($_data['action'] == 'release') {
+ elseif ($_data['action'] == 'release' || $_data['action'] == 'learnham') {
if (!is_array($_data['id'])) {
$ids = array();
$ids[] = $_data['id'];
@@ -482,25 +482,121 @@ function quarantine($_action, $_data = null) {
}
fclose($smtp_connection);
}
- try {
- $stmt = $pdo->prepare("DELETE FROM `quarantine` WHERE `id` = :id");
- $stmt->execute(array(
- ':id' => $id
- ));
+ $stmt = $pdo->prepare("DELETE FROM `quarantine` WHERE `id` = :id");
+ $stmt->execute(array(
+ ':id' => $id
+ ));
+ $_SESSION['return'][] = array(
+ 'type' => 'success',
+ 'log' => array(__FUNCTION__, $_action, $_data_log),
+ 'msg' => array('item_released', $id)
+ );
+ // Item was released and deleted from quarantine, now learning ham
+ $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'));
+ curl_setopt($curl, CURLOPT_URL,"http://rspamd/learnham");
+ 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'], 'already learned') === false) {
+ $_SESSION['return'][] = array(
+ 'type' => 'danger',
+ 'log' => array(__FUNCTION__),
+ 'msg' => array('ham_learn_error', $response['error'])
+ );
+ continue;
+ }
+ }
+ 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);
+ 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_URL,"http://rspamd/fuzzydel");
+ curl_setopt($curl, CURLOPT_POSTFIELDS, $row['msg']);
+ // It is most likely not a spam hash, so we ignore any error/warning response
+ // $response = curl_exec($curl);
+ curl_exec($curl);
+ // if (!curl_errno($curl)) {
+ // $response = json_decode($response, true);
+ // if (isset($response['error'])) {
+ // $_SESSION['return'][] = array(
+ // 'type' => 'warning',
+ // 'log' => array(__FUNCTION__),
+ // 'msg' => array('fuzzy_learn_error', $response['error'])
+ // );
+ // }
+ // }
+ curl_close($curl);
+ $_SESSION['return'][] = array(
+ 'type' => 'success',
+ 'log' => array(__FUNCTION__),
+ 'msg' => array('learned_ham', $id)
+ );
+ continue;
+ }
+ else {
+ curl_close($curl);
+ $_SESSION['return'][] = array(
+ 'type' => 'danger',
+ 'log' => array(__FUNCTION__),
+ 'msg' => array('ham_learn_error', 'Curl: ' . curl_strerror(curl_errno($curl)))
+ );
+ continue;
+ }
+ curl_close($curl);
+ $_SESSION['return'][] = array(
+ 'type' => 'danger',
+ 'log' => array(__FUNCTION__),
+ 'msg' => array('ham_learn_error', 'unknown')
+ );
+ continue;
}
- catch (PDOException $e) {
+ else {
$_SESSION['return'][] = array(
'type' => 'danger',
- 'log' => array(__FUNCTION__, $_action, $_data_log),
- 'msg' => array('mysql_error', $e)
+ 'log' => array(__FUNCTION__),
+ 'msg' => array('ham_learn_error', 'Curl: ' . curl_strerror(curl_errno($curl)))
);
+ curl_close($curl);
continue;
}
+ curl_close($curl);
$_SESSION['return'][] = array(
- 'type' => 'success',
- 'log' => array(__FUNCTION__, $_action, $_data_log),
- 'msg' => array('item_released', $id)
+ 'type' => 'danger',
+ 'log' => array(__FUNCTION__),
+ 'msg' => array('ham_learn_error', 'unknown')
);
+ continue;
}
}
elseif ($_data['action'] == 'learnspam') {
@@ -564,11 +660,13 @@ function quarantine($_action, $_data = null) {
if (!curl_errno($curl)) {
$response = json_decode($response, true);
if (isset($response['error'])) {
- $_SESSION['return'][] = array(
- 'type' => 'warning',
- 'log' => array(__FUNCTION__),
- 'msg' => array('fuzzy_learn_error', $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();