Page MenuHomePhorge
Files F2571556

No OneTemporary
Actions

Size
12 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/plugins/markasjunk/drivers/amavis_blacklist.php b/plugins/markasjunk/drivers/amavis_blacklist.php
index e9f39edf0..6199045d1 100644
--- a/plugins/markasjunk/drivers/amavis_blacklist.php
+++ b/plugins/markasjunk/drivers/amavis_blacklist.php
@@ -1,155 +1,160 @@
<?php
/**
* AmavisD Blacklist driver
*
* @version 1.0
* @requires Amacube plugin
*
* @author Der-Jan
*
* Copyright (C) 2014 Der-Jan
*
* This driver is part of the MarkASJunk plugin for Roundcube.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Roundcube. If not, see https://www.gnu.org/licenses/.
*/
/* # 'SELECT wb'.
* # ' FROM wblist JOIN mailaddr ON wblist.sid=mailaddr.id'.
* # ' WHERE wblist.rid=? AND mailaddr.email IN (%k)'.
* # ' ORDER BY mailaddr.priority DESC';
*/
class markasjunk_amavis_blacklist
{
private $user_email = '';
public function spam($uids, $src_mbox, $dst_mbox)
{
$this->_do_list($uids, true);
}
public function ham($uids, $src_mbox, $dst_mbox)
{
$this->_do_list($uids, false);
}
private function _do_list($uids, $spam)
{
$rcube = rcube::get_instance();
$this->user_email = $rcube->user->data['username'];
$config_file = $rcube->config->get('markasjunk_amacube_config');
if (is_file($config_file) && !$rcube->config->load_from_file($config_file)) {
rcube::raise_error([
'code' => 527, 'file' => __FILE__, 'line' => __LINE__,
'message' => "Failed to load config from $config_file"
], true, false
);
return false;
}
$db = rcube_db::factory($rcube->config->get('amacube_db_dsn'), '', true);
$db->set_debug((bool) $rcube->config->get('sql_debug'));
$db->db_connect('w');
$debug = $rcube->config->get('markasjunk_debug');
// check DB connections and exit on failure
if ($err_str = $db->is_error()) {
rcube::raise_error([
'code' => 603,
'type' => 'db',
'message' => $err_str
], false, true
);
}
$sql_result = $db->query("SELECT `id` FROM `users` WHERE `email` = ?", $this->user_email);
if ($sql_result && ($res_array = $db->fetch_assoc($sql_result))) {
$rid = $res_array['id'];
}
else {
if ($debug) {
rcube::write_log('markasjunk', $this->user_email . ' not found in users table');
}
return false;
}
foreach ($uids as $uid) {
$message = new rcube_message($uid);
$email = $message->sender['mailto'];
+ // skip invalid emails
+ if (!rcube_utils::check_email($email, false)) {
+ continue;
+ }
+
$sql_result = $db->query("SELECT `id` FROM `mailaddr` WHERE `email` = ? ORDER BY `priority` DESC", $email);
if ($sql_result && ($res_array = $db->fetch_assoc($sql_result))) {
$sid = $res_array['id'];
}
else {
if ($debug) {
rcube::write_log('markasjunk', "$email not found in mailaddr table - add it");
}
$sql_result = $db->query("INSERT INTO `mailaddr` ( `priority`, `email` ) VALUES ( 20, ? )", $email);
if ($sql_result) {
$sid = $db->insert_id();
}
else {
if ($debug) {
rcube::write_log('markasjunk', "Cannot add $email to mailaddr table: " . $db->is_error($sql_result));
}
return false;
}
}
$wb = '';
$sql_result = $db->query("SELECT `wb` FROM `wblist` WHERE `sid` = ? AND `rid` =?", $sid, $rid);
if ($sql_result && ($res_array = $db->fetch_assoc($sql_result))) {
$wb = $res_array['wb'];
}
if (!$wb || (!$spam && preg_match('/^([BbNnFf])[\s]*\z/', $wb)) || ($spam && preg_match('/^([WwYyTt])[\s]*\z/', $wb))) {
$newwb = 'w';
if ($spam) {
$newwb = 'b';
}
if ($wb) {
$sql_result = $db->query("UPDATE `wblist` SET `wb` = ? WHERE `sid` = ? AND `rid` = ?",
$newwb, $sid, $rid);
}
else {
$sql_result = $db->query("INSERT INTO `wblist` (`sid`, `rid`, `wb`) VALUES (?, ?, ?)",
$sid, $rid, $newwb);
}
if (!$sql_result) {
if ($debug) {
rcube::write_log('markasjunk', "Cannot update wblist for user {$this->user_email} with $email");
}
return false;
}
}
}
}
}
diff --git a/plugins/markasjunk/drivers/sa_blacklist.php b/plugins/markasjunk/drivers/sa_blacklist.php
index 9c7e8106d..5bd0f6a32 100644
--- a/plugins/markasjunk/drivers/sa_blacklist.php
+++ b/plugins/markasjunk/drivers/sa_blacklist.php
@@ -1,161 +1,166 @@
<?php
/**
* SpamAssassin Blacklist driver
*
* @version 2.0
* @requires SAUserPrefs plugin
*
* @author Philip Weir
*
* Copyright (C) 2010-2014 Philip Weir
*
* This driver is part of the MarkASJunk plugin for Roundcube.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Roundcube. If not, see https://www.gnu.org/licenses/.
*/
class markasjunk_sa_blacklist
{
private $sa_user;
private $sa_table;
private $sa_username_field;
private $sa_preference_field;
private $sa_value_field;
public function spam($uids, $src_mbox, $dst_mbox)
{
$this->_do_list($uids, true);
}
public function ham($uids, $src_mbox, $dst_mbox)
{
$this->_do_list($uids, false);
}
private function _do_list($uids, $spam)
{
$rcube = rcube::get_instance();
$this->sa_user = $rcube->config->get('sauserprefs_userid', "%u");
$this->sa_table = $rcube->config->get('sauserprefs_sql_table_name');
$this->sa_username_field = $rcube->config->get('sauserprefs_sql_username_field');
$this->sa_preference_field = $rcube->config->get('sauserprefs_sql_preference_field');
$this->sa_value_field = $rcube->config->get('sauserprefs_sql_value_field');
$identity = $rcube->user->get_identity();
$identity = $identity['email'];
$this->sa_user = str_replace('%u', $_SESSION['username'], $this->sa_user);
$this->sa_user = str_replace('%l', $rcube->user->get_username('local'), $this->sa_user);
$this->sa_user = str_replace('%d', $rcube->user->get_username('domain'), $this->sa_user);
$this->sa_user = str_replace('%i', $identity, $this->sa_user);
$config_file = $rcube->config->get('markasjunk_sauserprefs_config');
$debug = $rcube->config->get('markasjunk_debug');
if (is_file($config_file) && !$rcube->config->load_from_file($config_file)) {
rcube::raise_error([
'code' => 527, 'file' => __FILE__, 'line' => __LINE__,
'message' => "Failed to load config from $config_file"
], true, false
);
return false;
}
$db = rcube_db::factory($rcube->config->get('sauserprefs_db_dsnw'), $rcube->config->get('sauserprefs_db_dsnr'), $rcube->config->get('sauserprefs_db_persistent'));
$db->set_debug((bool) $rcube->config->get('sql_debug'));
$db->db_connect('w');
// check DB connections and exit on failure
if ($err_str = $db->is_error()) {
rcube::raise_error([
'code' => 603,
'type' => 'db',
'message' => $err_str
], false, true
);
}
foreach ($uids as $uid) {
$message = new rcube_message($uid);
$email = $message->sender['mailto'];
+ // skip invalid emails
+ if (!rcube_utils::check_email($email, false)) {
+ continue;
+ }
+
if ($spam) {
// delete any whitelisting for this address
$db->query(
"DELETE FROM `{$this->sa_table}` WHERE `{$this->sa_username_field}` = ? "
. "AND `{$this->sa_preference_field}` = ? AND `{$this->sa_value_field}` = ?",
$this->sa_user,
'whitelist_from',
$email
);
// check address is not already blacklisted
$sql_result = $db->query(
"SELECT `value` FROM `{$this->sa_table}` WHERE `{$this->sa_username_field}` = ? "
. "AND `{$this->sa_preference_field}` = ? AND `{$this->sa_value_field}` = ?",
$this->sa_user,
'blacklist_from',
$email
);
if (!$db->fetch_array($sql_result)) {
$db->query(
"INSERT INTO `{$this->sa_table}` (`{$this->sa_username_field}`, `{$this->sa_preference_field}`, `{$this->sa_value_field}`)"
. " VALUES (?, ?, ?)",
$this->sa_user,
'blacklist_from',
$email
);
if ($debug) {
rcube::write_log('markasjunk', $this->sa_user . ' blacklist ' . $email);
}
}
}
else {
// delete any blacklisting for this address
$db->query(
"DELETE FROM `{$this->sa_table}` WHERE `{$this->sa_username_field}` = ? AND "
. "`{$this->sa_preference_field}` = ? AND `{$this->sa_value_field}` = ?",
$this->sa_user,
'blacklist_from',
$email
);
// check address is not already whitelisted
$sql_result = $db->query(
"SELECT `value` FROM `{$this->sa_table}` WHERE `{$this->sa_username_field}` = ? "
. "AND `{$this->sa_preference_field}` = ? AND `{$this->sa_value_field}` = ?",
$this->sa_user,
'whitelist_from',
$email
);
if (!$db->fetch_array($sql_result)) {
$db->query(
"INSERT INTO `{$this->sa_table}` (`{$this->sa_username_field}`, `{$this->sa_preference_field}`, `{$this->sa_value_field}`)"
. " VALUES (?, ?, ?)",
$this->sa_user,
'whitelist_from',
$email);
if ($debug) {
rcube::write_log('markasjunk', $this->sa_user . ' whitelist ' . $email);
}
}
}
}
}
}

File Metadata

Mime Type
text/x-diff
Expires
Thu, Mar 19, 8:44 AM (19 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
458000
Default Alt Text
(12 KB)

Event Timeline