mirror of
https://github.com/postfixadmin/postfixadmin.git
synced 2026-11-20 23:43:26 +03:00
Fix mailbox-user TOTP navigation and overlapping header (#1194)
Mailbox users now go to users/totp-exceptions.php for TOTP Excemptions. Fix navigation bar / logo overlapping. thanks @TrapoSAMA
This commit is contained in:
1 parent
748e3ea121
commit
f3ffeae493
4 files changed
+104
-57
No files matched your search
@@ -8,6 +8,7 @@
|
||||
|
||||
Changes in 'master' (not in a release yet) (20XX/XX/XX)
|
||||
--------------------------
|
||||
- Restore mailbox-user TOTP exception links and use the shared navigation header without overlapping logos.
|
||||
- Enforce managed-domain authorization for administrator TOTP self-exceptions, including partial edits.
|
||||
- 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.
|
||||
|
||||
+1
-1
@@ -43,7 +43,7 @@ url_user_vacation = vacation.php
|
||||
url_user_password = password.php
|
||||
url_user_edit_name = ../edit.php?table=mailboxname
|
||||
url_user_totp = totp.php
|
||||
url_user_totp_exceptions = ../list.php?table=totpexception
|
||||
url_user_totp_exceptions = totp-exceptions.php
|
||||
url_user_logout = login.php
|
||||
|
||||
|
||||
|
||||
+40
-56
@@ -1,57 +1,41 @@
|
||||
<nav class="navbar navbar-expand-lg fixed-top">
|
||||
<div class="container-fluid">
|
||||
{*** <a class="navbar-brand" href='main.php'><img id="login_header_logo" src="{$CONF.theme_logo}" alt="Logo" /></a> ***}
|
||||
<a class="navbar-brand" href="{#url_user_main#}"><img id="login_header_logo"
|
||||
src="../images/postbox.png"
|
||||
alt="Logo"/></a>
|
||||
<button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#navbar"
|
||||
aria-expanded="false" aria-controls="navbar">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
<div id="navbar" class="collapse navbar-collapse">
|
||||
<ul class="nav navbar-nav">
|
||||
<li><a class="nav-item nav-link" target="_top" href="{#url_user_main#}">{$PALANG.pMenu_main}</a></li>
|
||||
{if $CONF.vacation===YES}
|
||||
<li><a class="nav-item nav-link" target="_top" href="{#url_user_vacation#}">{$PALANG.pUsersMenu_vacation}</a></li>
|
||||
{/if}
|
||||
{if $CONF.edit_alias===YES}
|
||||
<li><a class="nav-item nav-link" target="_top" href="{#url_user_edit_alias#}&edit={$smarty.session.sessid.username|escape:url}">{$PALANG.pUsersMenu_edit_alias}</a></li>
|
||||
{/if}
|
||||
{if $user_can_edit_mailbox_name}
|
||||
<li><a class="nav-item nav-link" href="{#url_user_edit_name#}&edit={$smarty.session.sessid.username|escape:url}">{$PALANG.pUsersMenu_edit_name}</a></li>
|
||||
{/if}
|
||||
{* TOTP *}
|
||||
{if $CONF.totp==='YES'}
|
||||
{strip}
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link dropdown-toggle" href="#" data-bs-toggle="dropdown" role="button" aria-haspopup="true"
|
||||
aria-expanded="false" >{$PALANG.pMenu_security} <span
|
||||
class="caret"></span></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a class="nav-item dropdown-item" href="password.php"><span class="nav-item bi bi-lock" aria-hidden="true"></span> {$PALANG.change_password}</a></li>
|
||||
<li><a class="nav-item dropdown-item" href="{#url_totp#}"><span class="nav-item bi bi-lock" aria-hidden="true"></span> {$PALANG.pUsersMenu_totp}</a></li>
|
||||
<li><a class="nav-item dropdown-item" href="{#url_user_totp_exceptions#}"><span class="nav-item bi bi-lock" aria-hidden="true"></span> {$PALANG.pMenu_totp_exceptions}</a></li>
|
||||
{if $CONF.app_passwords==='YES'}
|
||||
<li><a class="nav-item dropdown-item" href="{#url_app_passwords#}"><span class="nav-item bi bi-lock" aria-hidden="true"></span> {$PALANG.pMenu_app_passwords}</a></li>
|
||||
{/if}
|
||||
</ul>
|
||||
</li>
|
||||
{/strip}
|
||||
{else}
|
||||
{* password *}
|
||||
<li><a class="nav-link" target="_top" href="{#url_user_password#}">{$PALANG.change_password}</a></li>
|
||||
{/if}
|
||||
<button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent"
|
||||
aria-expanded="false" aria-controls="navbarSupportedContent" aria-label="Toggle navigation">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
<div id="navbarSupportedContent" class="collapse navbar-collapse">
|
||||
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
|
||||
<li><a class="nav-item nav-link" target="_top" href="{#url_user_main#}">{$PALANG.pMenu_main}</a></li>
|
||||
{if $CONF.vacation===YES}
|
||||
<li><a class="nav-item nav-link" target="_top" href="{#url_user_vacation#}">{$PALANG.pUsersMenu_vacation}</a></li>
|
||||
{/if}
|
||||
{if $CONF.edit_alias===YES}
|
||||
<li><a class="nav-item nav-link" target="_top" href="{#url_user_edit_alias#}&edit={$smarty.session.sessid.username|escape:url}">{$PALANG.pUsersMenu_edit_alias}</a></li>
|
||||
{/if}
|
||||
{if $user_can_edit_mailbox_name}
|
||||
<li><a class="nav-item nav-link" href="{#url_user_edit_name#}&edit={$smarty.session.sessid.username|escape:url}">{$PALANG.pUsersMenu_edit_name}</a></li>
|
||||
{/if}
|
||||
{* TOTP *}
|
||||
{if $CONF.totp==='YES'}
|
||||
{strip}
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link dropdown-toggle" href="#" data-bs-toggle="dropdown" role="button" aria-haspopup="true"
|
||||
aria-expanded="false" >{$PALANG.pMenu_security} <span
|
||||
class="caret"></span></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a class="nav-item dropdown-item" href="password.php"><span class="nav-item bi bi-lock" aria-hidden="true"></span> {$PALANG.change_password}</a></li>
|
||||
<li><a class="nav-item dropdown-item" href="{#url_totp#}"><span class="nav-item bi bi-lock" aria-hidden="true"></span> {$PALANG.pUsersMenu_totp}</a></li>
|
||||
<li><a class="nav-item dropdown-item" href="{#url_user_totp_exceptions#}"><span class="nav-item bi bi-lock" aria-hidden="true"></span> {$PALANG.pMenu_totp_exceptions}</a></li>
|
||||
{if $CONF.app_passwords==='YES'}
|
||||
<li><a class="nav-item dropdown-item" href="{#url_app_passwords#}"><span class="nav-item bi bi-lock" aria-hidden="true"></span> {$PALANG.pMenu_app_passwords}</a></li>
|
||||
{/if}
|
||||
</ul>
|
||||
</li>
|
||||
{/strip}
|
||||
{else}
|
||||
{* password *}
|
||||
<li><a class="nav-link" target="_top" href="{#url_user_password#}">{$PALANG.change_password}</a></li>
|
||||
{/if}
|
||||
|
||||
<li class="logout"><a class="nav-link" target="_top" href="{#url_user_logout#}">{$PALANG.pMenu_logout}</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- darkmode switch -->
|
||||
<div class="col-2">
|
||||
<div class="form-check form-switch">
|
||||
<input class="form-check-input" role="switch" type="checkbox" id="darkModeSwitch" checked>
|
||||
<label class="form-check-label" for="darkModeSwitch">Dark Mode</label>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
<li class="logout"><a class="nav-link" target="_top" href="{#url_user_logout#}">{$PALANG.pMenu_logout}</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
@@ -0,0 +1,62 @@
|
||||
<?php
|
||||
|
||||
class MailboxNavigationTemplateTest extends \PHPUnit\Framework\TestCase
|
||||
{
|
||||
public function testMailboxNavigationUsesOneHeaderAndThePasswordProtectedExceptionPage(): void
|
||||
{
|
||||
global $CONF;
|
||||
|
||||
if (!defined('YES')) {
|
||||
define('YES', 'YES');
|
||||
}
|
||||
$session = $_SESSION ?? [];
|
||||
$host = $_SERVER['HTTP_HOST'] ?? null;
|
||||
$_SERVER['HTTP_HOST'] = 'localhost';
|
||||
$_SESSION = ['sessid' => ['username' => 'user@example.com']];
|
||||
try {
|
||||
foreach (['en', 'es'] as $language) {
|
||||
$PALANG = [];
|
||||
require __DIR__ . '/../languages/' . $language . '.lang';
|
||||
$_SESSION['lang'] = $language;
|
||||
foreach (['YES', 'NO'] as $totp) {
|
||||
$smarty = new \Smarty\Smarty();
|
||||
$smarty->setCompileDir(sys_get_temp_dir());
|
||||
$smarty->setTemplateDir(__DIR__ . '/../templates');
|
||||
$smarty->setConfigDir(__DIR__ . '/../configs');
|
||||
$smarty->assign([
|
||||
'CONF' => [
|
||||
'theme_logo' => '../images/corporate-logo.png', 'theme_favicon' => '',
|
||||
'theme_css' => '../css/bootstrap.css', 'theme_custom_css' => '',
|
||||
'vacation' => 'YES', 'edit_alias' => 'YES', 'totp' => $totp,
|
||||
'app_passwords' => 'NO', 'motd_user' => '', 'show_footer_text' => 'NO',
|
||||
],
|
||||
'PALANG' => $PALANG, 'rel_path' => '../', 'version' => 'test',
|
||||
'authentication_has_role' => ['user' => true, 'admin' => false, 'global_admin' => false],
|
||||
'user_can_edit_mailbox_name' => false, 'tummVacationtext' => 'Vacation',
|
||||
'smarty_template' => 'users_main',
|
||||
]);
|
||||
$html = $smarty->fetch('index.tpl');
|
||||
$document = new DOMDocument();
|
||||
@$document->loadHTML($html);
|
||||
$xpath = new DOMXPath($document);
|
||||
self::assertSame(1, $xpath->query('//nav')->length);
|
||||
self::assertSame(1, $xpath->query('//*[@id="login_header_logo"]')->length);
|
||||
self::assertSame('../images/corporate-logo.png', $xpath->query('//*[@id="login_header_logo"]')->item(0)->getAttribute('src'));
|
||||
self::assertSame(1, $xpath->query('//*[@id="darkModeSwitch"]')->length);
|
||||
self::assertSame(1, $xpath->query('//*[@id="navbarSupportedContent"]')->length);
|
||||
self::assertSame(1, $xpath->query('//button[@data-bs-target="#navbarSupportedContent"]')->length);
|
||||
self::assertSame(0, $xpath->query('//nav[contains(@class, "fixed-top")]')->length);
|
||||
self::assertSame($totp === 'YES' ? 2 : 0, $xpath->query('//a[@href="totp-exceptions.php"]')->length);
|
||||
self::assertSame(0, $xpath->query('//a[contains(@href, "table=totpexception")]')->length);
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
$_SESSION = $session;
|
||||
if ($host === null) {
|
||||
unset($_SERVER['HTTP_HOST']);
|
||||
} else {
|
||||
$_SERVER['HTTP_HOST'] = $host;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user