diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 6021ca6b..236f872c 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -8,6 +8,8 @@ Changes in 'master' (not in a release yet) (20XX/XX/XX) -------------------------- + - Follow up security search filtering, password-recovery messages and password confirmation for TOTP exception forms. + - Populate TOTP actions for each returned administrator or mailbox and handle empty account lists. - Open expanded navigation dropdowns on mouse hover while retaining click, touch and keyboard controls. - Add Cancel to shared create/edit forms and mail composers, returning to the configured list or dashboard. - Use the concise Spanish "MX de respaldo" label for Backup MX in domain lists and forms. diff --git a/DOCUMENTS/HANDLER_CLASSES.md b/DOCUMENTS/HANDLER_CLASSES.md index f35beb9e..a0dfa4b8 100644 --- a/DOCUMENTS/HANDLER_CLASSES.md +++ b/DOCUMENTS/HANDLER_CLASSES.md @@ -209,6 +209,13 @@ protected function _validate_ip(string $field, string $value): bool ``` These are called automatically by `PFAHandler::set()` when processing input. +`TotpexceptionHandler::set()` additionally requires `password_current` for the +acting account on every creation or edit. The generic editor submits this as +`value[password_current]`. The password is not persisted, and a later `set()` +call requires confirmation again. `TotpPf::addException()` shares the same +password check while retaining its existing signature and persistence/hooks. +Mailbox users do not select a target: the handler always uses their acting +username, even when a different target is submitted. ### 9. Hooks: preSave() and postSave() diff --git a/languages/bg.lang b/languages/bg.lang index 5f5eb664..ad02d0ae 100644 --- a/languages/bg.lang +++ b/languages/bg.lang @@ -536,6 +536,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Password cannot be empty'; # XXX $PALANG['pAppPassAdd_result_error'] = 'Could not add application password'; # XXX $PALANG['MFA_submit'] = 'Confirm login'; # XXX $PALANG['pViewlog_action_add_totp_exception'] = 'Add TOTP exception'; # XXX +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Delete TOTP exception'; # XXX $PALANG['pViewlog_action_add_app_password'] = 'Add application password'; # XXX $PALANG['mailbox_postapppassword_failed'] = 'The mailbox postapppassword script failed, check the error log for details!'; # XXX diff --git a/languages/ca.lang b/languages/ca.lang index 8a8f5504..46982eb2 100644 --- a/languages/ca.lang +++ b/languages/ca.lang @@ -535,6 +535,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'La contrasenya no pot ser buida'; $PALANG['pAppPassAdd_result_error'] = 'No es pot afegir la contrasenya de l\'aplicació'; $PALANG['MFA_submit'] = 'Confirmar contrasenya'; $PALANG['pViewlog_action_add_totp_exception'] = 'Afegir excepció TOTP'; +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Suprimeix l\'excepció TOTP'; $PALANG['pViewlog_action_add_app_password'] = 'Afegir contrasenya d\'aplicació'; $PALANG['mailbox_postapppassword_failed'] = 'L\'script de postapppassword de la bústia ha fallat, comproveu el registre d\'errors per obtenir més informació.'; diff --git a/languages/cn.lang b/languages/cn.lang index b4857ddf..52928d18 100644 --- a/languages/cn.lang +++ b/languages/cn.lang @@ -536,6 +536,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = '口号不能空洞'; $PALANG['pAppPassAdd_result_error'] = '不要增加申请密码'; $PALANG['MFA_submit'] = 'Confirmlogin'; $PALANG['pViewlog_action_add_totp_exception'] = '附 件'; +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = '删除备选案文'; $PALANG['pViewlog_action_add_app_password'] = '附录'; $PALANG['mailbox_postapppassword_failed'] = '邮箱的邮递申请词稿失败,核对错误记录,以供参考!'; diff --git a/languages/cs.lang b/languages/cs.lang index d62651f6..2c897f11 100644 --- a/languages/cs.lang +++ b/languages/cs.lang @@ -551,6 +551,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Heslo nelze vyprázdnit'; $PALANG['pAppPassAdd_result_error'] = 'Nelze přidat heslo aplikace'; $PALANG['MFA_submit'] = 'Potvrzení přihlášení'; $PALANG['pViewlog_action_add_totp_exception'] = 'Přidat výjimku TOTP'; +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Odstranění výjimky TOTP'; $PALANG['pViewlog_action_add_app_password'] = 'Přidat heslo aplikace'; $PALANG['mailbox_postapppassword_failed'] = 'Poapppassword skript selhal, zkontrolujte protokol chyby pro podrobnosti!'; diff --git a/languages/da.lang b/languages/da.lang index 78f38fb3..227f7b83 100644 --- a/languages/da.lang +++ b/languages/da.lang @@ -552,6 +552,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Adgangskode kan ikke være tomt'; $PALANG['pAppPassAdd_result_error'] = 'Kan ikke tilføje ansøgningsadgangskode'; $PALANG['MFA_submit'] = 'Bekræft login'; $PALANG['pViewlog_action_add_totp_exception'] = 'Tilføj TOTP undtagelse'; +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Slette TOTP undtagelse'; $PALANG['pViewlog_action_add_app_password'] = 'Tilføj adgangskode'; $PALANG['mailbox_postapppassword_failed'] = 'postkassen postapppassword script mislykkedes, kontrollere fejlen log for detaljer!'; diff --git a/languages/de.lang b/languages/de.lang index 84b18f79..670eae76 100644 --- a/languages/de.lang +++ b/languages/de.lang @@ -548,6 +548,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Passwort kann nicht leer sein'; $PALANG['pAppPassAdd_result_error'] = 'Das Anwendungskennwort nicht hinzufügen'; $PALANG['MFA_submit'] = 'Anmeldung bestätigen'; $PALANG['pViewlog_action_add_totp_exception'] = 'TOTP Ausnahme'; +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'TOTP Ausnahme löschen'; $PALANG['pViewlog_action_add_app_password'] = 'Anwendungskennwort hinzufügen'; $PALANG['mailbox_postapppassword_failed'] = 'Das Postbox Postapppassword-Skript fehlgeschlagen, überprüfen Sie das Fehlerprotokoll für Details!'; diff --git a/languages/en.lang b/languages/en.lang index c1a3049d..c581004b 100644 --- a/languages/en.lang +++ b/languages/en.lang @@ -306,6 +306,7 @@ $PALANG['pViewlog_pagination'] = 'Log pages'; $PALANG['pViewlog_data'] = 'Data'; $PALANG['pViewlog_action_add_totp_exception'] = 'Add TOTP exception'; +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; $PALANG['pViewlog_action_delete_totp_exception'] = 'Delete TOTP exception'; $PALANG['pViewlog_action_create_domain'] = 'create domain'; $PALANG['pViewlog_action_delete_domain'] = 'delete domain'; diff --git a/languages/es.lang b/languages/es.lang index 98480394..5790fe77 100644 --- a/languages/es.lang +++ b/languages/es.lang @@ -537,6 +537,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'La contraseña no puede estar vacía' $PALANG['pAppPassAdd_result_error'] = 'No se puede agregar contraseña de aplicación'; $PALANG['MFA_submit'] = 'Confirmar inicio de sesión'; $PALANG['pViewlog_action_add_totp_exception'] = 'Añadir una excepción de TOTP para una dirección IP'; +$PALANG['pViewlog_action_edit_totp_exception'] = 'Modificar exención TOTP'; $PALANG['pViewlog_action_delete_totp_exception'] = 'Suprímase la excepción TOTP'; $PALANG['pViewlog_action_add_app_password'] = 'Agregar contraseña de aplicación'; $PALANG['mailbox_postapppassword_failed'] = 'Falló el script ejecutado después de cambiar la contraseña de aplicación del buzón; revise el registro de errores para obtener más detalles.'; diff --git a/languages/et.lang b/languages/et.lang index d5acb8fb..e3476cc8 100644 --- a/languages/et.lang +++ b/languages/et.lang @@ -540,6 +540,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Password cannot be empty'; # XXX $PALANG['pAppPassAdd_result_error'] = 'Could not add application password'; # XXX $PALANG['MFA_submit'] = 'Confirm login'; # XXX $PALANG['pViewlog_action_add_totp_exception'] = 'Add TOTP exception'; # XXX +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Delete TOTP exception'; # XXX $PALANG['pViewlog_action_add_app_password'] = 'Add application password'; # XXX $PALANG['mailbox_postapppassword_failed'] = 'The mailbox postapppassword script failed, check the error log for details!'; # XXX diff --git a/languages/eu.lang b/languages/eu.lang index f4a0a600..dbd7ca33 100644 --- a/languages/eu.lang +++ b/languages/eu.lang @@ -535,6 +535,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Password cannot be empty'; # XXX $PALANG['pAppPassAdd_result_error'] = 'Could not add application password'; # XXX $PALANG['MFA_submit'] = 'Confirm login'; # XXX $PALANG['pViewlog_action_add_totp_exception'] = 'Add TOTP exception'; # XXX +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Delete TOTP exception'; # XXX $PALANG['pViewlog_action_add_app_password'] = 'Add application password'; # XXX $PALANG['mailbox_postapppassword_failed'] = 'The mailbox postapppassword script failed, check the error log for details!'; # XXX diff --git a/languages/fi.lang b/languages/fi.lang index 78650e75..d3c09b1a 100644 --- a/languages/fi.lang +++ b/languages/fi.lang @@ -536,6 +536,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Password ei voi olla tyhjä'; $PALANG['pAppPassAdd_result_error'] = 'Ei voi lisätä salasanaa'; $PALANG['MFA_submit'] = 'Vahvista logiikka'; $PALANG['pViewlog_action_add_totp_exception'] = 'Lisää TOTP-poikkeus'; +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Poikkeuksen poistaminen'; $PALANG['pViewlog_action_add_app_password'] = 'Lisää sovelluksen salasana'; $PALANG['mailbox_postapppassword_failed'] = 'Postilaatikko postapppassword script epäonnistui, tarkista virheloki yksityiskohtiin!'; diff --git a/languages/fo.lang b/languages/fo.lang index 6639dcd8..1f45a1cc 100644 --- a/languages/fo.lang +++ b/languages/fo.lang @@ -541,6 +541,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Password cannot be empty'; # XXX $PALANG['pAppPassAdd_result_error'] = 'Could not add application password'; # XXX $PALANG['MFA_submit'] = 'Confirm login'; # XXX $PALANG['pViewlog_action_add_totp_exception'] = 'Add TOTP exception'; # XXX +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Delete TOTP exception'; # XXX $PALANG['pViewlog_action_add_app_password'] = 'Add application password'; # XXX $PALANG['mailbox_postapppassword_failed'] = 'The mailbox postapppassword script failed, check the error log for details!'; # XXX diff --git a/languages/fr.lang b/languages/fr.lang index a7e7995a..30034700 100644 --- a/languages/fr.lang +++ b/languages/fr.lang @@ -540,6 +540,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Le mot de passe ne peut pas être vid $PALANG['pAppPassAdd_result_error'] = 'Impossible d\'ajouter un mot de passe'; $PALANG['MFA_submit'] = 'Valider'; $PALANG['pViewlog_action_add_totp_exception'] = 'Ajouter une exception TOTP'; +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Supprimer l\'exception TOTP'; $PALANG['pViewlog_action_add_app_password'] = 'Ajouter un mot de passe'; $PALANG['mailbox_postapppassword_failed'] = 'Échec du script postapppassword. Consultez le journal des erreurs pour plus de détails !'; diff --git a/languages/gl.lang b/languages/gl.lang index f5302370..cccaa5b4 100644 --- a/languages/gl.lang +++ b/languages/gl.lang @@ -536,6 +536,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Password cannot be empty'; # XXX $PALANG['pAppPassAdd_result_error'] = 'Could not add application password'; # XXX $PALANG['MFA_submit'] = 'Confirm login'; # XXX $PALANG['pViewlog_action_add_totp_exception'] = 'Add TOTP exception'; # XXX +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Delete TOTP exception'; # XXX $PALANG['pViewlog_action_add_app_password'] = 'Add application password'; # XXX $PALANG['mailbox_postapppassword_failed'] = 'The mailbox postapppassword script failed, check the error log for details!'; # XXX diff --git a/languages/hr.lang b/languages/hr.lang index 6f38d803..c49774c6 100644 --- a/languages/hr.lang +++ b/languages/hr.lang @@ -535,6 +535,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Password cannot be empty'; # XXX $PALANG['pAppPassAdd_result_error'] = 'Could not add application password'; # XXX $PALANG['MFA_submit'] = 'Confirm login'; # XXX $PALANG['pViewlog_action_add_totp_exception'] = 'Add TOTP exception'; # XXX +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Delete TOTP exception'; # XXX $PALANG['pViewlog_action_add_app_password'] = 'Add application password'; # XXX $PALANG['mailbox_postapppassword_failed'] = 'The mailbox postapppassword script failed, check the error log for details!'; # XXX diff --git a/languages/hu.lang b/languages/hu.lang index 0b3ecb53..79361d6e 100644 --- a/languages/hu.lang +++ b/languages/hu.lang @@ -549,6 +549,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'A jelszó nem lehet üres'; $PALANG['pAppPassAdd_result_error'] = 'Nem lehet hozzáadni az alkalmazási jelszót'; $PALANG['MFA_submit'] = 'Confirm login'; $PALANG['pViewlog_action_add_totp_exception'] = 'TOTP kivétel hozzáadása'; +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'TOTP kivétel törlesztése'; $PALANG['pViewlog_action_add_app_password'] = 'Adjon alkalmazási jelszót'; $PALANG['mailbox_postapppassword_failed'] = 'A postaláda posztapppassword script nem sikerült, ellenőrizze a hibanaplót a részletekért!'; diff --git a/languages/is.lang b/languages/is.lang index 3aac8e66..39db2355 100644 --- a/languages/is.lang +++ b/languages/is.lang @@ -536,6 +536,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Password cannot be empty'; # XXX $PALANG['pAppPassAdd_result_error'] = 'Could not add application password'; # XXX $PALANG['MFA_submit'] = 'Confirm login'; # XXX $PALANG['pViewlog_action_add_totp_exception'] = 'Add TOTP exception'; # XXX +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Delete TOTP exception'; # XXX $PALANG['pViewlog_action_add_app_password'] = 'Add application password'; # XXX $PALANG['mailbox_postapppassword_failed'] = 'The mailbox postapppassword script failed, check the error log for details!'; # XXX diff --git a/languages/it.lang b/languages/it.lang index ab8390af..c6dec79a 100644 --- a/languages/it.lang +++ b/languages/it.lang @@ -537,6 +537,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'La password non può essere vuota'; $PALANG['pAppPassAdd_result_error'] = 'Non è possibile aggiungere la password dell\'applicazione'; $PALANG['MFA_submit'] = 'Confermare il login'; $PALANG['pViewlog_action_add_totp_exception'] = 'Aggiungi l\'eccezione TOTP'; +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Eliminare l\'eccezione TOTP'; $PALANG['pViewlog_action_add_app_password'] = 'Aggiungi password dell\'applicazione'; $PALANG['mailbox_postapppassword_failed'] = 'Lo script postapppassword casella di posta non è riuscito, controlla il registro di errore per i dettagli!'; diff --git a/languages/ja.lang b/languages/ja.lang index 34295c9b..d23d7724 100644 --- a/languages/ja.lang +++ b/languages/ja.lang @@ -547,6 +547,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'パスワードが空にすること $PALANG['pAppPassAdd_result_error'] = 'アプリケーションパスワードを追加できません'; $PALANG['MFA_submit'] = 'ログイン確認'; $PALANG['pViewlog_action_add_totp_exception'] = 'TOTP例外の追加'; +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'TOTP例外の削除'; $PALANG['pViewlog_action_add_app_password'] = 'アプリケーションパスワードの追加'; $PALANG['mailbox_postapppassword_failed'] = 'mailbox postapppasswordスクリプトが失敗しました。詳細はエラーログを確認してください!'; diff --git a/languages/ko.lang b/languages/ko.lang index dfd3588e..f7f25d52 100644 --- a/languages/ko.lang +++ b/languages/ko.lang @@ -305,6 +305,7 @@ $PALANG['pViewlog_pagination'] = '로그 페이지'; $PALANG['pViewlog_data'] = '데이터'; $PALANG['pViewlog_action_add_totp_exception'] = 'TOTP 예외 추가'; +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'TOTP 예외 삭제'; $PALANG['pViewlog_action_create_domain'] = '도메인 생성'; $PALANG['pViewlog_action_delete_domain'] = '도메인 삭제'; diff --git a/languages/lt.lang b/languages/lt.lang index 631b2b6f..8c7f798d 100644 --- a/languages/lt.lang +++ b/languages/lt.lang @@ -542,6 +542,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Password cannot be empty'; # XXX $PALANG['pAppPassAdd_result_error'] = 'Could not add application password'; # XXX $PALANG['MFA_submit'] = 'Confirm login'; # XXX $PALANG['pViewlog_action_add_totp_exception'] = 'Add TOTP exception'; # XXX +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Delete TOTP exception'; # XXX $PALANG['pViewlog_action_add_app_password'] = 'Add application password'; # XXX $PALANG['mailbox_postapppassword_failed'] = 'The mailbox postapppassword script failed, check the error log for details!'; # XXX diff --git a/languages/mk.lang b/languages/mk.lang index 296b7d46..bd855256 100644 --- a/languages/mk.lang +++ b/languages/mk.lang @@ -537,6 +537,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Password cannot be empty'; # XXX $PALANG['pAppPassAdd_result_error'] = 'Could not add application password'; # XXX $PALANG['MFA_submit'] = 'Confirm login'; # XXX $PALANG['pViewlog_action_add_totp_exception'] = 'Add TOTP exception'; # XXX +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Delete TOTP exception'; # XXX $PALANG['pViewlog_action_add_app_password'] = 'Add application password'; # XXX $PALANG['mailbox_postapppassword_failed'] = 'The mailbox postapppassword script failed, check the error log for details!'; # XXX diff --git a/languages/nb.lang b/languages/nb.lang index d27b1c85..404e051c 100644 --- a/languages/nb.lang +++ b/languages/nb.lang @@ -537,6 +537,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Password cannot be empty'; # XXX $PALANG['pAppPassAdd_result_error'] = 'Could not add application password'; # XXX $PALANG['MFA_submit'] = 'Confirm login'; # XXX $PALANG['pViewlog_action_add_totp_exception'] = 'Add TOTP exception'; # XXX +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Delete TOTP exception'; # XXX $PALANG['pViewlog_action_add_app_password'] = 'Add application password'; # XXX $PALANG['mailbox_postapppassword_failed'] = 'The mailbox postapppassword script failed, check the error log for details!'; # XXX diff --git a/languages/nl.lang b/languages/nl.lang index a2a1d87c..083bf1cb 100644 --- a/languages/nl.lang +++ b/languages/nl.lang @@ -539,6 +539,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Het wachtwoord kan niet leeg zijn'; $PALANG['pAppPassAdd_result_error'] = 'Kon geen toepassing toevoegen'; $PALANG['MFA_submit'] = 'Bevestig de login'; $PALANG['pViewlog_action_add_totp_exception'] = 'Vertaling:'; +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Verwijder ToTP uitzondering'; $PALANG['pViewlog_action_add_app_password'] = 'Voeg een wachtwoord toe.'; $PALANG['mailbox_postapppassword_failed'] = 'De postpassword script faalde, controleerde de foutenlog voor details.'; diff --git a/languages/nn.lang b/languages/nn.lang index e688afe3..ebb31a86 100644 --- a/languages/nn.lang +++ b/languages/nn.lang @@ -536,6 +536,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Password cannot be empty'; # XXX $PALANG['pAppPassAdd_result_error'] = 'Could not add application password'; # XXX $PALANG['MFA_submit'] = 'Confirm login'; # XXX $PALANG['pViewlog_action_add_totp_exception'] = 'Add TOTP exception'; # XXX +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Delete TOTP exception'; # XXX $PALANG['pViewlog_action_add_app_password'] = 'Add application password'; # XXX $PALANG['mailbox_postapppassword_failed'] = 'The mailbox postapppassword script failed, check the error log for details!'; # XXX diff --git a/languages/pl.lang b/languages/pl.lang index 1c7862d2..c33b81af 100644 --- a/languages/pl.lang +++ b/languages/pl.lang @@ -542,6 +542,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Nie może być pusty'; $PALANG['pAppPassAdd_result_error'] = 'Could not add the name password'; $PALANG['MFA_submit'] = 'Confirm login'; $PALANG['pViewlog_action_add_totp_exception'] = 'Wyjątek TOTP'; +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Wyjątek TOTP'; $PALANG['pViewlog_action_add_app_password'] = 'Adddupacja'; $PALANG['mailbox_postapppassword_failed'] = 'Scenariusz pocztówki nie powiódł się, sprawdzając błąd w detalach.'; diff --git a/languages/pt-br.lang b/languages/pt-br.lang index db21b2a3..2e956de2 100644 --- a/languages/pt-br.lang +++ b/languages/pt-br.lang @@ -549,6 +549,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'A senha não pode estar vazia'; $PALANG['pAppPassAdd_result_error'] = 'Não poderia adicionar senha de aplicação'; $PALANG['MFA_submit'] = 'Confirme login'; $PALANG['pViewlog_action_add_totp_exception'] = 'Adicionar exceção TOTP'; +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Excluir exceção TOTP'; $PALANG['pViewlog_action_add_app_password'] = 'Adicionar senha do aplicativo'; $PALANG['mailbox_postapppassword_failed'] = 'O script postapppassword da caixa de correio falhou, verifique o registro de erro para detalhes!'; diff --git a/languages/pt-pt.lang b/languages/pt-pt.lang index e2c51602..d2192da8 100644 --- a/languages/pt-pt.lang +++ b/languages/pt-pt.lang @@ -549,6 +549,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'A senha não pode estar vazia'; $PALANG['pAppPassAdd_result_error'] = 'Não poderia adicionar senha de aplicação'; $PALANG['MFA_submit'] = 'Confirme login'; $PALANG['pViewlog_action_add_totp_exception'] = 'Adicionar exceção TOTP'; +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Excluir exceção TOTP'; $PALANG['pViewlog_action_add_app_password'] = 'Adicionar senha do aplicativo'; $PALANG['mailbox_postapppassword_failed'] = 'O script postapppassword da caixa de correio falhou, verifique o registro de erro para detalhes!'; diff --git a/languages/ro.lang b/languages/ro.lang index 7513fe11..d6f08e23 100644 --- a/languages/ro.lang +++ b/languages/ro.lang @@ -548,6 +548,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Password cannot be empty'; # XXX $PALANG['pAppPassAdd_result_error'] = 'Could not add application password'; # XXX $PALANG['MFA_submit'] = 'Confirm login'; # XXX $PALANG['pViewlog_action_add_totp_exception'] = 'Add TOTP exception'; # XXX +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Delete TOTP exception'; # XXX $PALANG['pViewlog_action_add_app_password'] = 'Add application password'; # XXX $PALANG['mailbox_postapppassword_failed'] = 'The mailbox postapppassword script failed, check the error log for details!'; # XXX diff --git a/languages/ru.lang b/languages/ru.lang index 48f71c24..346ad476 100644 --- a/languages/ru.lang +++ b/languages/ru.lang @@ -550,6 +550,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Пароль не может быть $PALANG['pAppPassAdd_result_error'] = 'Невозможно добавить пароль приложения'; $PALANG['MFA_submit'] = 'Подтверждение входа'; $PALANG['pViewlog_action_add_totp_exception'] = 'Добавить исключение TOTP'; +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Исключить исключение ТОТП'; $PALANG['pViewlog_action_add_app_password'] = 'Добавить пароль приложения'; $PALANG['mailbox_postapppassword_failed'] = 'Почтовый почтовый ящик не удалось, проверьте журнал ошибок для деталей!'; diff --git a/languages/sk.lang b/languages/sk.lang index 2658bc35..f56da701 100644 --- a/languages/sk.lang +++ b/languages/sk.lang @@ -537,6 +537,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Heslo nemôže byť prázdne'; $PALANG['pAppPassAdd_result_error'] = 'Nemožno pridať aplikačné heslo'; $PALANG['MFA_submit'] = 'Potvrdiť prihlásenie'; $PALANG['pViewlog_action_add_totp_exception'] = 'Pridať TOTP výnimku'; +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Odstrániť TOTP výnimku'; $PALANG['pViewlog_action_add_app_password'] = 'Pridať aplikačné heslo'; $PALANG['mailbox_postapppassword_failed'] = 'Mail postapppassword skript zlyhal, skontrolujte chybový protokol pre detaily!'; diff --git a/languages/sl.lang b/languages/sl.lang index 3e75d814..d9c09c1e 100644 --- a/languages/sl.lang +++ b/languages/sl.lang @@ -536,6 +536,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Password cannot be empty'; # XXX $PALANG['pAppPassAdd_result_error'] = 'Could not add application password'; # XXX $PALANG['MFA_submit'] = 'Confirm login'; # XXX $PALANG['pViewlog_action_add_totp_exception'] = 'Add TOTP exception'; # XXX +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Delete TOTP exception'; # XXX $PALANG['pViewlog_action_add_app_password'] = 'Add application password'; # XXX $PALANG['mailbox_postapppassword_failed'] = 'The mailbox postapppassword script failed, check the error log for details!'; # XXX diff --git a/languages/sv.lang b/languages/sv.lang index 5f4e56d3..bd104744 100644 --- a/languages/sv.lang +++ b/languages/sv.lang @@ -549,6 +549,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Lösenord kan inte vara tomt'; $PALANG['pAppPassAdd_result_error'] = 'Kunde inte lägga till applikationslösenord'; $PALANG['MFA_submit'] = 'Bekräfta inloggning'; $PALANG['pViewlog_action_add_totp_exception'] = 'Lägg till TOTP undantag'; +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Ta bort TOTP undantag'; $PALANG['pViewlog_action_add_app_password'] = 'Lägg till applikationslösenord'; $PALANG['mailbox_postapppassword_failed'] = 'Postappsword-skriptet misslyckades, kontrollera felloggen för detaljer!'; diff --git a/languages/tr.lang b/languages/tr.lang index e08af56d..2785815b 100644 --- a/languages/tr.lang +++ b/languages/tr.lang @@ -536,6 +536,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Şifre boş olamaz'; $PALANG['pAppPassAdd_result_error'] = 'Uygulama şifresini ekleyebilir'; $PALANG['MFA_submit'] = 'Onay girişi'; $PALANG['pViewlog_action_add_totp_exception'] = 'TOTP istisna ek'; +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Delete TOTP istisna'; $PALANG['pViewlog_action_add_app_password'] = 'Uygulama parolasını ekleyin'; $PALANG['mailbox_postapppassword_failed'] = 'Posta kutusu postapppassword senaryosu başarısız oldu, ayrıntıları için hata logunu kontrol edin!'; diff --git a/languages/tw.lang b/languages/tw.lang index db31068a..71e6dfc3 100644 --- a/languages/tw.lang +++ b/languages/tw.lang @@ -538,6 +538,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = '口号不能空洞'; $PALANG['pAppPassAdd_result_error'] = '不要增加申请密码'; $PALANG['MFA_submit'] = 'Confirmlogin'; $PALANG['pViewlog_action_add_totp_exception'] = '附 件'; +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = '删除备选案文'; $PALANG['pViewlog_action_add_app_password'] = '附录'; $PALANG['mailbox_postapppassword_failed'] = '邮箱的邮递申请词稿失败,核对错误记录,以供参考!'; diff --git a/languages/ua.lang b/languages/ua.lang index d5cab138..f3feffad 100644 --- a/languages/ua.lang +++ b/languages/ua.lang @@ -551,6 +551,7 @@ $PALANG['pAppPassAdd_pass_empty_error'] = 'Пароль не може бути $PALANG['pAppPassAdd_result_error'] = 'Не додавати пароль заявки'; $PALANG['MFA_submit'] = 'Підтвердити логін'; $PALANG['pViewlog_action_add_totp_exception'] = 'Додати виключення TOTP'; +$PALANG['pViewlog_action_edit_totp_exception'] = 'Edit TOTP exception'; # XXX $PALANG['pViewlog_action_delete_totp_exception'] = 'Виняток TOTP'; $PALANG['pViewlog_action_add_app_password'] = 'Додати пароль'; $PALANG['mailbox_postapppassword_failed'] = 'Скрипт поштових скриньок не вдалося, перевірте журнал помилки для деталей!'; diff --git a/model/AdminHandler.php b/model/AdminHandler.php index f6b6c23d..19792642 100644 --- a/model/AdminHandler.php +++ b/model/AdminHandler.php @@ -196,23 +196,23 @@ class AdminHandler extends PFAHandler if ($row['superadmin']) { $db_result[$key]['domain_count'] = Config::lang('super_admin'); } - } + # Render TOTP action + if (isset($this->struct['totp_action']) && is_string($row['username'])) { - # Render TOTP action - if (isset($this->struct['totp_action']) && is_string($row['username'])) { + $totp = new TotpPf('admin', new Login('admin')); + $has_totp = $totp->usesTOTP($row['username']); - $totp = new TotpPf('admin', new Login('admin')); - $has_totp = $totp->usesTOTP($row['username']); - - if ($has_totp) { - $db_result[$key]['totp_action'] = - ''; - } else { - $db_result[$key]['totp_action'] = - htmlspecialchars(Config::lang('pUsersMenu_no_totp_set'), ENT_QUOTES, 'UTF-8'); + if ($has_totp) { + $db_result[$key]['totp_action'] = + ''; + } else { + $db_result[$key]['totp_action'] = + htmlspecialchars(Config::lang('pUsersMenu_no_totp_set'), ENT_QUOTES, 'UTF-8'); + } } + } return $db_result; diff --git a/model/MailboxHandler.php b/model/MailboxHandler.php index 786c0660..992a20ae 100644 --- a/model/MailboxHandler.php +++ b/model/MailboxHandler.php @@ -260,23 +260,23 @@ class MailboxHandler extends PFAHandler $db_result[$key]['password_expiry'] = $password_expiration_never_label; } } - } + # Render TOTP action + if (isset($this->struct['totp_action']) && is_string($row['username'])) { - # Render TOTP action - if (isset($this->struct['totp_action']) && is_string($row['username'])) { + $totp = new TotpPf('mailbox', new Login('mailbox')); + $has_totp = $totp->usesTOTP($row['username']); - $totp = new TotpPf('mailbox', new Login('mailbox')); - $has_totp = $totp->usesTOTP($row['username']); - - if ($has_totp) { - $db_result[$key]['totp_action'] = - ''; - } else { - $db_result[$key]['totp_action'] = - htmlspecialchars(Config::lang('pUsersMenu_no_totp_set'), ENT_QUOTES, 'UTF-8'); + if ($has_totp) { + $db_result[$key]['totp_action'] = + ''; + } else { + $db_result[$key]['totp_action'] = + htmlspecialchars(Config::lang('pUsersMenu_no_totp_set'), ENT_QUOTES, 'UTF-8'); + } } + } return $db_result; diff --git a/model/PFAHandler.php b/model/PFAHandler.php index 5623b1ba..c2ddeb26 100644 --- a/model/PFAHandler.php +++ b/model/PFAHandler.php @@ -474,6 +474,10 @@ abstract class PFAHandler } } else { # field is editable if (isset($values[$key])) { + if (($row['type'] === 'pass' || $row['type'] === 'b64p') && is_array($values[$key])) { + $this->errormsg[$key] = Config::lang_f('invalid_value_given', $key); + continue; + } if ( ($row['type'] != "pass" && $row['type'] != 'b64p') || # field type is NOT 'pass' or 'b64p' - or - strlen($values[$key]) > 0 || # new value is not empty - or - @@ -710,18 +714,20 @@ abstract class PFAHandler $cols = join(',', $select_cols); $table = table_by_key($this->db_table); - $additional_where = ''; + $restrictions = []; $params = []; if ($this->domain_field != "") { - $additional_where .= " AND " . db_in_clause($this->domain_field, $this->allowed_domains, $params); + $restrictions[] = db_in_clause($this->domain_field, $this->allowed_domains, $params); } # if logged in as user, restrict to the items the user is allowed to see if ((!$this->is_admin) && $this->user_field != '') { - $additional_where .= " AND " . $this->user_field . " = :_user_field "; + $restrictions[] = $this->user_field . " = :_user_field"; $params['_user_field'] = $this->username; } + $additional_where = $restrictions ? ' AND ' . join(' AND ', $restrictions) : ''; + if (is_array($condition)) { if (isset($condition['_']) && count($this->searchfields) > 0) { $simple_search = array(); @@ -735,10 +741,11 @@ abstract class PFAHandler } $where = db_where_clause($condition, $this->struct, $additional_where, $searchmode, $params); } else { - if ($condition == "") { - $condition = '1=1'; + $where_parts = $restrictions; + if ($condition !== '') { + array_unshift($where_parts, "( $condition )"); } - $where = " WHERE ( $condition ) $additional_where"; + $where = $where_parts ? ' WHERE ' . join(' AND ', $where_parts) : ''; } return array( @@ -759,6 +766,9 @@ abstract class PFAHandler { if (is_array($condition)) { $condition = $this->filterSearchCondition($condition); + if ($condition === []) { + $condition = ''; + } } $queryparts = $this->build_select_query($condition, $searchmode); return create_page_browser($this->label_field, $queryparts['from_where_order'], $queryparts['params'] ?? []); @@ -884,6 +894,9 @@ abstract class PFAHandler { if (is_array($condition)) { $real_condition = $this->filterSearchCondition($condition); + if ($real_condition === []) { + $real_condition = ''; + } } else { # warning: no sanity checks are applied if $condition is not an array! $real_condition = $condition; diff --git a/model/PasswordChangeAttempt.php b/model/PasswordChangeAttempt.php index 892eaacc..9ec14c0f 100644 --- a/model/PasswordChangeAttempt.php +++ b/model/PasswordChangeAttempt.php @@ -36,9 +36,7 @@ class PasswordChangeAttempt return ['success' => false, 'errors' => $handler->errormsg]; } - $values = $handler->result; - $values['password'] = $password; - $values['password2'] = $password2; + $values = ['password' => $password, 'password2' => $password2]; if (!($handler->set($values) && $handler->save())) { return ['success' => false, 'errors' => $handler->errormsg]; diff --git a/model/TotpPf.php b/model/TotpPf.php index 498b48cf..09cbc7b8 100644 --- a/model/TotpPf.php +++ b/model/TotpPf.php @@ -296,7 +296,8 @@ class TotpPf list($_, $domain) = explode('@', $username); - if (!$this->login->login($username, $password)) { + $handler = new TotpexceptionHandler(1, $username, (int) ($this->table === 'admin')); + if (!$handler->checkCurrentPassword($password, $this->login)) { throw new \Exception(Config::Lang('pPassword_password_current_text_error')); } diff --git a/model/TotpexceptionHandler.php b/model/TotpexceptionHandler.php index 800f388d..11c330d5 100644 --- a/model/TotpexceptionHandler.php +++ b/model/TotpexceptionHandler.php @@ -26,17 +26,20 @@ class TotpexceptionHandler extends PFAHandler */ protected function no_domain_field() { - $this->allowed_domains = []; + $this->allowed_domains = $this->is_admin && $this->admin_username !== '' + ? list_domains_for_admin($this->admin_username) : []; } /** @return void */ protected function initStruct() { + $is_admin = $this->is_admin; $this->struct = array( # field name allow display in... type $PALANG label $PALANG description default / options / ... # editing? form list - 'id' => self::pacol(0, 0, 1, 'num', 'pFetchmail_field_id', '', '', array(), 1), - 'username' => self::pacol(1, 1, 1, 'text', 'pTotp_exceptions_user', ''), + 'password_current' => self::pacol(1, 1, 0, 'pass', 'pPassword_password_current', '', '', array(), 1, 1), + 'id' => self::pacol(0, 0, 1, 'num', 'pFetchmail_field_id', '', '', array(), 0, 1), + 'username' => self::pacol($is_admin, $is_admin, 1, 'text', 'pTotp_exceptions_user', ''), 'ip' => self::pacol(1, 1, 1, 'text', 'pTotp_exceptions_address', ''), 'description' => self::pacol(1, 1, 1, 'text', 'pTotp_exceptions_description', ''), ); @@ -70,14 +73,58 @@ class TotpexceptionHandler extends PFAHandler 'required_role' => 'admin', 'listview' => 'totp-exceptions.php', 'early_init' => 0, - # deliberately no 'user_hardcoded_field' - users must not be able to use edit.php/list.php/delete.php - # for this handler, as that would bypass the current password check in users/totp-exceptions.php - # creating/editing via edit.php is disabled for everyone (incl. admins) for the same reason - - # totp-exceptions.php requires the current password before adding an exception. - 'disable_edit_form' => 1, + 'user_hardcoded_field' => 'username', ); } + /** + * Verify the acting account, never the exception's target account. + * TotpPf supplies its existing Login instance to preserve its authentication context. + */ + public function checkCurrentPassword(string $password, ?Login $login = null): bool + { + if ($this->is_admin) { + $username = $this->admin_username; + $table = 'admin'; + } else { + $username = $this->username; + $table = 'mailbox'; + } + if ($username !== '' && $password !== '') { + if ($login === null) { + $login = new Login($table); + } + if ($login->login($username, $password)) { + return true; + } + } + $this->errormsg['password_current'] = Config::lang('pPassword_password_current_text_error'); + return false; + } + + protected function setmore(array $values) + { + // Check every update, including omitted passwords that the base handler skips. + $password = $values['password_current'] ?? ''; + if (!is_string($password)) { + $password = ''; + } + $this->checkCurrentPassword($password); + if (!$this->is_admin) { + $this->values['username'] = $this->username; + } + unset($this->values['password_current'], $this->RAWvalues['password_current']); + } + + protected function _inp_pass($field, $val) + { + // An existing password must not be checked against new-password rules. + if ($field === 'password_current') { + return true; + } + return parent::_inp_pass($field, $val); + } + /** @return bool */ protected function validate_new_id() { @@ -118,6 +165,12 @@ class TotpexceptionHandler extends PFAHandler */ protected function _validate_username(string $field, string $value): bool { + // Users can only set exceptions for themselves + if (!$this->is_admin) { + $this->values['username'] = $this->username; + return false; # to avoid that set() overwrites $this->values[$field] with the raw (attacker-controlled) input + } + // Normalize empty string to NULL for global exceptions if ($value === '') { if ($this->is_superadmin) { @@ -128,17 +181,16 @@ class TotpexceptionHandler extends PFAHandler return false; } - // Users can only set exceptions for themselves - if (!$this->is_admin) { - $this->values['username'] = $this->username; - return false; # to avoid that set() overwrites $this->values[$field] with the raw (attacker-controlled) input - } - // Superadmins can set for anyone if ($this->is_superadmin) { return true; } + // Match TotpPf::addException(): an administrator may exempt their own login. + if ($value === $this->admin_username) { + return true; + } + // Admins can set for users/domains they manage if (strpos($value, '@')) { list($_, $exception_domain) = explode('@', $value); diff --git a/public/users/password-change.php b/public/users/password-change.php index 6147d3c7..d588410d 100644 --- a/public/users/password-change.php +++ b/public/users/password-change.php @@ -76,6 +76,10 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { $result = PasswordChangeAttempt::run($handler, $totppf, $tUsername, $tCode, safepost('fTOTP_code'), $fPassword, $fPassword2); + foreach ($result['errors'] as $msg) { + flash_error($msg); + } + if ($result['success']) { // only reachable once the new password has actually been validated and // persisted, and the recovery code invalidated - see security report on @@ -84,10 +88,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { flash_info(Config::lang_f('pPassword_result_success', $tUsername)); header('Location: main.php'); exit(0); - } else { - foreach ($result['errors'] as $msg) { - flash_error($msg); - } } } } diff --git a/public/users/totp-exceptions.php b/public/users/totp-exceptions.php index c6d10923..f7143897 100644 --- a/public/users/totp-exceptions.php +++ b/public/users/totp-exceptions.php @@ -71,7 +71,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") { $fPass = $_POST['fPassword_current']; $fIp = $_POST['fIp']; $fDesc = $_POST['fDesc']; - $fUser = $_POST['fUser']; + $fUser = $admin === 0 ? $username : safepost('fUser'); try { if ($totppf->addException($username, $fPass, $fIp, $fUser, $fDesc)) { diff --git a/templates/totp-exceptions.tpl b/templates/totp-exceptions.tpl index ee4802cd..62bf1fd4 100644 --- a/templates/totp-exceptions.tpl +++ b/templates/totp-exceptions.tpl @@ -10,10 +10,12 @@
-