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

Use noparams exception and correctly count function parameters

Browse source 
For the counting part I used this a relatively simple approach. It might
not be the best one, but should work without changing too much code. As
for the exception, I added it to every function which takes a single
parameter. Plus a couple of minor fixes: removed an unused function and
replaced "__METHOD__" with function names.

Bug: T198300
Change-Id: I484fe2994292970276150d2e417801453339e540
This commit is contained in:
Daimona Eaytoy 2018-06-27 13:22:52 +02:00
parent 29c7f0f818
commit 32718888c0
3 changed files with 78 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
i18n/en.json
View file

@ -389,7 +389,7 @@
"abusefilter-exception-unclosedstring": "Unclosed string starting at character $1.",
"abusefilter-exception-invalidoperator": "Invalid operator \"$2\" at character $1.",
"abusefilter-exception-unrecognisedtoken": "Unrecognized token \"$2\" at character $1.",
"abusefilter-exception-noparams": "No parameters given to function \"$2\" at character $1.",
"abusefilter-exception-noparams": "No parameters given to function \"$2\" at character $1.\nExpected $3 {{PLURAL:$3|argument|arguments}}.",
"abusefilter-exception-dividebyzero": "Illegal attempt to divide $2 by zero at character $1.",
"abusefilter-exception-unrecognisedvar": "Unrecognized variable $2 at character $1.",
"abusefilter-exception-notenoughargs": "Not enough arguments to function $2 called at character $1.\nExpected $3 {{PLURAL:$3|argument|arguments}}, got $4",

2
i18n/qqq.json
View file

@ -422,7 +422,7 @@
"abusefilter-exception-unclosedstring": "Error message from the abuse filter parser.\nParameters:\n* $1 - Position in the string",
"abusefilter-exception-invalidoperator": "Error message from the abuse filter parser.\nParameters:\n* $1 - Position in the string\n* $2 - Invalid operator",
"abusefilter-exception-unrecognisedtoken": "Error message from the abuse filter parser.\nParameters:\n* $1 - Position in the string\n* $2 - Unrecognized token",
"abusefilter-exception-noparams": "Error message from the abuse filter parser.\nParameters:\n* $1 - Position in the string\n* $2 - Function",
"abusefilter-exception-noparams": "Error message from the abuse filter parser.\nParameters:\n* $1 - Position in the string\n* $2 - Function\n* $3 - the number of expected arguments",
"abusefilter-exception-dividebyzero": "Error message from the abuse filter parser.\nParameters:\n* $1 - Position in the string\n* $2 - AFPData (integer or float?)",
"abusefilter-exception-unrecognisedvar": "Error message from the abuse filter parser. Parameters:\n* $1 - Position in the string\n* $2 - Unrecognized variable",
"abusefilter-exception-notenoughargs": "Error message from the abuse filter parser. Parameters:\n* $1 - position in the string (numeral)\n* $2 - a function name\n* $3 - the number of expected arguments\n* $4 - the number of passed arguments (also supports PLURAL)",

149
includes/parser/AbuseFilterParser.php
View file

@ -724,11 +724,16 @@ class AbuseFilterParser {
}
$args = [];
do {
$r = new AFPData();
$this->doLevelSemicolon( $r );
$args[] = $r;
} while ( $this->mCur->type == AFPToken::TCOMMA );
$state = $this->getState();
$this->move();
if ( $this->mCur->type != AFPToken::TBRACE || $this->mCur->value != ')' ) {
$this->setState( $state );
do {
$r = new AFPData();
$this->doLevelSemicolon( $r );
$args[] = $r;
} while ( $this->mCur->type == AFPToken::TCOMMA );
}
if ( $this->mCur->type != AFPToken::TBRACE || $this->mCur->value != ')' ) {
throw new AFPUserVisibleException( 'expectednotfound',
@ -899,11 +904,11 @@ class AbuseFilterParser {
*/
protected function funcLc( $args ) {
global $wgContLang;
if ( count( $args ) < 1 ) {
if ( count( $args ) === 0 ) {
throw new AFPUserVisibleException(
'notenoughargs',
'noparams',
$this->mCur->pos,
[ 'lc', 2, count( $args ) ]
[ 'lc', 1 ]
);
}
$s = $args[0]->toString();
@ -918,11 +923,11 @@ class AbuseFilterParser {
*/
protected function funcUc( $args ) {
global $wgContLang;
if ( count( $args ) < 1 ) {
if ( count( $args ) === 0 ) {
throw new AFPUserVisibleException(
'notenoughargs',
'noparams',
$this->mCur->pos,
[ 'uc', 2, count( $args ) ]
[ 'uc', 1 ]
);
}
$s = $args[0]->toString();
@ -936,11 +941,11 @@ class AbuseFilterParser {
* @throws AFPUserVisibleException
*/
protected function funcLen( $args ) {
if ( count( $args ) < 1 ) {
if ( count( $args ) === 0 ) {
throw new AFPUserVisibleException(
'notenoughargs',
'noparams',
$this->mCur->pos,
[ 'len', 2, count( $args ) ]
[ 'len', 1 ]
);
}
if ( $args[0]->type == AFPData::DARRAY ) {
@ -952,38 +957,17 @@ class AbuseFilterParser {
return new AFPData( AFPData::DINT, mb_strlen( $s, 'utf-8' ) );
}
/**
* @param array $args
* @return AFPData
* @throws AFPUserVisibleException
*/
protected function funcSimpleNorm( $args ) {
if ( count( $args ) < 1 ) {
throw new AFPUserVisibleException(
'notenoughargs',
$this->mCur->pos,
[ 'simplenorm', 2, count( $args ) ]
);
}
$s = $args[0]->toString();
$s = preg_replace( '/[\d\W]+/', '', $s );
$s = strtolower( $s );
return new AFPData( AFPData::DSTRING, $s );
}
/**
* @param array $args
* @return AFPData
* @throws AFPUserVisibleException
*/
protected function funcSpecialRatio( $args ) {
if ( count( $args ) < 1 ) {
if ( count( $args ) === 0 ) {
throw new AFPUserVisibleException(
'notenoughargs',
'noparams',
$this->mCur->pos,
[ 'specialratio', 1, count( $args ) ]
[ 'specialratio', 1 ]
);
}
$s = $args[0]->toString();
@ -1005,11 +989,11 @@ class AbuseFilterParser {
* @throws AFPUserVisibleException
*/
protected function funcCount( $args ) {
if ( count( $args ) < 1 ) {
if ( count( $args ) === 0 ) {
throw new AFPUserVisibleException(
'notenoughargs',
'noparams',
$this->mCur->pos,
[ 'count', 1, count( $args ) ]
[ 'count', 1 ]
);
}
@ -1041,11 +1025,11 @@ class AbuseFilterParser {
* @throws Exception
*/
protected function funcRCount( $args ) {
if ( count( $args ) < 1 ) {
if ( count( $args ) === 0 ) {
throw new AFPUserVisibleException(
'notenoughargs',
'noparams',
$this->mCur->pos,
[ 'rcount', 1, count( $args ) ]
[ 'rcount', 1 ]
);
}
@ -1166,11 +1150,11 @@ class AbuseFilterParser {
* @throws AFPUserVisibleException
*/
protected function funcCCNorm( $args ) {
if ( count( $args ) < 1 ) {
if ( count( $args ) === 0 ) {
throw new AFPUserVisibleException(
'notenoughargs',
'noparams',
$this->mCur->pos,
[ 'ccnorm', 1, count( $args ) ]
[ 'ccnorm', 1 ]
);
}
$s = $args[0]->toString();
@ -1187,11 +1171,11 @@ class AbuseFilterParser {
* @throws AFPUserVisibleException
*/
protected function funcSanitize( $args ) {
if ( count( $args ) < 1 ) {
if ( count( $args ) === 0 ) {
throw new AFPUserVisibleException(
'notenoughargs',
'noparams',
$this->mCur->pos,
[ 'sanitize', 1, count( $args ) ]
[ 'sanitize', 1 ]
);
}
$s = $args[0]->toString();
@ -1424,11 +1408,11 @@ class AbuseFilterParser {
* @throws AFPUserVisibleException
*/
protected function funcRMSpecials( $args ) {
if ( count( $args ) < 1 ) {
if ( count( $args ) === 0 ) {
throw new AFPUserVisibleException(
'notenoughargs',
'noparams',
$this->mCur->pos,
[ 'rmspecials', 1, count( $args ) ]
[ 'rmspecials', 1 ]
);
}
$s = $args[0]->toString();
@ -1444,11 +1428,11 @@ class AbuseFilterParser {
* @throws AFPUserVisibleException
*/
protected function funcRMWhitespace( $args ) {
if ( count( $args ) < 1 ) {
if ( count( $args ) === 0 ) {
throw new AFPUserVisibleException(
'notenoughargs',
'noparams',
$this->mCur->pos,
[ 'rmwhitespace', 1, count( $args ) ]
[ 'rmwhitespace', 1 ]
);
}
$s = $args[0]->toString();
@ -1464,11 +1448,11 @@ class AbuseFilterParser {
* @throws AFPUserVisibleException
*/
protected function funcRMDoubles( $args ) {
if ( count( $args ) < 1 ) {
if ( count( $args ) === 0 ) {
throw new AFPUserVisibleException(
'notenoughargs',
'noparams',
$this->mCur->pos,
[ 'rmdoubles', 1, count( $args ) ]
[ 'rmdoubles', 1 ]
);
}
$s = $args[0]->toString();
@ -1484,11 +1468,11 @@ class AbuseFilterParser {
* @throws AFPUserVisibleException
*/
protected function funcNorm( $args ) {
if ( count( $args ) < 1 ) {
if ( count( $args ) === 0 ) {
throw new AFPUserVisibleException(
'notenoughargs',
'noparams',
$this->mCur->pos,
[ 'norm', 1, count( $args ) ]
[ 'norm', 1 ]
);
}
$s = $args[0]->toString();
@ -1593,9 +1577,12 @@ class AbuseFilterParser {
* @throws AFPUserVisibleException
*/
protected function funcStrRegexEscape( $args ) {
if ( count( $args ) < 1 ) {
throw new AFPUserVisibleException( 'notenoughargs', $this->mCur->pos,
[ 'rescape', 1, count( $args ) ] );
if ( count( $args ) === 0 ) {
throw new AFPUserVisibleException(
'noparams',
$this->mCur->pos,
[ 'rescape', 1 ]
);
}
$string = $args[0]->toString();
@ -1633,8 +1620,12 @@ class AbuseFilterParser {
* @throws AFPUserVisibleException
*/
protected function castString( $args ) {
if ( count( $args ) < 1 ) {
throw new AFPUserVisibleException( 'noparams', $this->mCur->pos, [ __METHOD__ ] );
if ( count( $args ) === 0 ) {
throw new AFPUserVisibleException(
'noparams',
$this->mCur->pos,
[ 'string', 1 ]
);
}
$val = $args[0];
@ -1647,8 +1638,12 @@ class AbuseFilterParser {
* @throws AFPUserVisibleException
*/
protected function castInt( $args ) {
if ( count( $args ) < 1 ) {
throw new AFPUserVisibleException( 'noparams', $this->mCur->pos, [ __METHOD__ ] );
if ( count( $args ) === 0 ) {
throw new AFPUserVisibleException(
'noparams',
$this->mCur->pos,
[ 'int', 1 ]
);
}
$val = $args[0];
@ -1661,8 +1656,12 @@ class AbuseFilterParser {
* @throws AFPUserVisibleException
*/
protected function castFloat( $args ) {
if ( count( $args ) < 1 ) {
throw new AFPUserVisibleException( 'noparams', $this->mCur->pos, [ __METHOD__ ] );
if ( count( $args ) === 0 ) {
throw new AFPUserVisibleException(
'noparams',
$this->mCur->pos,
[ 'float', 1 ]
);
}
$val = $args[0];
@ -1675,8 +1674,12 @@ class AbuseFilterParser {
* @throws AFPUserVisibleException
*/
protected function castBool( $args ) {
if ( count( $args ) < 1 ) {
throw new AFPUserVisibleException( 'noparams', $this->mCur->pos, [ __METHOD__ ] );
if ( count( $args ) === 0 ) {
throw new AFPUserVisibleException(
'noparams',
$this->mCur->pos,
[ 'bool', 1 ]
);
}
$val = $args[0];