r110401 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r110400‎ | r110401 | r110402 >
Date:16:25, 31 January 2012
Author:reedy
Status:ok
Tags:
Comment:
MFT r107857

Bug 33985 - Setting protocol relative wikilinks (urls) circumvents blacklist
Modified paths:
  • /branches/wmf/1.18wmf1/extensions/SpamBlacklist (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/SpamBlacklist/SpamBlacklist_body.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.18wmf1/extensions/SpamBlacklist/SpamBlacklist_body.php
@@ -376,7 +376,7 @@
377377 //$regex = 'https?://+[a-z0-9_\-.]*(' . implode( '|', $lines ) . ')';
378378 //return '/' . str_replace( '/', '\/', preg_replace('|\\\*/|', '/', $regex) ) . '/Sim';
379379 $regexes = array();
380 - $regexStart = '/https?:\/\/+[a-z0-9_\-.]*(';
 380+ $regexStart = '/(?:https?:)?\/\/+[a-z0-9_\-.]*(';
381381 $regexEnd = ($batchSize > 0 ) ? ')/Sim' : ')/im';
382382 $build = false;
383383 foreach( $lines as $line ) {
Property changes on: branches/wmf/1.18wmf1/extensions/SpamBlacklist
___________________________________________________________________
Added: svn:mergeinfo
384384 Merged /branches/new-installer/phase3/extensions/SpamBlacklist:r43664-66004
385385 Merged /branches/REL1_15/phase3/extensions/SpamBlacklist:r51646
386386 Merged /branches/REL1_18/extensions/SpamBlacklist:r101758,103190
387387 Merged /branches/REL1_17/phase3/extensions/SpamBlacklist:r81445,81448
388388 Merged /trunk/extensions/SpamBlacklist:r95614,99592,99653,100092,100419,100516,100686,100692,100699,103260,103315,103378,103382,103669,104337,104736,104862-104863,104865,104971,105275,105902,105908,107043,107050,107337,107783,107816,107818,107857,108701,108789,109532,109536,109542
389389 Merged /branches/sqlite/extensions/SpamBlacklist:r58211-58321
390390 Merged /trunk/phase3/extensions/SpamBlacklist:r92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,98578,98598,98656

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r107857Match protocol-relative URLs. Patch by Anaconda.tstarling23:58, 2 January 2012

Status & tagging log