From cb17d71c61df0cecf4f7fcfb6e55179aeece94df Mon Sep 17 00:00:00 2001
From: friedPotat0 <5374007+friedPotat0@users.noreply.github.com>
Date: Wed, 9 Oct 2019 22:07:26 +0200
Subject: [PATCH] Add score, symbols to quarantine detail view
---
data/web/css/site/quarantine.css | 58 +++++++++++++++++++++--
data/web/inc/ajax/qitem_details.php | 4 ++
data/web/inc/functions.quarantine.inc.php | 2 +-
data/web/js/site/quarantine.js | 17 +++++++
data/web/lang/lang.de.php | 1 +
data/web/lang/lang.en.php | 1 +
data/web/modals/quarantine.php | 5 ++
7 files changed, 82 insertions(+), 6 deletions(-)
diff --git a/data/web/css/site/quarantine.css b/data/web/css/site/quarantine.css
index 0ea3eeb8..a383da8b 100644
--- a/data/web/css/site/quarantine.css
+++ b/data/web/css/site/quarantine.css
@@ -1,40 +1,49 @@
table.footable>tbody>tr.footable-empty>td {
- font-size:15px !important;
- font-style:italic;
+ font-size: 15px !important;
+ font-style: italic;
}
+
.pagination a {
text-decoration: none !important;
}
+
.panel panel-default {
overflow: visible !important;
}
+
.table-responsive {
overflow: visible !important;
}
+
@media screen and (max-width: 767px) {
.table-responsive {
overflow-x: scroll !important;
}
}
+
.footer-add-item {
- display:block;
+ display: block;
text-align: center;
font-style: italic;
padding: 10px;
background: #F5F5F5;
}
+
@media (min-width: 992px) {
.container {
- width: 80%;
+ width: 80%;
}
}
+
.mass-actions-quarantine {
user-select: none;
- padding:10px 0 10px 10px;
+ padding: 10px 0 10px 10px;
}
+
.inputMissingAttr {
border-color: #FF4136;
}
+
.dot-danger {
height: 10px;
width: 10px;
@@ -42,6 +51,7 @@ table.footable>tbody>tr.footable-empty>td {
border-radius: 50%;
display: inline-block;
}
+
.dot-neutral {
height: 10px;
width: 10px;
@@ -50,6 +60,44 @@ table.footable>tbody>tr.footable-empty>td {
display: inline-block;
}
+.modal#qidDetailModal p {
+ word-break: break-all;
+}
+
+span#qid_detail_score {
+ font-weight: 700;
+ margin-left: 5px;
+}
+
+span.rspamd-symbol {
+ display: inline-block;
+ margin: 2px 6px 2px 0px;
+ border-radius: 4px;
+ padding: 0px 7px;
+}
+
+span.rspamd-symbol.positive {
+ background: #4CAF50;
+ border: 1px solid #4CAF50;
+ color: white;
+}
+
+span.rspamd-symbol.negative {
+ background: #ff4136;
+ border: 1px solid #ff4136;
+ color: white;
+}
+
+span.rspamd-symbol.neutral {
+ background: #f5f5f5;
+ color: #333;
+ border: 1px solid #ccc;
+}
+
+span.rspamd-symbol span.score {
+ font-weight: 700;
+}
+
span.mail-address-item {
background-color: #f5f5f5;
border-radius: 4px;
diff --git a/data/web/inc/ajax/qitem_details.php b/data/web/inc/ajax/qitem_details.php
index 3c82ee6a..286c2a02 100644
--- a/data/web/inc/ajax/qitem_details.php
+++ b/data/web/inc/ajax/qitem_details.php
@@ -54,6 +54,10 @@ if (!empty($_GET['id']) && ctype_alnum($_GET['id'])) {
$data['recipients'] = $recipientsList;
}
+ // Get rspamd score
+ $data['score'] = $mailc['score'];
+ // Get rspamd symbols
+ $data['symbols'] = json_decode($mailc['symbols']);
// Get text/plain content
$data['text_plain'] = $mail_parser->getMessageBody('text');
// Get html content and convert to text
diff --git a/data/web/inc/functions.quarantine.inc.php b/data/web/inc/functions.quarantine.inc.php
index a7e94dc8..583d3ca2 100644
--- a/data/web/inc/functions.quarantine.inc.php
+++ b/data/web/inc/functions.quarantine.inc.php
@@ -678,7 +678,7 @@ function quarantine($_action, $_data = null) {
if (!is_numeric($_data) || empty($_data)) {
return false;
}
- $stmt = $pdo->prepare('SELECT `rcpt`, `symbols`, `msg`, `domain` FROM `quarantine` WHERE `id`= :id');
+ $stmt = $pdo->prepare('SELECT `rcpt`, `score`, `symbols`, `msg`, `domain` FROM `quarantine` WHERE `id`= :id');
$stmt->execute(array(':id' => $_data));
$row = $stmt->fetch(PDO::FETCH_ASSOC);
if (hasMailboxObjectAccess($_SESSION['mailcow_cc_username'], $_SESSION['mailcow_cc_role'], $row['rcpt'])) {
diff --git a/data/web/js/site/quarantine.js b/data/web/js/site/quarantine.js
index 0376c893..b1c0bc83 100644
--- a/data/web/js/site/quarantine.js
+++ b/data/web/js/site/quarantine.js
@@ -92,6 +92,23 @@ jQuery(function($){
$('#qid_detail_text').text(data.text_plain);
$('#qid_detail_text_from_html').text(data.text_html);
+ $('#qid_detail_score').text(data.score);
+ $('#qid_detail_symbols').html('');
+ if (typeof data.symbols !== 'undefined') {
+ data.symbols.sort(function (a, b) {
+ if (a.score === 0) return 1
+ if (b.score === 0) return -1
+ return b.score - a.score
+ })
+ $.each(data.symbols, function (index, value) {
+ var highlightClass = ''
+ if (value.score > 0) highlightClass = 'negative'
+ else if (value.score < 0) highlightClass = 'positive'
+ else highlightClass = 'neutral'
+ $('#qid_detail_symbols').append('<span class="rspamd-symbol ' + highlightClass + '" title="' + (value.options ? value.options.join(', ') : '') + '">' + value.name + ' (<span class="score">' + value.score + '</span>)</span>');
+ });
+ }
+
$('#qid_detail_recipients').html('');
if (typeof data.recipients !== 'undefined') {
$.each(data.recipients, function(index, value) {
diff --git a/data/web/lang/lang.de.php b/data/web/lang/lang.de.php
index dadfb8de..a7ade04d 100644
--- a/data/web/lang/lang.de.php
+++ b/data/web/lang/lang.de.php
@@ -790,6 +790,7 @@ $lang['quarantine']['sender'] = "Sender";
$lang['quarantine']['show_item'] = "Details";
$lang['quarantine']['check_hash'] = "Checksumme auf VirusTotal suchen";
$lang['quarantine']['qitem'] = "Quarantäneeintrag";
+$lang['quarantine']['rspamd_result'] = "Rspamd Ergebnis";
$lang['quarantine']['subj'] = "Betreff";
$lang['quarantine']['recipients'] = "Empfänger";
$lang['quarantine']['text_plain_content'] = "Inhalt (text/plain)";
diff --git a/data/web/lang/lang.en.php b/data/web/lang/lang.en.php
index efdb80ee..a85eeb88 100644
--- a/data/web/lang/lang.en.php
+++ b/data/web/lang/lang.en.php
@@ -807,6 +807,7 @@ $lang['quarantine']['sender'] = "Sender";
$lang['quarantine']['show_item'] = "Show item";
$lang['quarantine']['check_hash'] = "Search file hash @ VT";
$lang['quarantine']['qitem'] = "Quarantine item";
+$lang['quarantine']['rspamd_result'] = "Rspamd result";
$lang['quarantine']['subj'] = "Subject";
$lang['quarantine']['recipients'] = "Recipients";
$lang['quarantine']['text_plain_content'] = "Content (text/plain)";
diff --git a/data/web/modals/quarantine.php b/data/web/modals/quarantine.php
index 0d091163..8236f7b0 100644
--- a/data/web/modals/quarantine.php
+++ b/data/web/modals/quarantine.php
@@ -13,6 +13,11 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
</div>
<div class="modal-body">
<div id="qid_error" style="display:none" class="alert alert-danger"></div>
+ <div class="form-group">
+ <label for="qid_detail_symbols"><h4><?=$lang['quarantine']['rspamd_result'];?>:</h4></label>
+ <p><?=$lang['quarantine']['spam_score'];?>: <span id="qid_detail_score"></span></p>
+ <p id="qid_detail_symbols"></p>
+ </div>
<div class="form-group">
<label for="qid_detail_subj"><h4><?=$lang['quarantine']['subj'];?>:</h4></label>
<p id="qid_detail_subj"></p>