a04feff9a7
Any `\OCP\Authentication\IApacheBackend` previously had to implement `getLogoutAttribute` which returns a string.
This string is directly injected into the logout `<a>` tag, so returning something like `href="foo"` would result
in `<a href="foo">`.
This is rather error prone and also in Nextcloud 12 broken as the logout entry has been moved with
054e161eb5 inside the navigation manager where one cannot simply inject attributes.
Thus this feature is broken in Nextcloud 12 which effectively leads to the bug described at nextcloud/user_saml#112,
people cannot logout anymore when using SAML using SLO. Basically in case of SAML you have a SLO url which redirects
you to the IdP and properly logs you out there as well.
Instead of monkey patching the Navigation manager I decided to instead change `\OCP\Authentication\IApacheBackend` to
use `\OCP\Authentication\IApacheBackend::getLogoutUrl` instead where it can return a string with the appropriate logout
URL. Since this functionality is only prominently used in the SAML plugin. Any custom app would need a small change but
I'm not aware of any and there's simply no way to fix this properly otherwise.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
32 lines
1.2 KiB
PHP
32 lines
1.2 KiB
PHP
<div class="warning">
|
|
<h2 class="two-factor-header"><?php p($l->t('Two-factor authentication')) ?></h2>
|
|
<p><?php p($l->t('Enhanced security is enabled for your account. Please authenticate using a second factor.')) ?></p>
|
|
<p>
|
|
<ul>
|
|
<?php foreach ($_['providers'] as $provider): ?>
|
|
<li>
|
|
<a class="button two-factor-provider"
|
|
href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
|
|
[
|
|
'challengeProviderId' => $provider->getId(),
|
|
'redirect_url' => $_['redirect_url'],
|
|
]
|
|
)) ?>">
|
|
<?php p($provider->getDescription()) ?>
|
|
</a>
|
|
</li>
|
|
<?php endforeach; ?>
|
|
</ul>
|
|
</p>
|
|
<p class="two-factor-link">
|
|
<a class="button" href="<?php print_unescaped($_['logout_url']); ?>"><?php p($l->t('Cancel log in')) ?></a>
|
|
<?php if (!is_null($_['backupProvider'])): ?>
|
|
<a class="button" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
|
|
[
|
|
'challengeProviderId' => $_['backupProvider']->getId(),
|
|
'redirect_url' => $_['redirect_url'],
|
|
]
|
|
)) ?>"><?php p($l->t('Use backup code')) ?></a>
|
|
<?php endif; ?>
|
|
</p>
|
|
</div>
|