Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/184136
Change subject: Remove no longer needed hook handlers from Bug54847
......................................................................
Remove no longer needed hook handlers from Bug54847
There are no more active session by users that are
affected by this bug, so no need to check on existing
sessions.
Change-Id: I0eeca1b4f7f7a620944c0b69f2219a7a3c16b291
---
M wmf-config/Bug54847.php
1 file changed, 0 insertions(+), 55 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/36/184136/1
diff --git a/wmf-config/Bug54847.php b/wmf-config/Bug54847.php
index 4d3aea3..ea17e10 100644
--- a/wmf-config/Bug54847.php
+++ b/wmf-config/Bug54847.php
@@ -74,61 +74,6 @@
}
-// Abort existing open sessions for affected users. (But not
-// repeatedly, only once.)
-// Maybe we dont do this and just reset everyone's tokens instead?
-
-$wgHooks['UserLoadAfterLoadFromSession'][] = function ( $user ) {
- if ( efUserIsAffected( $user ) ) {
- $dbw = CentralAuthUser::getCentralDB();
- $dbw->update(
- 'bug_54847_password_resets',
- array( 'r_logged_out' => 1 ),
- array( 'r_username' => $user->getName(),
- 'r_wiki' => wfWikiID()
- ),
- __METHOD__
- );
- $user->logout();
- }
-};
-
-
-$wgHooks['UserLoadFromSession'][] = function ( $user, &$result ) {
-
- $loggedout = false;
- $isGlobal = false;
- if ( efUserIsAffected( $user, $loggedout, $isGlobal ) ) {
- if ( $loggedout ) {
- // Already logged them out
- return true;
- }
-
- wfDebugLog( "Bug54847", "Logging out user " . $user->getName()
);
-
- $dbw = CentralAuthUser::getCentralDB();
-
- $updateWikis = wfWikiID();
- if ( $isGlobal ) {
- $centralUser = CentralAuthUser::getInstance( $user );
- $updateWikis = $centralUser->listAttached();
- }
- $dbw->update(
- 'bug_54847_password_resets',
- array( 'r_logged_out' => 1 ),
- array( 'r_username' => $user->getName(),
- 'r_wiki' => $updateWikis
- ),
- __METHOD__
- );
-
- $user->logout();
- $result = false;
- return false;
- }
- return true;
-};
-
$wgHooks[ 'AbortLogin' ][] = function ( User $user, $password, &$retval, &$msg
) {
global $wgOut, $egBug54847;
if ( empty( $egBug54847 ) && $user->checkPassword( $password ) &&
efUserIsAffected( $user ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/184136
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0eeca1b4f7f7a620944c0b69f2219a7a3c16b291
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hoo man <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
