Page MenuHomePhabricator
Create Task
Maniphest T255491

Replace usages of Whitelist/Blacklist in UrlShortener
Closed, ResolvedPublic
Actions

Description

Some few usages in method name and documentation, and then config variable

  • Method name and documentation
  • Config variable

Details

Related Changes in Gerrit:
SubjectRepoBranchLines +/-
UrlShortener: Remove config renaming hackmediawiki/extensions/UrlShortenerwmf/1.35.0-wmf.41+17 -61
Labs: Switch $wgUrlShortenerDomainsWhitelist --> $wgUrlShortenerAllowedDomainsoperations/mediawiki-configmaster+1 -2
Switch $wgUrlShortenerDomainsWhitelist --> $wgUrlShortenerAllowedDomainsoperations/mediawiki-configmaster+1 -5
labs: Rename $wgUrlShortenerDomainsWhitelist to $wgUrlShortenerAllowedDomainsoperations/mediawiki-configmaster+1 -0
UrlShortener: Remove config renaming hackmediawiki/extensions/UrlShortenermaster+17 -61
Add wgUrlShortenerAllowedDomains config variable.mediawiki/extensions/UrlShortenermaster+28 -8
Use 'AllowedDomains' instead of 'whitelist'mediawiki/extensions/UrlShortenermaster+17 -19
Customize query in gerrit

Related Objects
Search...

StatusSubtypeAssignedTask
 ResolvedNoneT254646 Reconsidering how we name things
 ResolvedAmmarpadT255491 Replace usages of Whitelist/Blacklist in UrlShortener

Event Timeline

Ammarpad created this task.Jun 15 2020, 8:52 PM
Restricted Application added a subscriber: Aklapper. · View Herald TranscriptJun 15 2020, 8:52 PM
Ammarpad added a parent task: T254646: Reconsidering how we name things.Jun 15 2020, 8:53 PM
Ammarpad added a project: MediaWiki-extensions-UrlShortener.
Ammarpad removed a subscriber: MediaWiki-extensions-UrlShortener.
gerritbot added a comment.Jun 15 2020, 9:11 PM

Change 605667 had a related patch set uploaded (by Ammarpad; owner: Ammarpad):
[mediawiki/extensions/UrlShortener@master] Use 'AllowedDomains' instead of 'whitelist'

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

gerritbot added a project: Patch-For-Review.Jun 15 2020, 9:11 PM
Ammarpad claimed this task.Jun 15 2020, 9:30 PM
gerritbot added a comment.Jun 15 2020, 10:43 PM

Change 605667 merged by jenkins-bot:
[mediawiki/extensions/UrlShortener@master] Use 'AllowedDomains' instead of 'whitelist'

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

ReleaseTaggerBot added a project: MW-1.35-notes (1.35.0-wmf.37; 2020-06-16).Jun 15 2020, 11:00 PM
Maintenance_bot removed a project: Patch-For-Review.Jun 15 2020, 11:10 PM
Ammarpad triaged this task as Medium priority.Jun 15 2020, 11:27 PM
Ammarpad updated the task description. (Show Details)
gerritbot added a comment.Jul 5 2020, 12:20 PM

Change 609572 had a related patch set uploaded (by Ammarpad; owner: Ammarpad):
[mediawiki/extensions/UrlShortener@master] Add wgUrlShortenerAllowedDomains config variable.

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

gerritbot added a project: Patch-For-Review.Jul 5 2020, 12:20 PM
gerritbot added a comment.Jul 10 2020, 8:18 PM

Change 609572 merged by jenkins-bot:
[mediawiki/extensions/UrlShortener@master] Add wgUrlShortenerAllowedDomains config variable.

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

ReleaseTaggerBot edited projects, added MW-1.35-notes (1.35.0-wmf.41; 2020-07-14); removed MW-1.35-notes (1.35.0-wmf.37; 2020-06-16).Jul 10 2020, 9:00 PM
Maintenance_bot removed a project: Patch-For-Review.Jul 10 2020, 9:10 PM
Jdforrester-WMF mentioned this in T258056: PHP Warning: array_map(): Argument #2 should be an array.Jul 15 2020, 1:36 PM
Ammarpad mentioned this in T258134: UrlShortener is shortening URLs from all domains.Jul 16 2020, 7:49 AM
gerritbot added a comment.Jul 17 2020, 7:08 PM

Change 613682 had a related patch set uploaded (by Ammarpad; owner: Ammarpad):
[operations/mediawiki-config@master] Switch $wgUrlShortenerDomainsWhitelist -> $wgUrlShortenerAllowedDomains

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

gerritbot added a project: Patch-For-Review.Jul 17 2020, 7:08 PM
Ladsgroup subscribed.Jul 20 2020, 12:31 PM

The config is merged. Shall we drop the code?

gerritbot added a comment.Jul 20 2020, 12:32 PM

Change 614735 had a related patch set uploaded (by Ammarpad; owner: Ammarpad):
[operations/mediawiki-config@master] Switch $wgUrlShortenerDomainsWhitelist --> $wgUrlShortenerAllowedDomains

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

Ammarpad added a comment.EditedJul 20 2020, 12:37 PM
In T255491#6318887, @Ladsgroup wrote:

The config is merged. Shall we drop the code?

Yes, but that's a kind of intermediary step. (See code review comments). We need to wait for the final switch (above patch).

Ladsgroup added a comment.Jul 20 2020, 1:07 PM
In T255491#6318918, @Ammarpad wrote:
In T255491#6318887, @Ladsgroup wrote:

The config is merged. Shall we drop the code?

Yes, but that's a kind of intermediary step. (See code review comments). We need to wait for the final switch (above patch).

I understand but my point is to avoid having another incident, let's remove the intermediary code and then flip the switch in production. If you're confident such incident doesn't happen again, it's fine the other way around.

gerritbot added a comment.Jul 20 2020, 1:40 PM

Change 614748 had a related patch set uploaded (by Ammarpad; owner: Ammarpad):
[mediawiki/extensions/UrlShortener@master] UrlShortener: Remove config renaming hack

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

gerritbot added a comment.Jul 20 2020, 2:41 PM

Change 614757 had a related patch set uploaded (by Ladsgroup; owner: Ladsgroup):
[operations/mediawiki-config@master] labs: Rename $wgUrlShortenerDomainsWhitelist to $wgUrlShortenerAllowedDomains

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

gerritbot added a comment.Jul 20 2020, 2:46 PM

Change 614757 merged by jenkins-bot:
[operations/mediawiki-config@master] labs: Rename $wgUrlShortenerDomainsWhitelist to $wgUrlShortenerAllowedDomains

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

gerritbot added a comment.Jul 20 2020, 2:55 PM

Change 614748 merged by jenkins-bot:
[mediawiki/extensions/UrlShortener@master] UrlShortener: Remove config renaming hack

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

ReleaseTaggerBot added a project: MW-1.36-notes (1.36.0-wmf.1; 2020-07-21).Jul 20 2020, 3:00 PM
Ladsgroup added a comment.Jul 20 2020, 3:04 PM

Tested it on beta cluster and it seems it works fine https://en.wikipedia.beta.wmflabs.org/wiki/Special:UrlShortener

Ammarpad closed this task as Resolved.Jul 20 2020, 3:58 PM
In T255491#6319599, @Ladsgroup wrote:

Tested it on beta cluster and it seems it works fine https://en.wikipedia.beta.wmflabs.org/wiki/Special:UrlShortener

It works for me too. I believe we can close this. Thanks for fixing the Beta that I missed.

gerritbot added a comment.Jul 20 2020, 5:15 PM

Change 614772 had a related patch set uploaded (by Ammarpad; owner: Ammarpad):
[mediawiki/extensions/UrlShortener@wmf/1.35.0-wmf.41] UrlShortener: Remove config renaming hack

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

Ammarpad updated the task description. (Show Details)Jul 20 2020, 5:18 PM
gerritbot added a comment.Jul 20 2020, 6:29 PM

Change 614735 merged by jenkins-bot:
[operations/mediawiki-config@master] Switch $wgUrlShortenerDomainsWhitelist --> $wgUrlShortenerAllowedDomains

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

gerritbot added a comment.Jul 20 2020, 6:32 PM

Change 614825 had a related patch set uploaded (by Ammarpad; owner: Ammarpad):
[operations/mediawiki-config@master] Labs: Switch $wgUrlShortenerDomainsWhitelist --> $wgUrlShortenerAllowedDomains

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

gerritbot added a comment.Jul 20 2020, 6:37 PM

Change 614825 merged by jenkins-bot:
[operations/mediawiki-config@master] Labs: Switch $wgUrlShortenerDomainsWhitelist --> $wgUrlShortenerAllowedDomains

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

Stashbot added a comment.Jul 20 2020, 6:37 PM

Mentioned in SAL (#wikimedia-operations) [2020-07-20T18:37:13Z] <urbanecm@deploy1001> Synchronized wmf-config/CommonSettings.php: df2584f181f08da0e1191f97e619e912e587b48d: Switch $wgUrlShortenerDomainsWhitelist --> $wgUrlShortenerAllowedDomains (T255491) (duration: 00m 57s)

gerritbot added a comment.Jul 21 2020, 9:34 PM

Change 614772 abandoned by Ammarpad:
[mediawiki/extensions/UrlShortener@wmf/1.35.0-wmf.41] UrlShortener: Remove config renaming hack

Reason:

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

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 · Credits