From 2c05ff950c26c11cbb8e7a8fb9b613f0cf99bcc1 Mon Sep 17 00:00:00 2001 From: David Goodwin Date: Sat, 26 Sep 2026 09:39:53 +0100 Subject: [PATCH] Totp fixes (#1153) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Wenhao Wu emailed with the following security report, this affects master and postfixadmin-4.0. High — mailbox takeover of mail flow for a 2FA-enrolled account by a password holder. CVSS:3.1/AV:N/AC:L/PR:L/UI:N/S:U/C:H/I:H/A:N ≈ 8.1 (PR:L models possession of the first factor; impact is limited to the attacker's own mailbox account). CWE-308 (Use of Single-Factor Authentication with Two Factors), secondary CWE-287. Not related to the fixed TOTP-exception issue #1014. .... With `$CONF['totp']='YES'` and a mailbox that has TOTP enrolled, logging in with **only the mailbox password** creates an MFA-incomplete session (`username` set, `roles=[]`, `mfa_complete=false`) that is parked at `users/login-mfa.php`. That half-session cannot open `users/main.php` (it has no `user` role), but `public/edit.php` never checks MFA completion: - `public/edit.php:30` — `authentication_get_username()` (comment "enforce login") treats any session with a username as logged in; it never calls `authentication_mfa_incomplete()`. - `public/edit.php:57-63` — for a non-admin session with a handler that has `user_hardcoded_field`, `require_role('admin')` is skipped entirely. .... Wenhao Wu, Southeast University thanks @d3do-23 (@cboltz and TrapoSAMA for reviewing etc) --- functions.inc.php | 33 +++++++++++++-------------- languages/bg.lang | 1 + languages/ca.lang | 1 + languages/cn.lang | 1 + languages/cs.lang | 1 + languages/da.lang | 1 + languages/de.lang | 1 + languages/en.lang | 1 + languages/es.lang | 1 + languages/et.lang | 1 + languages/eu.lang | 1 + languages/fi.lang | 1 + languages/fo.lang | 1 + languages/fr.lang | 1 + languages/gl.lang | 1 + languages/hr.lang | 1 + languages/hu.lang | 1 + languages/is.lang | 1 + languages/it.lang | 1 + languages/ja.lang | 1 + languages/ko.lang | 1 + languages/lt.lang | 1 + languages/mk.lang | 1 + languages/nb.lang | 1 + languages/nl.lang | 1 + languages/nn.lang | 1 + languages/pl.lang | 1 + languages/pt-br.lang | 1 + languages/pt-pt.lang | 1 + languages/ro.lang | 1 + languages/ru.lang | 1 + languages/sk.lang | 1 + languages/sl.lang | 1 + languages/sv.lang | 1 + languages/tr.lang | 1 + languages/tw.lang | 1 + languages/ua.lang | 1 + public/login-mfa.php | 31 +++++-------------------- public/users/login-mfa.php | 32 +++++--------------------- templates/login-mfa.tpl | 2 +- templates/totp.tpl | 46 +++++++++++++++++++------------------- 41 files changed, 88 insertions(+), 92 deletions(-) diff --git a/functions.inc.php b/functions.inc.php index df9e397a..7cb017ca 100644 --- a/functions.inc.php +++ b/functions.inc.php @@ -1,21 +1,10 @@ checkUserTOTP(authentication_get_username(), $fTotp)) { - init_session(authentication_get_username(), true, true); + if (authentication_mfa_incomplete() && $totppf->checkUserTOTP(authentication_get_username(false), $fTotp)) { + init_session(authentication_get_username(false), true, true); // get superadmin status and store in session $h->init(authentication_get_username()); @@ -72,7 +53,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { header("Location: main.php"); exit(0); } else { - error_log("PostfixAdmin admin second factor login failed (username: " . authentication_get_username() . ", ip_address: {$_SERVER['REMOTE_ADDR']})"); + error_log("PostfixAdmin admin second factor login failed (username: " . authentication_get_username(false). ", ip_address: {$_SERVER['REMOTE_ADDR']})"); $error = $PALANG['pTotp_failed']; flash_error($PALANG['pTotp_failed']); } diff --git a/public/users/login-mfa.php b/public/users/login-mfa.php index 712a1e23..f2d5a25a 100644 --- a/public/users/login-mfa.php +++ b/public/users/login-mfa.php @@ -1,33 +1,13 @@ checkUserTOTP(authentication_get_username(), $fTotp)) { - init_session(authentication_get_username(), false, true); + if (authentication_mfa_incomplete() && $totppf->checkUserTOTP(authentication_get_username(false), $fTotp)) { + init_session(authentication_get_username(false), false, true); header("Location: main.php"); exit(0); } else { # $h->login failed - error_log("PostfixAdmin admin second factor login failed (username: " . authentication_get_username() . ", ip_address: {$_SERVER['REMOTE_ADDR']})"); + error_log("PostfixAdmin admin second factor login failed (username: " . authentication_get_username(false) . ", ip_address: {$_SERVER['REMOTE_ADDR']})"); flash_error($PALANG['pTotp_failed']); } } diff --git a/templates/login-mfa.tpl b/templates/login-mfa.tpl index aed38494..fd80a6e9 100644 --- a/templates/login-mfa.tpl +++ b/templates/login-mfa.tpl @@ -6,7 +6,7 @@ {CSRF_Token}
- +
diff --git a/templates/totp.tpl b/templates/totp.tpl index a9171744..56549d4f 100644 --- a/templates/totp.tpl +++ b/templates/totp.tpl @@ -1,5 +1,28 @@
+ {if $show_form == 'hidden'} +
+ +
+ + {/if}

{$PALANG.pTOTP_welcome}

@@ -49,28 +72,5 @@
- {if $show_form == 'hidden'} -
- -
- - {/if}