Browse Source
Revert "Adapt PHP custom patches to 14.0.4 code"
Revert "Adapt PHP custom patches to 14.0.4 code"
This reverts commit 846d2f3dc8.
pull/162/head
2 changed files with 37 additions and 85 deletions
-
54sources/patches_last_version/app-00-add-logout_url-conf.patch
-
10sources/patches_last_version/app-01-disable-CSPv3-nonce_and_allow-YNH-fonts.patch
@ -1,62 +1,14 @@ |
|||||
core/Controller/LoginController.php | 25 ++++++++++++++----------- |
|
||||
1 file changed, 14 insertions(+), 11 deletions(-) |
|
||||
|
|
||||
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
|
|
||||
index 182d2bc106..82523e306e 100644
|
|
||||
--- a/core/Controller/LoginController.php
|
--- a/core/Controller/LoginController.php
|
||||
+++ b/core/Controller/LoginController.php
|
+++ b/core/Controller/LoginController.php
|
||||
@@ -95,13 +95,13 @@ class LoginController extends Controller {
|
|
||||
* @param Throttler $throttler |
|
||||
*/ |
|
||||
public function __construct($appName, |
|
||||
- IRequest $request,
|
|
||||
- IUserManager $userManager,
|
|
||||
- IConfig $config,
|
|
||||
- ISession $session,
|
|
||||
- IUserSession $userSession,
|
|
||||
- IURLGenerator $urlGenerator,
|
|
||||
- ILogger $logger,
|
|
||||
+ IRequest $request,
|
|
||||
+ IUserManager $userManager,
|
|
||||
+ IConfig $config,
|
|
||||
+ ISession $session,
|
|
||||
+ IUserSession $userSession,
|
|
||||
+ IURLGenerator $urlGenerator,
|
|
||||
+ ILogger $logger,
|
|
||||
Manager $twoFactorManager, |
|
||||
Defaults $defaults, |
|
||||
Throttler $throttler) { |
|
||||
@@ -130,7 +130,10 @@ class LoginController extends Controller {
|
|
||||
|
@@ -119,7 +119,10 @@
|
||||
} |
} |
||||
$this->userSession->logout(); |
$this->userSession->logout(); |
||||
|
|
||||
- $response = new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
|
- $response = new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
|
||||
+ $redirectUrl = $this->config->getSystemValue('logout_url',
|
+ $redirectUrl = $this->config->getSystemValue('logout_url',
|
||||
+ $this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm')
|
|
||||
|
+ $this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm')
|
||||
+ );
|
+ );
|
||||
+ $response = new RedirectResponse($redirectUrl);
|
+ $response = new RedirectResponse($redirectUrl);
|
||||
$response->addHeader('Clear-Site-Data', '"cache", "storage", "executionContexts"'); |
|
||||
|
$response->addHeader('Clear-Site-Data', '"cache", "cookies", "storage", "executionContexts"'); |
||||
return $response; |
return $response; |
||||
} |
} |
||||
@@ -303,10 +306,10 @@ class LoginController extends Controller {
|
|
||||
$previousUser = $user; |
|
||||
$user = $users[0]->getUID(); |
|
||||
if($user !== $previousUser) { |
|
||||
- $loginResult = $this->userManager->checkPassword($user, $password);
|
|
||||
- }
|
|
||||
+ $loginResult = $this->userManager->checkPassword($user, $password);
|
|
||||
} |
|
||||
} |
|
||||
+ }
|
|
||||
|
|
||||
if ($loginResult === false) { |
|
||||
$this->logger->warning('Login failed: \''. $user . |
|
||||
@@ -314,7 +317,7 @@ class LoginController extends Controller {
|
|
||||
['app' => 'core']); |
|
||||
return $this->createLoginFailedResponse($user, $originalUser, |
|
||||
$redirect_url, self::LOGIN_MSG_INVALIDPASSWORD); |
|
||||
- }
|
|
||||
+ }
|
|
||||
|
|
||||
// TODO: remove password checks from above and let the user session handle failures |
|
||||
// requires https://github.com/owncloud/core/pull/24616 |
|
||||
Write
Preview
Loading…
Cancel
Save
Reference in new issue