upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-01 23:25:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 32

Merge pull request #59014 from nextcloud/backport/59006/stable33

Browse source 
[stable33] fix: Add missing Attribute and fix parameter type in renewpassword route
This commit is contained in:
Côme Chilliet 2026-03-19 11:35:23 +01:00 committed by GitHub
commit f1badaf3ea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/user_ldap/lib/Controller/RenewPasswordController.php
View file

@ -8,6 +8,7 @@ namespace OCA\User_LDAP\Controller;
use OCA\User_LDAP\AppInfo\Application;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Attribute\BruteForceProtection;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\Attribute\OpenAPI;
use OCP\AppFramework\Http\Attribute\PublicPage;
@ -84,17 +85,20 @@ class RenewPasswordController extends Controller {
#[PublicPage]
#[UseSession]
public function tryRenewPassword(?string $user, string $oldPassword, ?string $newPassword): RedirectResponse {
if ($user !== null && !$this->userConfig->getValueBool($user, 'user_ldap', 'needsPasswordReset')) {
#[BruteForceProtection(action: 'login')]
public function tryRenewPassword(string $user, string $oldPassword, ?string $newPassword): RedirectResponse {
if (!$this->userConfig->getValueBool($user, 'user_ldap', 'needsPasswordReset')) {
return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
}
$args = !is_null($user) ? ['user' => $user] : [];
$args = ['user' => $user];
$loginResult = $this->userManager->checkPassword($user, $oldPassword);
if ($loginResult === false) {
$this->session->set('renewPasswordMessages', [
['invalidpassword'], []
]);
return new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
$response = new RedirectResponse($this->urlGenerator->linkToRoute('user_ldap.renewPassword.showRenewPasswordForm', $args));
$response->throttle(['user' => $user]);
return $response;
}
try {