wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-09-24 02:38:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better logging for unset variables

Browse source 
We have many log entries, so we need some more debug data.

Bug: T230256
Change-Id: I0e9638c1ffe537ea6cfd6886ff32ef447fdacc28
This commit is contained in:
Daimona Eaytoy 2019-09-12 13:47:51 +02:00 committed by Krinkle
parent fe395bd96b
commit 5267082c85
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
includes/AbuseFilterVariableHolder.php
View file

@ -105,9 +105,10 @@ class AbuseFilterVariableHolder {
* @param int $flags If self::GET_STRICT is set, this will throw if
* the requested variable is not set. Otherwise it will return a DUNDEFINED AFPData.
* NOTE: For now, it will return DUNDEFINED even with GET_STRICT.
* @param string|null $tempFilter Filter ID, if available; only used for debugging (temporarily)
* @return AFPData
*/
public function getVar( $varName, $flags = self::GET_STRICT ) : AFPData {
public function getVar( $varName, $flags = self::GET_STRICT, $tempFilter = null ) : AFPData {
$varName = strtolower( $varName );
if ( $this->mVarsVersion === 1 && in_array( $varName, AbuseFilter::getDeprecatedVariables() ) ) {
// Variables are stored with old names, but the parser has given us
@ -137,7 +138,14 @@ class AbuseFilterVariableHolder {
} elseif ( !( $flags & self::GET_STRICT ) ) {
return new AFPData( AFPData::DUNDEFINED );
} else {
$this->logger->warning( __METHOD__ . ": requested unset variable $varName in strict mode" );
$this->logger->warning(
__METHOD__ . ": requested unset variable {varname} in strict mode, filter: {filter}",
[
'varname' => $varName,
'trace' => ( new Exception )->getTraceAsString(),
'filter' => $tempFilter ?? 'unavailable'
]
);
// @todo change the line below to throw an exception in a future MW version
return new AFPData( AFPData::DUNDEFINED );
}

2
includes/parser/AbuseFilterParser.php
View file

@ -1162,7 +1162,7 @@ class AbuseFilterParser {
$flags = $this->allowMissingVariables
? AbuseFilterVariableHolder::GET_LAX
: AbuseFilterVariableHolder::GET_STRICT;
return $this->mVariables->getVar( $var, $flags );
return $this->mVariables->getVar( $var, $flags, $this->mFilter );
}
/**