From d3732bde2372cdac9fdb920df913da4aa3a5fff9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Peters?= Date: Thu, 7 Feb 2019 00:58:40 +0100 Subject: [PATCH 1/3] Update Bug_report.md Some changes. Removed the smiley, because I'm not a happy man. --- .github/ISSUE_TEMPLATE/Bug_report.md | 48 ++++++++++++---------------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md index 62a835d7..c74d4747 100644 --- a/.github/ISSUE_TEMPLATE/Bug_report.md +++ b/.github/ISSUE_TEMPLATE/Bug_report.md @@ -4,34 +4,26 @@ about: Report a bug for this project --- -**Notice (you can delete this paragraph)** -Please understand that we use GitHub as **bug tracker and for feature requests only**. -For general (community) support and other discussion, you are welcome to visit us @ Freenode, #mailcow -Answering may take from a few seconds to hours, please be patient. :-) -Immediate commercial support is available via info@servercow.de +**README and remove me** +For community support and other discussion, you are welcome to visit and stay with us @ Freenode, #mailcow +Answering can take a few seconds up to many hours, please be patient. +Commercial support, including a ticket system, can be found @ https://www.servercow.de/mailcow#support - we are also available via Telegram. \o/ -**Describe the bug** -A clear and concise description of what the bug is. +**Describe the bug, try to make it reproducible** +A clear and concise description of what the bug is. How can it be reproduced? +If applicable, add screenshots to help explain your problem. Very useful for bugs in mailcow UI. -**How to reproduce Reproduce** -Steps to reproduce the behavior please explain how to reproduce the bug: -1. .... -2. .... -3. .... +**System information and quick debugging** +General logs: +- Please take a look at the [documentation](https://mailcow.github.io/mailcow-dockerized-docs/debug-logs/). -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - -**Logs** -Please take a look at the [documentation](https://mailcow.github.io/mailcow-dockerized-docs/debug-logs/). - -**System** - - OS: [e.g. iOS] - - Browser: [e.g. chrome, safari] - - Other clients involved: - -**Additional context** -Add any other context about the problem here. +Further information (where applicable): + - Your OS (is Apparmor or SELinux active?) + - Your virtualization technology (KVM/QEMU, Xen, VMware, VirtualBox etc.) + - Don't try to run mailcow on a Synology or QNAP NAS, do you? + - Docker and Docker Compose versions + - Output of `git diff origin/master`, any other changes to the code? + - All third-party firewalls and custom iptables rules are unsupported. Please check the Docker docs about how to use Docker with your own ruleset. Nevertheless, iptabels output can help _us_ to help _you_: `iptables -L -vn`, `ip6tables -L -vn`, `iptables -L -vn -t nat` and `ip6tables -L -vn -t nat ` + - Reverse proxy? If you think this problem is related to your reverse proxy, please post your configuration. + - Browser (if it's a Web UI issue) - please clean your browser cache and try again, problem persists? + - Check `docker exec -it $(docker ps -qf name=acme-mailcow) dig +short stackoverflow.com @172.22.1.254` (set the IP accordingly, if you changed the internal mailcow network) and `docker exec -it $(docker ps -qf name=acme-mailcow) dig +short stackoverflow.com @1.1.1.1` - output? Timeout? From b94595ce0cdb9b40b4eeda2f5d7b3ae92423934a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Peters?= Date: Thu, 7 Feb 2019 19:38:57 +0100 Subject: [PATCH 2/3] [Web] Fix deletion of admin user --- data/web/inc/functions.admin.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/web/inc/functions.admin.inc.php b/data/web/inc/functions.admin.inc.php index 79c4b9cc..f9aee508 100644 --- a/data/web/inc/functions.admin.inc.php +++ b/data/web/inc/functions.admin.inc.php @@ -205,7 +205,7 @@ function admin($_action, $_data = null) { case 'delete': $usernames = (array)$_data['username']; foreach ($usernames as $username) { - if ($_SESSION['mailcow_cc_role'] == $username) { + if ($_SESSION['mailcow_cc_username'] == $username) { $_SESSION['return'][] = array( 'type' => 'warning', 'log' => array(__FUNCTION__, $_action, $_data_log), From abc4fcc3acfce869a42bc018e8c05fa407d81062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Peters?= Date: Thu, 7 Feb 2019 19:40:04 +0100 Subject: [PATCH 3/3] [Web] Fix inactive admin login --- data/web/inc/functions.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/data/web/inc/functions.inc.php b/data/web/inc/functions.inc.php index dae26665..0c2b8ccc 100644 --- a/data/web/inc/functions.inc.php +++ b/data/web/inc/functions.inc.php @@ -406,6 +406,7 @@ function check_login($user, $pass) { $user = strtolower(trim($user)); $stmt = $pdo->prepare("SELECT `password` FROM `admin` WHERE `superadmin` = '1' + AND `active` = '1' AND `username` = :user"); $stmt->execute(array(':user' => $user)); $rows = $stmt->fetchAll(PDO::FETCH_ASSOC);