From 852392fd150819f1e99f364fa47c82e3012b1710 Mon Sep 17 00:00:00 2001
From: Max <mail@heavygale.de>
Date: Mon, 11 Nov 2019 08:19:22 +0100
Subject: [PATCH 1/2]  Fix missing username in username_invalid message (#3135)

* Fix missing username in username_invalid message

Fix missing username in username_invalid message

* Fix missing username in username_invalid message 2

Fix missing username in username_invalid message
---
 data/web/inc/functions.admin.inc.php        |  4 ++--
 data/web/inc/functions.domain_admin.inc.php | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/data/web/inc/functions.admin.inc.php b/data/web/inc/functions.admin.inc.php
index 660aed69..a99d0b7a 100644
--- a/data/web/inc/functions.admin.inc.php
+++ b/data/web/inc/functions.admin.inc.php
@@ -23,7 +23,7 @@ function admin($_action, $_data = null) {
         $_SESSION['return'][] = array(
           'type' => 'danger',
           'log' => array(__FUNCTION__, $_action, $_data_log),
-          'msg' => 'username_invalid'
+          'msg' => array('username_invalid', $username)
         );
         return false;
       }
@@ -261,7 +261,7 @@ function admin($_action, $_data = null) {
         ':admin' => $_data
       ));
       $row = $stmt->fetch(PDO::FETCH_ASSOC);
-      if (empty($row)) { 
+      if (empty($row)) {
         return false;
       }
       $admindata['username'] = $row['username'];
diff --git a/data/web/inc/functions.domain_admin.inc.php b/data/web/inc/functions.domain_admin.inc.php
index 00cb35fc..2fa16f59 100644
--- a/data/web/inc/functions.domain_admin.inc.php
+++ b/data/web/inc/functions.domain_admin.inc.php
@@ -35,7 +35,7 @@ function domain_admin($_action, $_data = null) {
         $_SESSION['return'][] = array(
           'type' => 'danger',
           'log' => array(__FUNCTION__, $_action, $_data_log),
-          'msg' => 'username_invalid'
+          'msg' => array('username_invalid', $username)
         );
         return false;
       }
@@ -44,12 +44,12 @@ function domain_admin($_action, $_data = null) {
         WHERE `username` = :username");
       $stmt->execute(array(':username' => $username));
       $num_results[] = count($stmt->fetchAll(PDO::FETCH_ASSOC));
-      
+
       $stmt = $pdo->prepare("SELECT `username` FROM `admin`
         WHERE `username` = :username");
       $stmt->execute(array(':username' => $username));
       $num_results[] = count($stmt->fetchAll(PDO::FETCH_ASSOC));
-      
+
       $stmt = $pdo->prepare("SELECT `username` FROM `domain_admins`
         WHERE `username` = :username");
       $stmt->execute(array(':username' => $username));
@@ -379,7 +379,7 @@ function domain_admin($_action, $_data = null) {
       }
       $stmt = $pdo->query("SELECT DISTINCT
         `username`
-          FROM `domain_admins` 
+          FROM `domain_admins`
             WHERE `username` IN (
               SELECT `username` FROM `admin`
                 WHERE `superadmin`!='1'
@@ -415,7 +415,7 @@ function domain_admin($_action, $_data = null) {
         ':domain_admin' => $_data
       ));
       $row = $stmt->fetch(PDO::FETCH_ASSOC);
-      if (empty($row)) { 
+      if (empty($row)) {
         return false;
       }
       $domainadmindata['username'] = $row['username'];

From fbc7b7dce5a2bae54fff36316a9eb19bcd9b9207 Mon Sep 17 00:00:00 2001
From: Michael Kuron <mkuron@users.noreply.github.com>
Date: Mon, 11 Nov 2019 08:20:46 +0100
Subject: [PATCH 2/2] rspamd: Don't remove WHITELISTED_FWD_HOST if SOGO_CONTACT
 present (#3084)

---
 data/conf/rspamd/local.d/composites.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/conf/rspamd/local.d/composites.conf b/data/conf/rspamd/local.d/composites.conf
index 263493be..a6706f70 100644
--- a/data/conf/rspamd/local.d/composites.conf
+++ b/data/conf/rspamd/local.d/composites.conf
@@ -11,7 +11,7 @@ SPF_FAIL_NO_DKIM {
   score = 10;
 }
 SOGO_CONTACT_EXCLUDE_FWD_HOST {
-  expression = "WHITELISTED_FWD_HOST & ~SOGO_CONTACT";
+  expression = "-WHITELISTED_FWD_HOST & ~SOGO_CONTACT";
 }
 SOGO_CONTACT_SPOOFED {
   expression = "(R_SPF_PERMFAIL | R_SPF_SOFTFAIL | R_SPF_FAIL) & ~SOGO_CONTACT";