Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LinkFilter::makeIndexes: Don't explode if the 'host' key is missing for news://

Browse source 
Bug: T347574
Change-Id: Idc6b389da974a70bdee9b1d49e4b5c45ccdd0d73
This commit is contained in:
James D. Forrester 2023-09-28 09:19:06 -04:00
parent a985465024
commit ec1b572362
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
includes/ExternalLinks/LinkFilter.php
View file

@ -193,7 +193,10 @@ class LinkFilter {
// while we want to match the email's domain or news server the same way we are
// matching hosts for other URLs.
if ( in_array( $bits['scheme'], [ 'mailto', 'news' ] ) ) {
$bits['host'] = $bits['path'];
// (T347574) Only set host if it's not already set (if // is used)
if ( array_key_exists( 'path', $bits ) ) {
$bits['host'] = $bits['path'];
}
$bits['path'] = '';
}

5
tests/phpunit/includes/ExternalLinks/LinkFilterTest.php
View file

@ -114,6 +114,11 @@ class LinkFilterTest extends MediaWikiLangTestCase {
'news:4df8kh$iagfewewf(at)newsbf02aaa.news.aol.com' ],
[ '', 'news:*.aol.com',
'news:4df8kh$iagfewewf(at)newsbf02aaa.news.aol.com' ],
// (T347574) Only set host if it's not already set (if // is used)
[ 'news:', 'comp.compression', 'news://comp.compression' ],
[ 'news:', 'comp.compression', 'news:comp.compression' ],
[ '', 'git://github.com/prwef/abc-def.git', 'git://github.com/prwef/abc-def.git' ],
[ 'git://', 'github.com/', 'git://github.com/prwef/abc-def.git' ],
[ 'git://', '*.github.com/', 'git://a.b.c.d.e.f.github.com/prwef/abc-def.git' ],