Page MenuHomePhabricator
Create Task
Maniphest T345683

Review of MediaWiki block-related code
Closed, ResolvedPublic
Actions

Description

As we get ready for T194697: Multiblocks — Allow for multiple, simultaneous blocks with different expiration dates., I'm reviewing the includes/block directory and related code, and will link some cleanup commits here.

Details

Show related patches Customize query in gerrit

Related Objects
Search...

Event Timeline

tstarling created this task.Sep 6 2023, 1:14 AM
Restricted Application added a subscriber: Aklapper. · View Herald TranscriptSep 6 2023, 1:14 AM
tstarling moved this task from Ready 🎬 to In Development 💻 on the Community-Tech (CommTech-Kanban) board.Sep 6 2023, 1:14 AM
tstarling updated the task description. (Show Details)
tstarling added a parent task: T194697: Multiblocks — Allow for multiple, simultaneous blocks with different expiration dates..Sep 6 2023, 1:17 AM
Izno subscribed.Sep 6 2023, 2:24 AM
gerritbot added a comment.Sep 6 2023, 3:48 AM

Change 955045 had a related patch set uploaded (by Tim Starling; author: Tim Starling):

[mediawiki/core@master] Blocks documentation review

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

gerritbot added a project: Patch-For-Review.Sep 6 2023, 3:48 AM
gerritbot added a comment.Sep 6 2023, 7:39 PM

Change 955045 merged by jenkins-bot:

[mediawiki/core@master] Blocks documentation review

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

Maintenance_bot removed a project: Patch-For-Review.Sep 6 2023, 8:10 PM
Aklapper added a project: MediaWiki-Blocks.Sep 15 2023, 9:49 AM
gerritbot added a comment.Sep 19 2023, 12:23 AM

Change 958587 had a related patch set uploaded (by Tim Starling; author: Tim Starling):

[mediawiki/core@master] Blocks cleanup

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

gerritbot added a project: Patch-For-Review.Sep 19 2023, 12:23 AM
gerritbot added a comment.Sep 20 2023, 5:43 AM

Change 958587 merged by jenkins-bot:

[mediawiki/core@master] Blocks cleanup

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

ReleaseTaggerBot added a project: MW-1.41-notes (1.41.0-wmf.28; 2023-09-26).Sep 20 2023, 6:00 AM
Maintenance_bot removed a project: Patch-For-Review.Sep 20 2023, 6:10 AM
gerritbot added a comment.Sep 21 2023, 12:16 AM

Change 959365 had a related patch set uploaded (by Tim Starling; author: Tim Starling):

[mediawiki/core@master] Add Block::toArray()

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

gerritbot added a project: Patch-For-Review.Sep 21 2023, 12:16 AM
gerritbot added a comment.Sep 21 2023, 1:49 AM

Change 959369 had a related patch set uploaded (by Tim Starling; author: Tim Starling):

[mediawiki/core@master] Remove deprecated User properties mOptions, mBlock, mBlockedby and mHideName

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

gerritbot added a comment.Sep 21 2023, 2:36 AM

Change 959376 had a related patch set uploaded (by Tim Starling; author: Tim Starling):

[mediawiki/core@master] Remove User::CHECK_USER_RIGHTS and User::IGNORE_USER_RIGHTS

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

gerritbot added a comment.Sep 21 2023, 5:29 AM

Change 959369 merged by jenkins-bot:

[mediawiki/core@master] Remove deprecated User properties mOptions, mBlock, mBlockedby and mHideName

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

gerritbot added a comment.Sep 22 2023, 9:02 AM

Change 959365 merged by jenkins-bot:

[mediawiki/core@master] Add Block::toArray()

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

gerritbot added a comment.Sep 25 2023, 9:18 AM

Change 959376 merged by jenkins-bot:

[mediawiki/core@master] Remove User::CHECK_USER_RIGHTS and User::IGNORE_USER_RIGHTS

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

Maintenance_bot removed a project: Patch-For-Review.Sep 25 2023, 9:31 AM
gerritbot added a comment.Oct 10 2023, 12:37 AM

Change 963673 had a related patch set uploaded (by Tim Starling; author: Tim Starling):

[mediawiki/core@master] Add cache to BlockManager

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

gerritbot added a project: Patch-For-Review.Oct 10 2023, 12:37 AM

Change 963674 had a related patch set uploaded (by Tim Starling; author: Tim Starling):

[mediawiki/core@master] Remove Block cache from User

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

gerritbot added a comment.Oct 10 2023, 12:37 AM

Change 963676 had a related patch set uploaded (by Tim Starling; author: Tim Starling):

[mediawiki/core@master] Hard deprecate User::isBlocked(), isBlockedFrom() and isBlockedFromCreateAccount()

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

gerritbot added a comment.Oct 10 2023, 12:37 AM

Change 964609 had a related patch set uploaded (by Tim Starling; author: Tim Starling):

[mediawiki/core@master] Add PermissionManager::$blockManager

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

gerritbot added a comment.Oct 10 2023, 12:37 AM

Change 964610 had a related patch set uploaded (by Tim Starling; author: Tim Starling):

[mediawiki/core@master] Multiblocks preparation in User::getBlock(), PermissionManager and BlockManager

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

gerritbot added a comment.Oct 10 2023, 2:17 AM

Change 964615 had a related patch set uploaded (by Tim Starling; author: Tim Starling):

[mediawiki/extensions/ProofreadPage@master] PageContentHandlerTest: remove assignment to User::$mHideName

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

gerritbot added a comment.Oct 10 2023, 5:59 AM

Change 964646 had a related patch set uploaded (by Tim Starling; author: Tim Starling):

[mediawiki/extensions/CheckUser@master] In SpecialCheckUserTest don't have the test sysop block themselves

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

gerritbot added a comment.Oct 10 2023, 8:48 AM

Change 964646 merged by jenkins-bot:

[mediawiki/extensions/CheckUser@master] In SpecialCheckUserTest don't have the test sysop block themselves

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

ReleaseTaggerBot added a project: MW-1.42-notes (1.42.0-wmf.1; 2023-10-17).Oct 10 2023, 9:00 AM
gerritbot added a comment.Oct 12 2023, 2:11 AM

Change 965269 had a related patch set uploaded (by Tim Starling; author: Tim Starling):

[mediawiki/extensions/WikimediaEvents@master] Stop using deprecated method User::isBlockedFromCreateAccount()

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

gerritbot added a comment.Oct 12 2023, 5:01 AM

Change 964615 merged by jenkins-bot:

[mediawiki/extensions/ProofreadPage@master] PageContentHandlerTest: remove assignment to User::$mHideName

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

gerritbot added a comment.Oct 12 2023, 8:15 PM

Change 963673 merged by jenkins-bot:

[mediawiki/core@master] Add cache to BlockManager

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

gerritbot added a comment.Oct 12 2023, 8:16 PM

Change 963674 merged by jenkins-bot:

[mediawiki/core@master] Remove Block cache from User

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

Krinkle awarded a token.Oct 13 2023, 4:13 AM
gerritbot added a comment.Oct 17 2023, 12:26 AM

Change 966315 had a related patch set uploaded (by Tim Starling; author: Tim Starling):

[mediawiki/core@master] AuthManager: deny auto-creation for globally blocked users

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

gerritbot added a comment.Oct 17 2023, 12:26 AM

Change 966316 had a related patch set uploaded (by Tim Starling; author: Tim Starling):

[mediawiki/extensions/CentralAuth@master] Pass performer parameter to AuthManager::autoCreateUser()

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

gerritbot added a comment.Oct 18 2023, 4:27 AM

Change 966657 had a related patch set uploaded (by Tim Starling; author: Tim Starling):

[mediawiki/core@master] Migrate callers of deprecated method BlockManager::getUserBlock()

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

gerritbot added a comment.Oct 18 2023, 5:45 AM

Change 966797 had a related patch set uploaded (by Tim Starling; author: Tim Starling):

[mediawiki/extensions/Wikibase@master] Update mock for new core method BlockManager::getBlock()

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

gerritbot added a comment.Oct 18 2023, 11:35 PM

Change 964609 merged by jenkins-bot:

[mediawiki/core@master] Add PermissionManager::$blockManager

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

ReleaseTaggerBot edited projects, added MW-1.42-notes (1.42.0-wmf.2; 2023-10-24); removed MW-1.42-notes (1.42.0-wmf.1; 2023-10-17).Oct 19 2023, 1:00 AM
tstarling moved this task from In Development 💻 to Review/Feedback 💬 on the Community-Tech (CommTech-Kanban) board.Oct 19 2023, 11:55 PM
gerritbot added a comment.Oct 20 2023, 7:25 AM

Change 964610 merged by jenkins-bot:

[mediawiki/core@master] Multiblocks preparation in User::getBlock(), PermissionManager and BlockManager

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

gerritbot added a comment.Oct 20 2023, 1:22 PM

Change 966315 merged by jenkins-bot:

[mediawiki/core@master] AuthManager: deny auto-creation for globally blocked users

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

gerritbot added a comment.Oct 20 2023, 2:05 PM

Change 966316 merged by jenkins-bot:

[mediawiki/extensions/CentralAuth@master] Pass performer parameter to AuthManager::autoCreateUser()

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

gerritbot added a comment.Oct 20 2023, 3:14 PM

Change 965269 merged by jenkins-bot:

[mediawiki/extensions/WikimediaEvents@master] Stop using deprecated method User::isBlockedFromCreateAccount()

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

gerritbot added a comment.Oct 20 2023, 3:30 PM

Change 963676 merged by jenkins-bot:

[mediawiki/core@master] Hard deprecate User::isBlocked(), isBlockedFrom() and isBlockedFromCreateAccount()

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

tstarling moved this task from Review/Feedback 💬 to QA 🐛 on the Community-Tech (CommTech-Kanban) board.Oct 24 2023, 2:05 AM
dom_walden subscribed.Oct 25 2023, 10:29 AM
In T345683#9267387, @gerritbot wrote:

Change 964610 merged by jenkins-bot:

[mediawiki/core@master] Multiblocks preparation in User::getBlock(), PermissionManager and BlockManager

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

@tstarling Since this change, when attempting to edit as an IP from an IP that is blocked and ip masking is enabled, the block message is duplicated.

It does not seem to matter if the IP is blocked by a local database block, global block, system block or a combination of any of these. Whatever the block error message is for the particular block, it is duplicated.

I can reproduce this locally and on dewiki beta.

Example:

duplicate_block_error_message.png (602×1 px, 107 KB)

dom_walden mentioned this in T350116: Block messages duplicated for anonymous user with IP Masking enabled.Oct 31 2023, 9:02 AM
In T345683#9279144, @dom_walden wrote:

@tstarling Since this change, when attempting to edit as an IP from an IP that is blocked and ip masking is enabled, the block message is duplicated.

I have raised T350116.

gerritbot added a comment.Oct 31 2023, 4:30 PM

Change 966797 merged by jenkins-bot:

[mediawiki/extensions/Wikibase@master] Avoid mock of deprecated method BlockManager::getUserBlock()

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

gerritbot added a comment.Oct 31 2023, 4:30 PM

Change 966657 merged by jenkins-bot:

[mediawiki/core@master] Migrate callers of deprecated method BlockManager::getUserBlock()

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

Maintenance_bot removed a project: Patch-For-Review.Oct 31 2023, 4:30 PM
ReleaseTaggerBot edited projects, added MW-1.42-notes (1.42.0-wmf.4; 2023-11-07); removed MW-1.42-notes (1.42.0-wmf.2; 2023-10-24).Oct 31 2023, 5:00 PM
Krinkle mentioned this in T350836: OAuth login to wikitech fails when running MediaWiki 1.42.0-wmf.4.Nov 9 2023, 9:08 PM
dom_walden moved this task from QA 🐛 to Done 🏁 on the Community-Tech (CommTech-Kanban) board.Nov 14 2023, 7:34 AM

I think I have done with this for now.

My only observation is that when editing or creating a page or trying to use discussiontools the code of the block message returned by the API is different. Only for anonymous/IP users on a wiki with IP masking enabled. Before it would return blocked. Now it returns blockedtext-tempuser.

In T345683#9268320, @gerritbot wrote:

Change 966315 merged by jenkins-bot:

[mediawiki/core@master] AuthManager: deny auto-creation for globally blocked users

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

I didn't understand this change. I don't see how as a globally blocked IP you could create a temporary account, even before this change.

TheresNoTime closed this task as Resolved.Dec 8 2023, 12:02 PM
Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL