From 6e93d57766fa5ff330571cc2096adbd7dad4d752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Cort=C3=A9s=20Cano?= <38475681+TrapoSAMA@users.noreply.github.com> Date: Tue, 11 Aug 2026 04:28:19 -0400 Subject: [PATCH] Fix password expiration handling and visibility on 4.x (#1110) - port the password-expiration correction to `postfixadmin_4.0` - make password expiration optional and disabled by default - make 0 consistently mean that domain passwords do not expire - validate whole-day policies from 0 through 36500 - align password-change paths and preserve the existing Login fallback - show mailbox expiration states in lists and CSV output - add the new labels to every 4.x language file - document how to enable the feature in `config.local.php` thanks @TrapoSAMA --- DOCUMENTS/Password_Expiration.md | 17 +++++- config.inc.php | 2 +- functions.inc.php | 72 ++++++++++++++++++++++- languages/bg.lang | 2 + languages/ca.lang | 2 + languages/cn.lang | 2 + languages/cs.lang | 2 + languages/da.lang | 2 + languages/de.lang | 2 + languages/en.lang | 2 + languages/es.lang | 2 + languages/et.lang | 2 + languages/eu.lang | 2 + languages/fi.lang | 2 + languages/fo.lang | 2 + languages/fr.lang | 2 + languages/gl.lang | 2 + languages/hr.lang | 2 + languages/hu.lang | 2 + languages/is.lang | 2 + languages/it.lang | 2 + languages/ja.lang | 2 + languages/lt.lang | 2 + languages/mk.lang | 2 + languages/nb.lang | 2 + languages/nl.lang | 2 + languages/nn.lang | 2 + languages/pl.lang | 2 + languages/pt-br.lang | 2 + languages/pt-pt.lang | 2 + languages/ro.lang | 2 + languages/ru.lang | 2 + languages/sk.lang | 2 + languages/sl.lang | 2 + languages/sv.lang | 2 + languages/tr.lang | 2 + languages/tw.lang | 2 + languages/ua.lang | 2 + model/DomainHandler.php | 20 +++++++ model/Login.php | 10 ++-- model/MailboxHandler.php | 30 +++++++--- public/list-virtual.php | 30 +++++++++- templates/list-virtual_mailbox.tpl | 12 ++++ tests/DomainHandlerTest.php | 57 +++++++++++++++++++ tests/LoginTest.php | 25 ++++++++ tests/PasswordExpirationTest.php | 91 ++++++++++++++++++++++++++++++ 46 files changed, 416 insertions(+), 20 deletions(-) create mode 100644 tests/PasswordExpirationTest.php diff --git a/DOCUMENTS/Password_Expiration.md b/DOCUMENTS/Password_Expiration.md index 8e4db387..e410094a 100644 --- a/DOCUMENTS/Password_Expiration.md +++ b/DOCUMENTS/Password_Expiration.md @@ -16,16 +16,29 @@ Password Expiration is merged with PostfixAdmin - so no additional database chan ## Database Fields * mailbox.password_expiry - timestamp, when the mailbox password expires. - * domain.password_expiry - default duration for when a password will expire + * domain.password_expiry - default duration in days for when a password will + expire. 0 means that passwords in the domain do not expire. Valid policy + values are whole numbers from 0 through 36500. Changes in MySQL/MariaDB mailbox table (as defined in `$CONF['database_tables']` from config.inc.php): ## Changes in Postfix Admin : -To enable password expiration, add the following to your config.inc.php file: +Password expiration is disabled by default. To enable it, add the following to +your `config.local.php` file: `$CONF['password_expiration'] = 'YES';` +The domain policy is a fixed duration, not a countdown. It is applied when a +password is changed; changing the domain policy does not rewrite expiration +dates already stored for existing mailboxes. The mailbox list shows the stored +date for each account, or "Does not expire" when the domain policy is 0. + +PostfixAdmin records and displays password expiration, but does not reject an +expired password when a mailbox user signs in to PostfixAdmin to change it. +Enforcement for IMAP, POP3, SMTP, or webmail login belongs in the corresponding +authentication query, as illustrated below. + ## RoundCube Password Plugin If you are using Roundcube's password plugin, you should also adapt the `$config['password_query']` value. diff --git a/config.inc.php b/config.inc.php index 19415685..69a17efa 100644 --- a/config.inc.php +++ b/config.inc.php @@ -783,7 +783,7 @@ $CONF['xmlrpc_enabled'] = false; //Account expiration info //If enabled, mailbox passwords have a password_expiry field set, which is updated each time the password is changed, based on the parent domain's password_expiry (days) value. //More details in Password_Expiration.md -$CONF['password_expiration'] = 'YES'; +$CONF['password_expiration'] = 'NO'; // If defined, use this rather than trying to construct it from $_SERVER parameters. // used in (at least) password-recover.php. diff --git a/functions.inc.php b/functions.inc.php index 981a9ada..2215201f 100644 --- a/functions.inc.php +++ b/functions.inc.php @@ -330,6 +330,68 @@ function get_password_expiration_value(string $domain) return 0; } +const PASSWORD_EXPIRATION_MAX_DAYS = 36500; +const PASSWORD_EXPIRATION_NEVER = '9999-12-31 23:59:59'; + +/** + * Check whether a stored mailbox expiry represents a non-expiring password. + * + * A zero or invalid domain policy disables expiration. The sentinel also + * remains authoritative when a later domain policy change is non-retroactive. + */ +function mailbox_password_expiration_is_never($mailbox_expiry, $domain_policy): bool +{ + $policy = (string)$domain_policy; + if (!preg_match('/^[1-9][0-9]*$/D', $policy) || (int)$policy > PASSWORD_EXPIRATION_MAX_DAYS) { + return true; + } + + $expiry = strtotime((string)$mailbox_expiry); + $never = strtotime(PASSWORD_EXPIRATION_NEVER); + + return $expiry !== false && $never !== false && $expiry >= $never; +} + +/** + * Return the mailbox expiry timestamp for a password changed now. + * + * A domain value of 0 means that passwords do not expire. The database still + * requires a timestamp, so use the latest portable DATETIME value as a + * sentinel. The same applies when password expiration is disabled globally. + */ +function get_mailbox_password_expiry(string $domain, ?int $now = null): string +{ + if (!Config::bool('password_expiration')) { + return PASSWORD_EXPIRATION_NEVER; + } + + $value = get_password_expiration_value($domain); + $value_string = (string)$value; + + if (!preg_match('/^(0|[1-9][0-9]*)$/D', $value_string)) { + error_log("Invalid password_expiry value for domain $domain; treating it as no expiration"); + return PASSWORD_EXPIRATION_NEVER; + } + + $days = (int)$value_string; + if ($days === 0) { + return PASSWORD_EXPIRATION_NEVER; + } + + if ($days > PASSWORD_EXPIRATION_MAX_DAYS) { + error_log("password_expiry value for domain $domain exceeds the supported maximum; treating it as no expiration"); + return PASSWORD_EXPIRATION_NEVER; + } + + $base = $now ?? time(); + $expiry = strtotime("+$days days", $base); + if ($expiry === false) { + throw new RuntimeException("Unable to calculate password expiry for domain $domain"); + } + + return date('Y-m-d H:i', $expiry); +} + /** * check_email * Checks if an email is valid - if it is, return true, else false. @@ -2183,7 +2245,15 @@ function gen_show_status($show_alias) $now = "datetime('now')"; } - $stat_result = db_query_one("SELECT * FROM " . table_by_key('mailbox') . " WHERE username = ? AND password_expiry <= $now AND active = ?", array($show_alias, db_get_boolean(true))); + $mailbox_table = table_by_key('mailbox'); + $domain_table = table_by_key('domain'); + $stat_result = db_query_one( + "SELECT $mailbox_table.username FROM $mailbox_table " . + "INNER JOIN $domain_table ON $domain_table.domain = $mailbox_table.domain " . + "WHERE $mailbox_table.username = ? AND $mailbox_table.password_expiry <= $now " . + "AND $domain_table.password_expiry > 0 AND $mailbox_table.active = ?", + array($show_alias, db_get_boolean(true)) + ); if (!empty($stat_result)) { $stat_string .= "" . $CONF['show_status_text'] . " "; diff --git a/languages/bg.lang b/languages/bg.lang index cbca4bba..478c075c 100644 --- a/languages/bg.lang +++ b/languages/bg.lang @@ -42,6 +42,8 @@ $PALANG['pFooter_logged_as'] = 'Потребител %s'; # XXX # XXX Text chang $PALANG['pLogin_welcome'] = 'Администраторът може да се логне оттук, за администриране на домейн.'; $PALANG['pLogin_username'] = " Логин (е-мейл)"; $PALANG['password'] = 'Парола'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Language'; # XXX $PALANG['pLogin_button'] = 'Изход'; # XXX compare with pUsersLogin_button - should be "Login" $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX diff --git a/languages/ca.lang b/languages/ca.lang index 0a6de633..f61524ce 100644 --- a/languages/ca.lang +++ b/languages/ca.lang @@ -41,6 +41,8 @@ $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged $PALANG['pLogin_welcome'] = 'Login d\'administrador per l\'administració de dominis.'; $PALANG['pLogin_username'] = 'Usuari (e-mail)'; # XXX compare with pUsersLogin_username - should be "Login (email)" $PALANG['password'] = 'Contrasenya'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Language'; # XXX $PALANG['pLogin_button'] = 'Usuari'; # XXX compare with pUsersLogin_button - should be "Login" $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX diff --git a/languages/cn.lang b/languages/cn.lang index ec13d57d..c4a679d0 100644 --- a/languages/cn.lang +++ b/languages/cn.lang @@ -41,6 +41,8 @@ $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged $PALANG['pLogin_welcome'] = '邮件管理员请从这里登录以管理你的域名.'; $PALANG['pLogin_username'] = '帐号 (邮件地址)'; # XXX compare with pUsersLogin_username - should be "Login (email)" $PALANG['password'] = '密码'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Language'; # XXX $PALANG['pLogin_button'] = '登录'; $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX diff --git a/languages/cs.lang b/languages/cs.lang index 61323e11..ca54cdec 100644 --- a/languages/cs.lang +++ b/languages/cs.lang @@ -49,6 +49,8 @@ $PALANG['pFooter_logged_as'] = 'Přihlášen jako %s'; $PALANG['pLogin_welcome'] = 'Zde se přihlašují emailoví administrátoři pro administraci svých domén.'; $PALANG['pLogin_username'] = 'Uživatelské jméno (email)'; $PALANG['password'] = 'Heslo'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Jazyk'; $PALANG['pLogin_button'] = 'Přihlásit'; $PALANG['pLogin_failed'] = 'Neplatné uživatelské jméno (email) nebo heslo.'; diff --git a/languages/da.lang b/languages/da.lang index 2e8e1b33..6865c332 100644 --- a/languages/da.lang +++ b/languages/da.lang @@ -45,6 +45,8 @@ $PALANG['pFooter_logged_as'] = 'Indlogget som %s'; # XXX Text change: 'logged in $PALANG['pLogin_welcome'] = 'Postadministrator: Log ind for at administrere dine domæner.'; $PALANG['pLogin_username'] = 'Brugernavn (email)'; $PALANG['password'] = 'Adgangskode'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Language'; # XXX $PALANG['pLogin_button'] = 'Log ind'; # XXX compare with pUsersLogin_button - should be "Login" $PALANG['pLogin_failed'] = 'Dit brugernavn eller adgangskode var ikke korrekt.'; diff --git a/languages/de.lang b/languages/de.lang index fa679abb..e3fd8b5c 100644 --- a/languages/de.lang +++ b/languages/de.lang @@ -43,6 +43,8 @@ $PALANG['pFooter_logged_as'] = 'Angemeldet als %s'; $PALANG['pLogin_welcome'] = 'Mail-Administratoren loggen sich bitte hier ein.'; $PALANG['pLogin_username'] = 'Login (eMail)'; $PALANG['password'] = 'Passwort'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Sprache'; $PALANG['pLogin_button'] = 'Login'; $PALANG['pLogin_failed'] = 'Ihre Mailadresse oder das Passwort sind nicht korrekt.'; diff --git a/languages/en.lang b/languages/en.lang index 8113f5bc..c43a47b9 100644 --- a/languages/en.lang +++ b/languages/en.lang @@ -45,6 +45,8 @@ $PALANG['pFooter_logged_as'] = 'Logged in as %s'; $PALANG['pLogin_welcome'] = 'Mail admins login here to administer your domain.'; $PALANG['pLogin_username'] = 'Login (email)'; $PALANG['password'] = 'Password'; +$PALANG['password_expiration_on'] = 'Expires on'; +$PALANG['password_expiration_never'] = 'Does not expire'; $PALANG['pLogin_language'] = 'Language'; $PALANG['pLogin_button'] = 'Login'; $PALANG['pLogin_failed'] = 'Your email address or password is not correct.'; diff --git a/languages/es.lang b/languages/es.lang index db90e087..d935b71f 100644 --- a/languages/es.lang +++ b/languages/es.lang @@ -42,6 +42,8 @@ $PALANG['pFooter_logged_as'] = 'Autenticado como %s'; # XXX Text change: 'logge $PALANG['pLogin_welcome'] = 'Login de administrador para administración de dominios.'; $PALANG['pLogin_username'] = 'Usuario (e-mail)'; # XXX compare with pUsersLogin_username - should be "Login (email)" $PALANG['password'] = 'Contraseña'; +$PALANG['password_expiration_on'] = 'Expira el'; +$PALANG['password_expiration_never'] = 'No expira'; $PALANG['pLogin_language'] = 'Lenguaje'; # XXX $PALANG['pLogin_button'] = 'Usuario'; # XXX compare with pUsersLogin_button - should be "Login" $PALANG['pLogin_failed'] = 'La cuenta de email o la contraseña no son correctas.'; diff --git a/languages/et.lang b/languages/et.lang index a7263bdc..8d2b1b07 100644 --- a/languages/et.lang +++ b/languages/et.lang @@ -41,6 +41,8 @@ $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged $PALANG['pLogin_welcome'] = 'E-posti haldaja, logi siit domeeni administreerimiseks sisse.'; $PALANG['pLogin_username'] = 'Kasutajanimi (e-posti aadress)'; $PALANG['password'] = 'Parool'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Language'; # XXX $PALANG['pLogin_button'] = 'Logi sisse'; $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX diff --git a/languages/eu.lang b/languages/eu.lang index 38e63e95..b7d7db30 100644 --- a/languages/eu.lang +++ b/languages/eu.lang @@ -41,6 +41,8 @@ $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged $PALANG['pLogin_welcome'] = 'Kudeatzailearen logina domeinuak kudeatzeko.'; $PALANG['pLogin_username'] = 'Erabiltzailea (e-mail)'; # XXX compare with pUsersLogin_username - should be "Login (email)" $PALANG['password'] = 'Pasahitza'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Language'; # XXX $PALANG['pLogin_button'] = 'Erabiltzailea'; # XXX compare with pUsersLogin_button - should be "Login" $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX diff --git a/languages/fi.lang b/languages/fi.lang index fa9766d9..e57936fd 100644 --- a/languages/fi.lang +++ b/languages/fi.lang @@ -42,6 +42,8 @@ $PALANG['pFooter_logged_as'] = 'Kirjautunut sisään tunnuksella %s'; # XXX Text $PALANG['pLogin_welcome'] = 'Kirjautuminen'; $PALANG['pLogin_username'] = 'Tunnus'; $PALANG['password'] = 'Salasana'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Language'; # XXX $PALANG['pLogin_button'] = 'Kirjaudu'; $PALANG['pLogin_failed'] = 'Sähköpostiosoite tai salasana väärin!'; diff --git a/languages/fo.lang b/languages/fo.lang index f4a87146..d6a25910 100644 --- a/languages/fo.lang +++ b/languages/fo.lang @@ -41,6 +41,8 @@ $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged $PALANG['pLogin_welcome'] = 'Umsitarar kunnu logga inn her fyri at umsita tykkara navnaøki.'; $PALANG['pLogin_username'] = 'Login (e-post)'; $PALANG['password'] = 'Loyniorð'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Language'; # XXX $PALANG['pLogin_button'] = 'Logga inn'; $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX diff --git a/languages/fr.lang b/languages/fr.lang index 3d0f7807..213ec6f8 100644 --- a/languages/fr.lang +++ b/languages/fr.lang @@ -45,6 +45,8 @@ $PALANG['pFooter_logged_as'] = 'Connecté en tant que %s'; $PALANG['pLogin_welcome'] = 'Entrez votre adresse email pour administrer votre domaine.'; $PALANG['pLogin_username'] = 'Adresse email'; $PALANG['password'] = 'Mot de passe'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Langue'; $PALANG['pLogin_button'] = 'Entrer'; $PALANG['pLogin_failed'] = 'Votre courriel ou mot de passe est incorrect.'; diff --git a/languages/gl.lang b/languages/gl.lang index b219bec2..761cc777 100644 --- a/languages/gl.lang +++ b/languages/gl.lang @@ -40,6 +40,8 @@ $PALANG['pFooter_logged_as'] = 'Autenticado como %s'; # XXX Text change: 'logge $PALANG['pLogin_welcome'] = 'Login de administrador para administración de dominios.'; $PALANG['pLogin_username'] = 'Usuario (e-mail)'; # XXX compare with pUsersLogin_username - should be "Login (email)" $PALANG['password'] = 'Contrasinal'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Linguaxe'; # XXX $PALANG['pLogin_button'] = 'Usuario'; # XXX compare with pUsersLogin_button - should be "Login" $PALANG['pLogin_failed'] = 'A conta de email ou o contrasinal non son correctas.'; diff --git a/languages/hr.lang b/languages/hr.lang index 89f8e98d..6a7dd1d9 100644 --- a/languages/hr.lang +++ b/languages/hr.lang @@ -40,6 +40,8 @@ $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged $PALANG['pLogin_welcome'] = 'Administratori prijavite se ovdje.'; $PALANG['pLogin_username'] = 'Korisničko ime (adresa e-pote)'; # XXX check translation - should be "Login (email)" $PALANG['password'] = 'Lozinka'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Language'; # XXX $PALANG['pLogin_button'] = 'Prijavi'; # XXX compare with pUsersLogin_button - should be "Login" $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX diff --git a/languages/hu.lang b/languages/hu.lang index 30d218b6..5d63e04a 100644 --- a/languages/hu.lang +++ b/languages/hu.lang @@ -42,6 +42,8 @@ $PALANG['pFooter_logged_as'] = '%s-ként bejelentkezve'; # XXX Text change: 'log $PALANG['pLogin_welcome'] = 'Mail adminisztrátorok itt jelentkezzenek be, hogy adminisztrálják a domainjüket.'; $PALANG['pLogin_username'] = 'Bejelentkezés (email)'; # XXX compare with pUsersLogin_username - should be "Login (email)" $PALANG['password'] = 'Jelszó'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Language'; # XXX $PALANG['pLogin_button'] = 'Bejelentkezés'; # XXX compare with pUsersLogin_button - should be "Login" $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX diff --git a/languages/is.lang b/languages/is.lang index 7d4923de..e5913c71 100644 --- a/languages/is.lang +++ b/languages/is.lang @@ -41,6 +41,8 @@ $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged $PALANG['pLogin_welcome'] = 'Póst kerfisstjóri tengist hér til að viðhalda póstkerfi lénsins þins.'; $PALANG['pLogin_username'] = 'Auðkenni(email)'; # XXX check translation - should be "Login (email)" $PALANG['password'] = 'Lykilorð'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Language'; # XXX $PALANG['pLogin_button'] = 'Tengjast'; # XXX compare with pUsersLogin_button - should be "Login" $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX diff --git a/languages/it.lang b/languages/it.lang index 373fc770..b8062e24 100644 --- a/languages/it.lang +++ b/languages/it.lang @@ -43,6 +43,8 @@ $PALANG['pFooter_logged_as'] = 'Collegato come %s'; $PALANG['pLogin_welcome'] = 'Gli amministratori di posta devono effettuare il login qui per amministrare il proprio dominio.'; $PALANG['pLogin_username'] = 'Nome utente (email)'; $PALANG['password'] = 'Password'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Lingua'; $PALANG['pLogin_button'] = 'Entra'; $PALANG['pLogin_failed'] = 'Il tuo indirizzo email o password non sono corretti.'; diff --git a/languages/ja.lang b/languages/ja.lang index d62d4e24..c27c88ff 100644 --- a/languages/ja.lang +++ b/languages/ja.lang @@ -43,6 +43,8 @@ $PALANG['pFooter_logged_as'] = 'ログイン名 %s'; $PALANG['pLogin_welcome'] = 'こちらからドメインの管理ができます。'; $PALANG['pLogin_username'] = 'ログイン (メールアドレス)'; $PALANG['password'] = 'パスワード'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = '言語'; $PALANG['pLogin_button'] = 'ログイン'; $PALANG['pLogin_failed'] = 'ユーザ名かパスワードが違います。'; diff --git a/languages/lt.lang b/languages/lt.lang index 57ab223f..20897af3 100644 --- a/languages/lt.lang +++ b/languages/lt.lang @@ -41,6 +41,8 @@ $PALANG['pFooter_logged_as'] = 'Prisijungęs kaip %s'; $PALANG['pLogin_welcome'] = 'Pašto srities administratorius.'; $PALANG['pLogin_username'] = 'Vartotojas (el.paštas)'; $PALANG['password'] = 'Slaptažodis'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Kalba'; $PALANG['pLogin_button'] = 'Prisijungti'; $PALANG['pLogin_failed'] = 'Neteisingas el. pašto adresas arba slaptažodis.'; diff --git a/languages/mk.lang b/languages/mk.lang index cf3826b3..bcd8d67c 100644 --- a/languages/mk.lang +++ b/languages/mk.lang @@ -41,6 +41,8 @@ $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged $PALANG['pLogin_welcome'] = 'Логин за администрирање на домени (Само за администратори!)'; $PALANG['pLogin_username'] = 'Корисничко име (email)'; $PALANG['password'] = 'Лозинка'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Language'; # XXX $PALANG['pLogin_button'] = 'Пријава'; $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX diff --git a/languages/nb.lang b/languages/nb.lang index 7eaafde0..116f2ad2 100644 --- a/languages/nb.lang +++ b/languages/nb.lang @@ -43,6 +43,8 @@ $PALANG['pFooter_logged_as'] = 'Logget inn som %s'; # XXX Text change: 'logged i $PALANG['pLogin_welcome'] = 'E-postadministratorer kan logge inn her for å administrere sine domener'; $PALANG['pLogin_username'] = 'Brukernavn (e-postadresse)'; $PALANG['password'] = 'Passord'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Language'; # XXX $PALANG['pLogin_button'] = 'Logg inn'; $PALANG['pLogin_failed'] = 'E-postadressen eller passordet er ikke korrekt.'; diff --git a/languages/nl.lang b/languages/nl.lang index eda3a172..8bc8dc39 100644 --- a/languages/nl.lang +++ b/languages/nl.lang @@ -43,6 +43,8 @@ $PALANG['pFooter_logged_as'] = 'aangemeld als %s'; $PALANG['pLogin_welcome'] = 'Mail beheerders log hier in om uw domeinen te beheren.'; $PALANG['pLogin_username'] = 'Login (e-mail)'; $PALANG['password'] = 'Wachtwoord'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Taal'; $PALANG['pLogin_button'] = 'Login'; $PALANG['pLogin_failed'] = 'Uw login gegevens zijn onjuist.'; diff --git a/languages/nn.lang b/languages/nn.lang index c1f6bf0d..90b38fe2 100644 --- a/languages/nn.lang +++ b/languages/nn.lang @@ -41,6 +41,8 @@ $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged $PALANG['pLogin_welcome'] = 'Postadministrator; Logg inn her for å administrere ditt domene'; $PALANG['pLogin_username'] = 'Brukernavn (e-postadressen)'; $PALANG['password'] = 'Passord'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Language'; # XXX $PALANG['pLogin_button'] = 'Logg inn'; $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX diff --git a/languages/pl.lang b/languages/pl.lang index b2db2151..a3fc1262 100644 --- a/languages/pl.lang +++ b/languages/pl.lang @@ -44,6 +44,8 @@ $PALANG['pFooter_logged_as'] = 'Zalogowano jako %s'; $PALANG['pLogin_welcome'] = 'Sekcja przeznaczona dla administratorów domen.'; $PALANG['pLogin_username'] = 'Użytkownik (email)'; # XXX check translation - should be "Login (email)" $PALANG['password'] = 'Hasło'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Language'; # XXX $PALANG['pLogin_button'] = 'Zaloguj'; $PALANG['pLogin_failed'] = 'Twój adres Email lub hasło jest niepoprawne.'; diff --git a/languages/pt-br.lang b/languages/pt-br.lang index ee8dad64..5ab37522 100644 --- a/languages/pt-br.lang +++ b/languages/pt-br.lang @@ -43,6 +43,8 @@ $PALANG['pFooter_logged_as'] = 'Autenticado como %s'; # XXX Text change: 'logged $PALANG['pLogin_welcome'] = 'Administradores devem se autenticar aqui para gerenciar seus domínios.'; $PALANG['pLogin_username'] = 'Usuário (email)'; $PALANG['password'] = 'Senha'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Language'; # XXX $PALANG['pLogin_button'] = 'Entrar'; $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX diff --git a/languages/pt-pt.lang b/languages/pt-pt.lang index b01336aa..fc40836e 100644 --- a/languages/pt-pt.lang +++ b/languages/pt-pt.lang @@ -43,6 +43,8 @@ $PALANG['pFooter_logged_as'] = 'Autenticado como %s'; # XXX Text change: 'logged $PALANG['pLogin_welcome'] = 'Administradores devem de se autenticar aqui para gerir os domínios.'; $PALANG['pLogin_username'] = 'Utilizador (email)'; $PALANG['password'] = 'Password'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Linguagem'; # XXX $PALANG['pLogin_button'] = 'Entrar'; $PALANG['pLogin_failed'] = 'O endereço de email ou password não estão correctos.'; # XXX diff --git a/languages/ro.lang b/languages/ro.lang index 6d2e77e2..931c82c6 100644 --- a/languages/ro.lang +++ b/languages/ro.lang @@ -42,6 +42,8 @@ $PALANG['pFooter_logged_as'] = 'Logat ca %s'; $PALANG['pLogin_welcome'] = 'Conectare pentru administratorii de domeniu'; $PALANG['pLogin_username'] = 'Login (email)'; $PALANG['password'] = 'Parola'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Limba'; $PALANG['pLogin_button'] = 'Login'; $PALANG['pLogin_failed'] = 'Adresa de email sau parola nu sunt corecte'; diff --git a/languages/ru.lang b/languages/ru.lang index de94afda..8132ef95 100644 --- a/languages/ru.lang +++ b/languages/ru.lang @@ -45,6 +45,8 @@ $PALANG['pFooter_logged_as'] = 'Логин: %s'; $PALANG['pLogin_welcome'] = 'Вход для администраторов почтовых доменов.'; $PALANG['pLogin_username'] = 'Имя (email)'; $PALANG['password'] = 'Пароль'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Язык'; $PALANG['pLogin_button'] = 'Войти'; $PALANG['pLogin_failed'] = 'Ваш адрес email или пароль неверен.'; diff --git a/languages/sk.lang b/languages/sk.lang index 90981b60..57f1e9b4 100644 --- a/languages/sk.lang +++ b/languages/sk.lang @@ -42,6 +42,8 @@ $PALANG['pFooter_logged_as'] = 'Prihlásený ako %s'; $PALANG['pLogin_welcome'] = 'Prihlásenie administrátorov pre správu domén'; $PALANG['pLogin_username'] = 'Užívateľské meno (email)'; $PALANG['password'] = 'Heslo'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Jazyk'; $PALANG['pLogin_button'] = 'Prihlásiť'; $PALANG['pLogin_failed'] = 'Váš email alebo heslo nie je správne.'; diff --git a/languages/sl.lang b/languages/sl.lang index 5d572880..0c52a20d 100644 --- a/languages/sl.lang +++ b/languages/sl.lang @@ -41,6 +41,8 @@ $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged $PALANG['pLogin_welcome'] = 'Administratorji se prijavite tukaj.'; $PALANG['pLogin_username'] = 'Uporabniško ime (e-poštni naslov)'; # XXX check translation - should be "Login (email)" $PALANG['password'] = 'Geslo'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Language'; # XXX $PALANG['pLogin_button'] = 'Prijavi'; # XXX compare with pUsersLogin_button - should be "Login" $PALANG['pLogin_failed'] = 'Your email address or password are not correct.'; # XXX diff --git a/languages/sv.lang b/languages/sv.lang index 7c53c12e..3d568d9b 100644 --- a/languages/sv.lang +++ b/languages/sv.lang @@ -44,6 +44,8 @@ $PALANG['pFooter_logged_as'] = 'Inloggad som %s'; # XXX Text change: 'logged in $PALANG['pLogin_welcome'] = 'E-postadministratörer loggar in här för att hantera domäner.'; $PALANG['pLogin_username'] = 'Login (e-post)'; # XXX compare with pUsersLogin_username - should be "Login (email)" $PALANG['password'] = 'Lösenord'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Språk'; $PALANG['pLogin_button'] = 'Login'; $PALANG['pLogin_failed'] = 'E-postadressen eller lösenordet är felaktigt.'; diff --git a/languages/tr.lang b/languages/tr.lang index e80b0ac5..37c6f396 100644 --- a/languages/tr.lang +++ b/languages/tr.lang @@ -41,6 +41,8 @@ $PALANG['pFooter_logged_as'] = 'Giriş yapılan kullanıcı: %s'; $PALANG['pLogin_welcome'] = 'E-Posta Yöneticileri, buradan domainlerinizi yönetmek için giriş yapabilirsiniz.'; $PALANG['pLogin_username'] = 'Kullanıcı adı (e-posta)'; # # XXX check translation - should be "Login (email)" $PALANG['password'] = 'Şifre'; # XXX compare with pUsersLogin_password - should be "Password" +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Dil'; $PALANG['pLogin_button'] = 'Giriş'; # XXX compare with pUsersLogin_button - should be "Login" $PALANG['pLogin_failed'] = 'E-posta adresiniz veya şifreniz yanlış.'; diff --git a/languages/tw.lang b/languages/tw.lang index 54670611..62c86142 100644 --- a/languages/tw.lang +++ b/languages/tw.lang @@ -42,6 +42,8 @@ $PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX # XXX Text change: 'logged $PALANG['pLogin_welcome'] = '郵件管理員請從這裡登錄以管理你的網域.'; $PALANG['pLogin_username'] = '帳號(電郵)'; $PALANG['password'] = '密碼'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Language'; # XXX $PALANG['pLogin_button'] = '登錄'; $PALANG['pLogin_failed'] = '你的帳號或密碼不正確。'; diff --git a/languages/ua.lang b/languages/ua.lang index 65749aa5..776a64da 100644 --- a/languages/ua.lang +++ b/languages/ua.lang @@ -43,6 +43,8 @@ $PALANG['pFooter_logged_as'] = 'Логін: %s'; $PALANG['pLogin_welcome'] = 'Вхід для адміністраторів поштових доменів'; $PALANG['pLogin_username'] = 'Логін (Email)'; $PALANG['password'] = 'Пароль'; +$PALANG['password_expiration_on'] = 'Expires on'; # XXX +$PALANG['password_expiration_never'] = 'Does not expire'; # XXX $PALANG['pLogin_language'] = 'Мова - Language'; $PALANG['pLogin_button'] = 'УВІЙТИ'; $PALANG['pLogin_failed'] = 'Ваша електронна адреса або пароль неправильні.'; diff --git a/model/DomainHandler.php b/model/DomainHandler.php index ceea78ab..fd523fae 100644 --- a/model/DomainHandler.php +++ b/model/DomainHandler.php @@ -11,6 +11,26 @@ class DomainHandler extends PFAHandler protected $id_field = 'domain'; protected $domain_field = 'domain'; + protected function _validate_password_expiry($field, $val) + { + $value = (string)$val; + $valid = preg_match('/^(0|[1-9][0-9]*)$/D', $value) === 1 + && (int)$value <= PASSWORD_EXPIRATION_MAX_DAYS; + + if (!$valid) { + $this->errormsg[$field] = Config::lang_f('invalid_value_given', $field); + } + + return $valid; + } + + protected function setmore(array $values) + { + if (array_key_exists('password_expiry', $this->values)) { + $this->values['password_expiry'] = (int)$this->values['password_expiry']; + } + } + protected function validate_new_id() { $domain_check = check_domain($this->id); diff --git a/model/Login.php b/model/Login.php index f2b6f22e..3d8ee103 100644 --- a/model/Login.php +++ b/model/Login.php @@ -136,12 +136,10 @@ class Login 'password' => pacrypt($new_password, '', $username), ); - if (Config::bool('password_expiration')) { - $domain = $this->getUserDomain($username); - if (!is_null($domain)) { - $password_expiration_value = (int)get_password_expiration_value($domain); - $set['password_expiry'] = date('Y-m-d H:i', strtotime("+$password_expiration_value day")); - } + $user_domain = $this->getUserDomain($username); + if (!is_null($user_domain)) { + $domain = $user_domain; + $set['password_expiry'] = get_mailbox_password_expiry($user_domain); } $result = db_update($this->table, 'username', $username, $set); diff --git a/model/MailboxHandler.php b/model/MailboxHandler.php index 7797abc5..21552f81 100644 --- a/model/MailboxHandler.php +++ b/model/MailboxHandler.php @@ -62,7 +62,7 @@ class MailboxHandler extends PFAHandler 'token_validity' => self::pacol(1, 0, 0, 'ts', '', '', date("Y-m-d H:i:s", time())), 'created' => self::pacol(0, 0, 1, 'ts', 'created', ''), 'modified' => self::pacol(0, 0, 1, 'ts', 'last_modified', ''), - 'password_expiry' => self::pacol(0, 0, 1, 'ts', 'password_expiration', ''), + 'password_expiry' => self::pacol(0, 0, (int)Config::bool('password_expiration'), 'ts', 'password_expiration', ''), # TODO: add virtual 'notified' column and allow to display who received a vacation response? ); @@ -225,6 +225,9 @@ class MailboxHandler extends PFAHandler protected function read_from_db_postprocess($db_result) { + $password_expiration_policies = array(); + $password_expiration_never_label = Config::lang('password_expiration_never'); + foreach ($db_result as $key => $row) { if (isset($row['quota']) && is_numeric($row['quota']) && $row['quota'] > -1) { # quota could be disabled in $struct $db_result[$key]['quotabytes'] = $row['quota']; @@ -233,6 +236,21 @@ class MailboxHandler extends PFAHandler $db_result[$key]['quotabytes'] = -1; $db_result[$key]['quota'] = -1; } + + if (Config::bool('password_expiration') && isset($row['password_expiry'], $row['domain'])) { + $domain = (string)$row['domain']; + if (!array_key_exists($domain, $password_expiration_policies)) { + $password_expiration_policies[$domain] = get_password_expiration_value($domain); + } + + $raw_expiry = $row['_password_expiry'] ?? $row['password_expiry']; + if (mailbox_password_expiration_is_never( + $raw_expiry, + $password_expiration_policies[$domain] + )) { + $db_result[$key]['password_expiry'] = $password_expiration_never_label; + } + } } return $db_result; } @@ -284,14 +302,8 @@ class MailboxHandler extends PFAHandler } if (!empty($this->values['password'])) { - // provide some default value to keep MySQL etc happy. - $this->values['password_expiry'] = date('Y-m-d H:i', strtotime("+365 days")); - if (Config::bool('password_expiration')) { - $domain_dirty = $this->domain_from_id(); - $domain = trim($domain_dirty, "`'"); // naive assumption it is ' escaping. - $password_expiration_value = (int)get_password_expiration_value($domain); - $this->values['password_expiry'] = date('Y-m-d H:i', strtotime("+$password_expiration_value day")); - } + $domain = $this->domain_from_id(); + $this->values['password_expiry'] = get_mailbox_password_expiry($domain); } return true; diff --git a/public/list-virtual.php b/public/list-virtual.php index dcaa414d..b9127bb6 100644 --- a/public/list-virtual.php +++ b/public/list-virtual.php @@ -152,6 +152,7 @@ if (Config::bool('alias_domain')) { # $table_alias = table_by_key('alias'); +$table_domain = table_by_key('domain'); $table_mailbox = table_by_key('mailbox'); if (count($search) == 0 || !isset($search['_'])) { @@ -212,7 +213,8 @@ if ($display_mailbox_aliases) { } if ($password_expiration) { - $sql_select .= ", $table_mailbox.password_expiry as password_expiration "; + $sql_select .= ", $table_mailbox.password_expiry as password_expiration, $table_domain.password_expiry as domain_password_expiration "; + $sql_join .= " LEFT JOIN $table_domain ON $table_mailbox.domain=$table_domain.domain "; } if (Config::bool('vacation_control_admin')) { @@ -247,6 +249,21 @@ $delimiter = preg_quote($CONF['recipient_delimiter'], "/"); $goto_single_rec_del = ""; foreach ($result as $row) { + if ($password_expiration) { + $password_expiration_timestamp = strtotime((string)$row['password_expiration']); + $row['password_expiration_never'] = mailbox_password_expiration_is_never( + $row['password_expiration'], + $row['domain_password_expiration'] + ); + $row['password_expiration_expired'] = !$row['password_expiration_never'] + && $password_expiration_timestamp !== false + && $password_expiration_timestamp <= time(); + + if ($password_expiration_timestamp !== false) { + $row['password_expiration'] = date('Y-m-d H:i', $password_expiration_timestamp); + } + } + if ($display_mailbox_aliases) { $goto_split = explode(",", $row['goto']); $row['goto_mailbox'] = 0; @@ -511,6 +528,17 @@ $smarty->assign('tAlias', $tAlias); $smarty->assign('alias_data', $alias_data); $smarty->assign('tMailbox', $tMailbox); +$smarty->assign('password_expiration', $password_expiration); +$password_expiration_on_label = Config::lang('password_expiration_on'); +if ($password_expiration_on_label === '') { + $password_expiration_on_label = Config::lang('password_expiration'); +} +$password_expiration_never_label = Config::lang('password_expiration_never'); +if ($password_expiration_never_label === '') { + $password_expiration_never_label = Config::lang('pOverview_unlimited'); +} +$smarty->assign('password_expiration_on_label', $password_expiration_on_label); +$smarty->assign('password_expiration_never_label', $password_expiration_never_label); $smarty->assign('gen_show_status_mailbox', $gen_show_status_mailbox, false); $smarty->assign('boolconf_used_quotas', Config::bool('used_quotas')); $smarty->assign('divide_quota', $divide_quota); diff --git a/templates/list-virtual_mailbox.tpl b/templates/list-virtual_mailbox.tpl index 9bc10315..78a00c98 100644 --- a/templates/list-virtual_mailbox.tpl +++ b/templates/list-virtual_mailbox.tpl @@ -14,6 +14,7 @@