[MediaWiki-commits] [Gerrit] Bug54847.php: Replace removed CentralAuthUser::getPasswordHash - change (operations/mediawiki-config)

2015-01-10 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Bug54847.php: Replace removed CentralAuthUser::getPasswordHash
..


Bug54847.php: Replace removed CentralAuthUser::getPasswordHash

Needed after I642884f93673

Change-Id: I35454073a08cb46cfe37386fee491f3fdc35df69
---
M wmf-config/Bug54847.php
1 file changed, 1 insertion(+), 3 deletions(-)

Approvals:
  Hoo man: Looks good to me, approved
  Reedy: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/wmf-config/Bug54847.php b/wmf-config/Bug54847.php
index 6b056db..4d3aea3 100644
--- a/wmf-config/Bug54847.php
+++ b/wmf-config/Bug54847.php
@@ -158,9 +158,7 @@
try {
if ( $isGlobal ) {
$centralUser = CentralAuthUser::getInstance( $user );
-   list( $salt, $crypt ) = $centralUser->getPasswordHash();
-   //if ( $centralUser->matchHash( $newpassword, $salt, 
$crypt ) ) {
-   if ( User::comparePasswords( $crypt, $newpassword, 
$salt ) ) {
+   if ( $centralUser->getPasswordObject()->equals( 
$newpassword ) ) {
wfDebugLog( "Bug54847", "User attempted to 
reset with CentralAuth password: " . $user->getName() );
$errorMsg = 'password-recycled';
return false;

-- 
To view, visit https://gerrit.wikimedia.org/r/184135
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I35454073a08cb46cfe37386fee491f3fdc35df69
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hoo man 
Gerrit-Reviewer: CSteipp 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Bug54847.php: Replace removed CentralAuthUser::getPasswordHash - change (operations/mediawiki-config)

2015-01-10 Thread Hoo man (Code Review) 
Hoo man has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/184135

Change subject: Bug54847.php: Replace removed CentralAuthUser::getPasswordHash
..

Bug54847.php: Replace removed CentralAuthUser::getPasswordHash

Needed after I642884f93673

Change-Id: I35454073a08cb46cfe37386fee491f3fdc35df69
---
M wmf-config/Bug54847.php
1 file changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/35/184135/1

diff --git a/wmf-config/Bug54847.php b/wmf-config/Bug54847.php
index 6b056db..4d3aea3 100644
--- a/wmf-config/Bug54847.php
+++ b/wmf-config/Bug54847.php
@@ -158,9 +158,7 @@
try {
if ( $isGlobal ) {
$centralUser = CentralAuthUser::getInstance( $user );
-   list( $salt, $crypt ) = $centralUser->getPasswordHash();
-   //if ( $centralUser->matchHash( $newpassword, $salt, 
$crypt ) ) {
-   if ( User::comparePasswords( $crypt, $newpassword, 
$salt ) ) {
+   if ( $centralUser->getPasswordObject()->equals( 
$newpassword ) ) {
wfDebugLog( "Bug54847", "User attempted to 
reset with CentralAuth password: " . $user->getName() );
$errorMsg = 'password-recycled';
return false;

-- 
To view, visit https://gerrit.wikimedia.org/r/184135
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I35454073a08cb46cfe37386fee491f3fdc35df69
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hoo man 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits