jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/364182 )
Change subject: Revert "Fix handling of password hash upgrade on login"
......................................................................
Revert "Fix handling of password hash upgrade on login"
This reverts commit 604ac627882e6e89a143aab7d4fc86910f5d9555.
Change-Id: I77452790d54e837b89943097e0d3a88b9237525a
---
M includes/CentralAuthUser.php
1 file changed, 1 insertion(+), 10 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/CentralAuthUser.php b/includes/CentralAuthUser.php
index 903138d..a85c1dd 100644
--- a/includes/CentralAuthUser.php
+++ b/includes/CentralAuthUser.php
@@ -1903,12 +1903,7 @@
$centralUser =
CentralAuthUser::newMasterInstanceFromId( $this->getId() );
if ( $centralUser ) {
- // Don't bother resetting the
auth token for a hash
- // upgrade. It's not really a
password *change*, and
- // since this is being done
post-send it'll cause the
- // user to be logged out when
they just tried to log in
- // since it can't update the
just-sent session cookies.
- $centralUser->setPassword(
$password, false );
+ $centralUser->setPassword(
$password );
$centralUser->saveSettings();
}
} );
@@ -2542,10 +2537,6 @@
*/
function setPassword( $password, $resetAuthToken = true ) {
$this->checkWriteMode();
-
- // Make sure state is loaded before updating ->mPassword
- $this->loadState();
-
list( $salt, $hash ) = $this->saltedPassword( $password );
$this->mPassword = $hash;
--
To view, visit https://gerrit.wikimedia.org/r/364182
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I77452790d54e837b89943097e0d3a88b9237525a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: wmf/1.30.0-wmf.7
Gerrit-Owner: Addshore <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
