jenkins-bot has submitted this change and it was merged. Change subject: Remove $purpose parameter from password validity check ......................................................................
Remove $purpose parameter from password validity check This was added in I56b6600 in an attempt to work around a bug in CentralAuth, but the bug has since been fixed in a better way. No hook functions in Gerrit use the parameter (or ever have, as far as I can tell), and anything that was passing a value other than the default 'login' has since been removed. So let's just get rid of it instead of keeping it around doing nothing. Change-Id: Ie604e03d268706221161ac93eb866f477e466fb4 --- M docs/hooks.txt M includes/password/UserPasswordPolicy.php M includes/user/User.php 3 files changed, 11 insertions(+), 19 deletions(-) Approvals: Aaron Schulz: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/hooks.txt b/docs/hooks.txt index a73d50f..da12d8c 100644 --- a/docs/hooks.txt +++ b/docs/hooks.txt @@ -2554,8 +2554,6 @@ 'PasswordPoliciesForUser': Alter the effective password policy for a user. $user: User object whose policy you are modifying &$effectivePolicy: Array of policy statements that apply to this user -$purpose: string indicating purpose of the check, one of 'login', 'create', - or 'reset' 'PerformRetroactiveAutoblock': Called before a retroactive autoblock is applied to a user. diff --git a/includes/password/UserPasswordPolicy.php b/includes/password/UserPasswordPolicy.php index 5584f6f..bf1f8ac 100644 --- a/includes/password/UserPasswordPolicy.php +++ b/includes/password/UserPasswordPolicy.php @@ -67,12 +67,11 @@ * Check if a passwords meets the effective password policy for a User. * @param User $user who's policy we are checking * @param string $password the password to check - * @param string $purpose one of 'login', 'create', 'reset' * @return Status error to indicate the password didn't meet the policy, or fatal to * indicate the user shouldn't be allowed to login. */ - public function checkUserPassword( User $user, $password, $purpose = 'login' ) { - $effectivePolicy = $this->getPoliciesForUser( $user, $purpose ); + public function checkUserPassword( User $user, $password ) { + $effectivePolicy = $this->getPoliciesForUser( $user ); return $this->checkPolicies( $user, $password, @@ -134,20 +133,16 @@ * Get the policy for a user, based on their group membership. Public so * UI elements can access and inform the user. * @param User $user - * @param string $purpose one of 'login', 'create', 'reset' * @return array the effective policy for $user */ - public function getPoliciesForUser( User $user, $purpose = 'login' ) { - $effectivePolicy = $this->policies['default']; - if ( $purpose !== 'create' ) { - $effectivePolicy = self::getPoliciesForGroups( - $this->policies, - $user->getEffectiveGroups(), - $this->policies['default'] - ); - } + public function getPoliciesForUser( User $user ) { + $effectivePolicy = self::getPoliciesForGroups( + $this->policies, + $user->getEffectiveGroups(), + $this->policies['default'] + ); - Hooks::run( 'PasswordPoliciesForUser', [ $user, &$effectivePolicy, $purpose ] ); + Hooks::run( 'PasswordPoliciesForUser', [ $user, &$effectivePolicy ] ); return $effectivePolicy; } diff --git a/includes/user/User.php b/includes/user/User.php index f07db0e..26f1040 100644 --- a/includes/user/User.php +++ b/includes/user/User.php @@ -1003,11 +1003,10 @@ * able to set their password to this. * * @param string $password Desired password - * @param string $purpose one of 'login', 'create', 'reset' * @return Status * @since 1.23 */ - public function checkPasswordValidity( $password, $purpose = 'login' ) { + public function checkPasswordValidity( $password ) { global $wgPasswordPolicy; $upp = new UserPasswordPolicy( @@ -1024,7 +1023,7 @@ } if ( $result === false ) { - $status->merge( $upp->checkUserPassword( $this, $password, $purpose ) ); + $status->merge( $upp->checkUserPassword( $this, $password ) ); return $status; } elseif ( $result === true ) { return $status; -- To view, visit https://gerrit.wikimedia.org/r/324834 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie604e03d268706221161ac93eb866f477e466fb4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Anomie <bjor...@wikimedia.org> Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org> Gerrit-Reviewer: CSteipp <cste...@wikimedia.org> Gerrit-Reviewer: Gergő Tisza <gti...@wikimedia.org> Gerrit-Reviewer: Parent5446 <tylerro...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits