wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-11-27 15:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Pass a valid regexp to preg_match in checkRegexMatchesEmpty"

Browse source
This commit is contained in:
jenkins-bot 2021-06-04 09:11:50 +00:00 committed by Gerrit Code Review
parent 997e665530 57f11631ba
commit 52024847e8
2 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
includes/Parser/AbuseFilterCachingParser.php
View file

@ -921,13 +921,11 @@ class AbuseFilterCachingParser extends AFPTransitionBase {
$needle = $args[0]->toString();
$haystack = $args[1]->toString();
// Munge the regex
$needle = preg_replace( '!(\\\\\\\\)*(\\\\)?/!', '$1\/', $needle );
$needle = "/$needle/u";
$needle = $this->mungeRegexp( $needle );
// Suppress and restore needed per T177744
AtEase::suppressWarnings();
$this->checkRegexMatchesEmpty( $args[0] );
$this->checkRegexMatchesEmpty( $args[0], $needle );
$count = preg_match_all( $needle, $haystack );
AtEase::restoreWarnings();
@ -969,13 +967,11 @@ class AbuseFilterCachingParser extends AFPTransitionBase {
$groupscount = substr_count( $sanitized, '(' ) + 1;
$falsy = array_fill( 0, $groupscount, false );
// Munge the regex by escaping slashes
$needle = preg_replace( '!(\\\\\\\\)*(\\\\)?/!', '$1\/', $needle );
$needle = "/$needle/u";
$needle = $this->mungeRegexp( $needle );
// Suppress and restore are here for the same reason as T177744
AtEase::suppressWarnings();
$this->checkRegexMatchesEmpty( $args[0] );
$this->checkRegexMatchesEmpty( $args[0], $needle );
$check = preg_match( $needle, $haystack, $matches );
AtEase::restoreWarnings();
@ -1382,15 +1378,14 @@ class AbuseFilterCachingParser extends AFPTransitionBase {
$str = $str->toString();
$pattern = $regex->toString();
$pattern = preg_replace( '!(\\\\\\\\)*(\\\\)?/!', '$1\/', $pattern );
$pattern = "/$pattern/u";
$pattern = $this->mungeRegexp( $pattern );
if ( $insensitive ) {
$pattern .= 'i';
}
AtEase::suppressWarnings();
$this->checkRegexMatchesEmpty( $regex );
$this->checkRegexMatchesEmpty( $regex, $pattern );
$result = preg_match( $pattern, $str );
AtEase::restoreWarnings();
if ( $result === false ) {
@ -1492,19 +1487,32 @@ class AbuseFilterCachingParser extends AFPTransitionBase {
}
}
/**
* Given a regexp in the AF syntax, make it PCRE-compliant (i.e. we need to escape slashes, add
* delimiters and modifiers).
*
* @param string $rawRegexp
* @return string
*/
private function mungeRegexp( string $rawRegexp ) : string {
$needle = preg_replace( '!(\\\\\\\\)*(\\\\)?/!', '$1\/', $rawRegexp );
return "/$needle/u";
}
/**
* Check whether the provided regex matches the empty string.
* @note This method can generate a PHP notice if the regex is invalid
*
* @param AFPData $regex
* @param AFPData $regex TODO Can we avoid passing this in?
* @param string $pattern Already munged
*/
protected function checkRegexMatchesEmpty( AFPData $regex ) : void {
protected function checkRegexMatchesEmpty( AFPData $regex, string $pattern ) : void {
if ( $regex->getType() === AFPData::DUNDEFINED ) {
// We can't tell, and toString() would return the empty string (T273809)
return;
}
// @phan-suppress-next-line PhanParamSuspiciousOrder
if ( preg_match( $regex->toString(), '' ) === 1 ) {
if ( preg_match( $pattern, '' ) === 1 ) {
$this->warnings[] = new UserVisibleWarning(
'match-empty-regex',
$this->mCur->pos,

1
includes/Variables/LazyVariableComputer.php
View file

@ -386,7 +386,6 @@ class LazyVariableComputer {
}
}
// @phan-suppress-next-line SecurityCheck-ReDoS Legit, but that's the intention
return $result instanceof AFPData ? $result : AFPData::newFromPHPVar( $result );
}