wiki.techinc.nl/includes/debug/MWDebug.php

694 lines
19 KiB
PHP
Raw Normal View History

<?php
/**
* Debug toolbar related code.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* http://www.gnu.org/copyleft/gpl.html
*
* @file
*/
use MediaWiki\Logger\LegacyLogger;
/**
* New debugger system that outputs a toolbar on page view.
*
* By default, most methods do nothing ( self::$enabled = false ). You have
* to explicitly call MWDebug::init() to enabled them.
*
* @since 1.19
*/
class MWDebug {
/**
* Log lines
*
* @var array $log
*/
protected static $log = [];
/**
* Debug messages from wfDebug().
*
* @var array $debug
*/
protected static $debug = [];
/**
* SQL statements of the database queries.
*
* @var array $query
*/
protected static $query = [];
/**
* Is the debugger enabled?
*
* @var bool $enabled
*/
protected static $enabled = false;
/**
* Array of functions that have already been warned, formatted
* function-caller to prevent a buttload of warnings
*
* @var array $deprecationWarnings
*/
protected static $deprecationWarnings = [];
/**
* @var string[] Deprecation filter regexes
*/
protected static $deprecationFilters = [];
/**
* @internal For use by Setup.php only.
*/
public static function setup() {
global $wgDebugToolbar,
$wgUseCdn, $wgUseFileCache, $wgCommandLineMode;
if (
// Easy to forget to falsify $wgDebugToolbar for static caches.
// If file cache or CDN cache is on, just disable this (DWIMD).
$wgUseCdn ||
$wgUseFileCache ||
// Keep MWDebug off on CLI. This prevents MWDebug from eating up
// all the memory for logging SQL queries in maintenance scripts.
$wgCommandLineMode
) {
return;
}
if ( $wgDebugToolbar ) {
self::init();
}
}
/**
* Enabled the debugger and load resource module.
* This is called by Setup.php when $wgDebugToolbar is true.
*
* @since 1.19
*/
public static function init() {
self::$enabled = true;
}
/**
* Disable the debugger.
*
* @since 1.28
*/
public static function deinit() {
self::$enabled = false;
}
/**
* Add ResourceLoader modules to the OutputPage object if debugging is
* enabled.
*
* @since 1.19
* @param OutputPage $out
*/
public static function addModules( OutputPage $out ) {
if ( self::$enabled ) {
$out->addModules( 'mediawiki.debug' );
}
}
/**
* Adds a line to the log
*
* @since 1.19
* @param mixed $str
*/
public static function log( $str ) {
if ( !self::$enabled ) {
return;
}
if ( !is_string( $str ) ) {
$str = print_r( $str, true );
}
self::$log[] = [
'msg' => htmlspecialchars( $str ),
'type' => 'log',
'caller' => wfGetCaller(),
];
}
/**
* Returns internal log array
* @since 1.19
2012-02-09 21:33:27 +00:00
* @return array
*/
public static function getLog() {
return self::$log;
}
/**
* Clears internal log array and deprecation tracking
* @since 1.19
*/
public static function clearLog() {
self::$log = [];
self::$deprecationWarnings = [];
}
/**
* Adds a warning entry to the log
*
* @since 1.19
* @param string $msg
* @param int $callerOffset
* @param int $level A PHP error level. See sendMessage()
* @param string $log 'production' will always trigger a php error, 'auto'
* will trigger an error if $wgDevelopmentWarnings is true, and 'debug'
* will only write to the debug log(s).
*/
public static function warning( $msg, $callerOffset = 1, $level = E_USER_NOTICE, $log = 'auto' ) {
global $wgDevelopmentWarnings;
if ( $log === 'auto' && !$wgDevelopmentWarnings ) {
$log = 'debug';
}
if ( $log === 'debug' ) {
$level = false;
}
$callerDescription = self::getCallerDescription( $callerOffset );
self::sendMessage(
self::formatCallerDescription( $msg, $callerDescription ),
'warning',
$level );
if ( self::$enabled ) {
self::$log[] = [
'msg' => htmlspecialchars( $msg ),
'type' => 'warn',
'caller' => $callerDescription['func'],
];
}
}
/**
* Show a warning that $function is deprecated.
* This will send it to the following locations:
* - Debug toolbar, with one item per function and caller, if $wgDebugToolbar
* is set to true.
* - PHP's error log, with level E_USER_DEPRECATED, if $wgDevelopmentWarnings
* is set to true.
* - MediaWiki's debug log, if $wgDevelopmentWarnings is set to false.
*
* @since 1.19
* @param string $function Function that is deprecated.
* @param string|false $version Version in which the function was deprecated.
* @param string|bool $component Component to which the function belongs.
* If false, it is assumed the function is in MediaWiki core.
* @param int $callerOffset How far up the callstack is the original
* caller. 2 = function that called the function that called
* MWDebug::deprecated() (Added in 1.20).
*/
public static function deprecated( $function, $version = false,
$component = false, $callerOffset = 2
) {
if ( $version ) {
$component = $component ?: 'MediaWiki';
$msg = "Use of $function was deprecated in $component $version.";
} else {
$msg = "Use of $function is deprecated.";
}
self::deprecatedMsg( $msg, $version, $component, $callerOffset + 1 );
}
/**
* Log a deprecation warning with arbitrary message text. A caller
* description will be appended. If the message has already been sent for
* this caller, it won't be sent again.
*
* Although there are component and version parameters, they are not
* automatically appended to the message. The message text should include
* information about when the thing was deprecated.
*
* @since 1.35
*
* @param string $msg The message
* @param string|false $version Version of MediaWiki that the function
* was deprecated in.
* @param string|bool $component Component to which the function belongs.
* If false, it is assumed the function is in MediaWiki core.
* @param int|false $callerOffset How far up the call stack is the original
* caller. 2 = function that called the function that called us. If false,
* the caller description will not be appended.
*/
public static function deprecatedMsg( $msg, $version = false,
$component = false, $callerOffset = 2
) {
if ( $callerOffset === false ) {
$callerFunc = '';
$rawMsg = $msg;
} else {
$callerDescription = self::getCallerDescription( $callerOffset );
$callerFunc = $callerDescription['func'];
$rawMsg = self::formatCallerDescription( $msg, $callerDescription );
}
$sendToLog = true;
// Check to see if there already was a warning about this function
if ( isset( self::$deprecationWarnings[$msg][$callerFunc] ) ) {
return;
} elseif ( isset( self::$deprecationWarnings[$msg] ) ) {
if ( self::$enabled ) {
$sendToLog = false;
} else {
return;
}
}
self::$deprecationWarnings[$msg][$callerFunc] = true;
if ( $version ) {
global $wgDeprecationReleaseLimit;
$component = $component ?: 'MediaWiki';
if ( $wgDeprecationReleaseLimit && $component === 'MediaWiki' ) {
# Strip -* off the end of $version so that branches can use the
# format #.##-branchname to avoid issues if the branch is merged into
# a version of MediaWiki later than what it was branched from
$comparableVersion = preg_replace( '/-.*$/', '', $version );
# If the comparableVersion is larger than our release limit then
# skip the warning message for the deprecation
if ( version_compare( $wgDeprecationReleaseLimit, $comparableVersion, '<' ) ) {
$sendToLog = false;
}
}
}
self::sendRawDeprecated(
$rawMsg,
$sendToLog,
$callerFunc
);
}
/**
* Send a raw deprecation message to the log and the debug toolbar,
* without filtering of duplicate messages. A caller description will
* not be appended.
*
* @param string $msg The complete message including relevant caller information.
* @param bool $sendToLog If true, the message will be sent to the debug
debug: Use native E_USER_DEPRECATED instead of custom channel * Always use trigger_error for deprecation warnings, not just in development. They are still silent from the run-time perspective (not thrown as exceptions). Previously this code path was only called when $wgDevelopmentWarnings is set to true. For most dev environments and for CI, this means nothing much changes given that DevelopmentSettings.php set this to true. * In the code path that handles native PHP warnings, when setting the $file and $line attribution that Logstash/Kibana report as "exception.file" use the same offset as the one that wfDeprecated() has computed from the back trace. This means it no longer (wrongly/uselessly) attributes all deprecation warnings to MWDebug.php. * Trim the message suffix from "Called from <method> in <file>" to just "Called from <method>". This reduces noise and makes the message more stable over multiple MW branches. The stack trace is still there like before. == Before (only with $wgDevelopmentWarnings) == > PHP Deprecated: Use of wfGetScriptUrl was deprecated in MediaWiki 1.35. > [Called from MediaWiki::__construct in /var/mediawiki/includes/MediaWiki.php at line 67] > > Error from line 393 of /var/mediawiki/includes/debug/MWDebug.php > > #0 [internal function]: MWExceptionHandler::handleError() > #1 /var/mediawiki/includes/debug/MWDebug.php(393): trigger_error() > #2 /var/mediawiki/includes/debug/MWDebug.php(297): MWDebug::sendMessage() > #3 /var/mediawiki/includes/debug/MWDebug.php(270): MWDebug::sendRawDeprecated() > #4 /var/mediawiki/includes/GlobalFunctions.php(1032): MWDebug::deprecated() > #5 /var/mediawiki/includes/GlobalFunctions.php(2548): wfDeprecated() > #6 /var/mediawiki/includes/MediaWiki.php(67): wfGetScriptUrl(string) > #7 /var/mediawiki/load.php(50): MediaWiki->__construct() == After (always) == > Use of wfGetScriptUrl was deprecated in MediaWiki 1.35. [Called from MediaWiki::__construct] > > Error from line 67 of /var/mediawiki/includes/MediaWiki.php > > #0 [internal function]: MWExceptionHandler::handleError() > #1 /var/mediawiki/includes/debug/MWDebug.php(293): trigger_error() > #2 /var/mediawiki/includes/debug/MWDebug.php(270): MWDebug::sendRawDeprecated() > #3 /var/mediawiki/includes/GlobalFunctions.php(1038): MWDebug::deprecated() > #4 /var/mediawiki/includes/GlobalFunctions.php(2548): wfDeprecated() > #5 /var/mediawiki/includes/MediaWiki.php(67): wfGetScriptUrl(string) > #6 /var/mediawiki/load.php(50): MediaWiki->__construct() Bug: T252923 Change-Id: I1d4a166b6dff8b0e19fce3fab409f4a89e734ee6
2020-05-28 02:14:07 +00:00
* toolbar, the debug log, and raised as a warning to PHP. If false, the message
* will only be sent to the debug toolbar.
* @param string $callerFunc The caller, for display in the debug toolbar's
* caller column.
*/
public static function sendRawDeprecated( $msg, $sendToLog = true, $callerFunc = '' ) {
foreach ( self::$deprecationFilters as $filter ) {
if ( preg_match( $filter, $msg ) ) {
return;
}
}
if ( $sendToLog ) {
debug: Use native E_USER_DEPRECATED instead of custom channel * Always use trigger_error for deprecation warnings, not just in development. They are still silent from the run-time perspective (not thrown as exceptions). Previously this code path was only called when $wgDevelopmentWarnings is set to true. For most dev environments and for CI, this means nothing much changes given that DevelopmentSettings.php set this to true. * In the code path that handles native PHP warnings, when setting the $file and $line attribution that Logstash/Kibana report as "exception.file" use the same offset as the one that wfDeprecated() has computed from the back trace. This means it no longer (wrongly/uselessly) attributes all deprecation warnings to MWDebug.php. * Trim the message suffix from "Called from <method> in <file>" to just "Called from <method>". This reduces noise and makes the message more stable over multiple MW branches. The stack trace is still there like before. == Before (only with $wgDevelopmentWarnings) == > PHP Deprecated: Use of wfGetScriptUrl was deprecated in MediaWiki 1.35. > [Called from MediaWiki::__construct in /var/mediawiki/includes/MediaWiki.php at line 67] > > Error from line 393 of /var/mediawiki/includes/debug/MWDebug.php > > #0 [internal function]: MWExceptionHandler::handleError() > #1 /var/mediawiki/includes/debug/MWDebug.php(393): trigger_error() > #2 /var/mediawiki/includes/debug/MWDebug.php(297): MWDebug::sendMessage() > #3 /var/mediawiki/includes/debug/MWDebug.php(270): MWDebug::sendRawDeprecated() > #4 /var/mediawiki/includes/GlobalFunctions.php(1032): MWDebug::deprecated() > #5 /var/mediawiki/includes/GlobalFunctions.php(2548): wfDeprecated() > #6 /var/mediawiki/includes/MediaWiki.php(67): wfGetScriptUrl(string) > #7 /var/mediawiki/load.php(50): MediaWiki->__construct() == After (always) == > Use of wfGetScriptUrl was deprecated in MediaWiki 1.35. [Called from MediaWiki::__construct] > > Error from line 67 of /var/mediawiki/includes/MediaWiki.php > > #0 [internal function]: MWExceptionHandler::handleError() > #1 /var/mediawiki/includes/debug/MWDebug.php(293): trigger_error() > #2 /var/mediawiki/includes/debug/MWDebug.php(270): MWDebug::sendRawDeprecated() > #3 /var/mediawiki/includes/GlobalFunctions.php(1038): MWDebug::deprecated() > #4 /var/mediawiki/includes/GlobalFunctions.php(2548): wfDeprecated() > #5 /var/mediawiki/includes/MediaWiki.php(67): wfGetScriptUrl(string) > #6 /var/mediawiki/load.php(50): MediaWiki->__construct() Bug: T252923 Change-Id: I1d4a166b6dff8b0e19fce3fab409f4a89e734ee6
2020-05-28 02:14:07 +00:00
trigger_error( $msg, E_USER_DEPRECATED );
}
if ( self::$enabled ) {
$logMsg = htmlspecialchars( $msg ) .
Html::rawElement( 'div', [ 'class' => 'mw-debug-backtrace' ],
Html::element( 'span', [], 'Backtrace:' ) . wfBacktrace()
);
self::$log[] = [
'msg' => $logMsg,
'type' => 'deprecated',
'caller' => $callerFunc,
];
}
}
/**
* Deprecation messages matching the supplied regex will be suppressed.
* Use this to filter deprecation warnings when testing deprecated code.
*
* @param string $regex
*/
public static function filterDeprecationForTest( $regex ) {
if ( !defined( 'MW_PHPUNIT_TEST' ) && !defined( 'MW_PARSER_TEST' ) ) {
throw new RuntimeException( __METHOD__ . ' can only be used in tests' );
}
self::$deprecationFilters[] = $regex;
}
/**
* Clear all deprecation filters.
*/
public static function clearDeprecationFilters() {
self::$deprecationFilters = [];
}
/**
* Get an array describing the calling function at a specified offset.
*
* @param int $callerOffset How far up the callstack is the original
* caller. 0 = function that called getCallerDescription()
* @return array Array with two keys: 'file' and 'func'
*/
private static function getCallerDescription( $callerOffset ) {
$callers = wfDebugBacktrace();
if ( isset( $callers[$callerOffset] ) ) {
$callerfile = $callers[$callerOffset];
if ( isset( $callerfile['file'] ) && isset( $callerfile['line'] ) ) {
$file = $callerfile['file'] . ' at line ' . $callerfile['line'];
} else {
$file = '(internal function)';
}
} else {
$file = '(unknown location)';
}
if ( isset( $callers[$callerOffset + 1] ) ) {
$callerfunc = $callers[$callerOffset + 1];
$func = '';
if ( isset( $callerfunc['class'] ) ) {
$func .= $callerfunc['class'] . '::';
}
if ( isset( $callerfunc['function'] ) ) {
$func .= $callerfunc['function'];
}
} else {
$func = 'unknown';
}
return [ 'file' => $file, 'func' => $func ];
}
/**
* Append a caller description to an error message
*
* @param string $msg
* @param array $caller Caller description from getCallerDescription()
* @return string
*/
private static function formatCallerDescription( $msg, $caller ) {
debug: Use native E_USER_DEPRECATED instead of custom channel * Always use trigger_error for deprecation warnings, not just in development. They are still silent from the run-time perspective (not thrown as exceptions). Previously this code path was only called when $wgDevelopmentWarnings is set to true. For most dev environments and for CI, this means nothing much changes given that DevelopmentSettings.php set this to true. * In the code path that handles native PHP warnings, when setting the $file and $line attribution that Logstash/Kibana report as "exception.file" use the same offset as the one that wfDeprecated() has computed from the back trace. This means it no longer (wrongly/uselessly) attributes all deprecation warnings to MWDebug.php. * Trim the message suffix from "Called from <method> in <file>" to just "Called from <method>". This reduces noise and makes the message more stable over multiple MW branches. The stack trace is still there like before. == Before (only with $wgDevelopmentWarnings) == > PHP Deprecated: Use of wfGetScriptUrl was deprecated in MediaWiki 1.35. > [Called from MediaWiki::__construct in /var/mediawiki/includes/MediaWiki.php at line 67] > > Error from line 393 of /var/mediawiki/includes/debug/MWDebug.php > > #0 [internal function]: MWExceptionHandler::handleError() > #1 /var/mediawiki/includes/debug/MWDebug.php(393): trigger_error() > #2 /var/mediawiki/includes/debug/MWDebug.php(297): MWDebug::sendMessage() > #3 /var/mediawiki/includes/debug/MWDebug.php(270): MWDebug::sendRawDeprecated() > #4 /var/mediawiki/includes/GlobalFunctions.php(1032): MWDebug::deprecated() > #5 /var/mediawiki/includes/GlobalFunctions.php(2548): wfDeprecated() > #6 /var/mediawiki/includes/MediaWiki.php(67): wfGetScriptUrl(string) > #7 /var/mediawiki/load.php(50): MediaWiki->__construct() == After (always) == > Use of wfGetScriptUrl was deprecated in MediaWiki 1.35. [Called from MediaWiki::__construct] > > Error from line 67 of /var/mediawiki/includes/MediaWiki.php > > #0 [internal function]: MWExceptionHandler::handleError() > #1 /var/mediawiki/includes/debug/MWDebug.php(293): trigger_error() > #2 /var/mediawiki/includes/debug/MWDebug.php(270): MWDebug::sendRawDeprecated() > #3 /var/mediawiki/includes/GlobalFunctions.php(1038): MWDebug::deprecated() > #4 /var/mediawiki/includes/GlobalFunctions.php(2548): wfDeprecated() > #5 /var/mediawiki/includes/MediaWiki.php(67): wfGetScriptUrl(string) > #6 /var/mediawiki/load.php(50): MediaWiki->__construct() Bug: T252923 Change-Id: I1d4a166b6dff8b0e19fce3fab409f4a89e734ee6
2020-05-28 02:14:07 +00:00
// When changing this, update the below parseCallerDescription() method as well.
return $msg . ' [Called from ' . $caller['func'] . ' in ' . $caller['file'] . ']';
}
debug: Use native E_USER_DEPRECATED instead of custom channel * Always use trigger_error for deprecation warnings, not just in development. They are still silent from the run-time perspective (not thrown as exceptions). Previously this code path was only called when $wgDevelopmentWarnings is set to true. For most dev environments and for CI, this means nothing much changes given that DevelopmentSettings.php set this to true. * In the code path that handles native PHP warnings, when setting the $file and $line attribution that Logstash/Kibana report as "exception.file" use the same offset as the one that wfDeprecated() has computed from the back trace. This means it no longer (wrongly/uselessly) attributes all deprecation warnings to MWDebug.php. * Trim the message suffix from "Called from <method> in <file>" to just "Called from <method>". This reduces noise and makes the message more stable over multiple MW branches. The stack trace is still there like before. == Before (only with $wgDevelopmentWarnings) == > PHP Deprecated: Use of wfGetScriptUrl was deprecated in MediaWiki 1.35. > [Called from MediaWiki::__construct in /var/mediawiki/includes/MediaWiki.php at line 67] > > Error from line 393 of /var/mediawiki/includes/debug/MWDebug.php > > #0 [internal function]: MWExceptionHandler::handleError() > #1 /var/mediawiki/includes/debug/MWDebug.php(393): trigger_error() > #2 /var/mediawiki/includes/debug/MWDebug.php(297): MWDebug::sendMessage() > #3 /var/mediawiki/includes/debug/MWDebug.php(270): MWDebug::sendRawDeprecated() > #4 /var/mediawiki/includes/GlobalFunctions.php(1032): MWDebug::deprecated() > #5 /var/mediawiki/includes/GlobalFunctions.php(2548): wfDeprecated() > #6 /var/mediawiki/includes/MediaWiki.php(67): wfGetScriptUrl(string) > #7 /var/mediawiki/load.php(50): MediaWiki->__construct() == After (always) == > Use of wfGetScriptUrl was deprecated in MediaWiki 1.35. [Called from MediaWiki::__construct] > > Error from line 67 of /var/mediawiki/includes/MediaWiki.php > > #0 [internal function]: MWExceptionHandler::handleError() > #1 /var/mediawiki/includes/debug/MWDebug.php(293): trigger_error() > #2 /var/mediawiki/includes/debug/MWDebug.php(270): MWDebug::sendRawDeprecated() > #3 /var/mediawiki/includes/GlobalFunctions.php(1038): MWDebug::deprecated() > #4 /var/mediawiki/includes/GlobalFunctions.php(2548): wfDeprecated() > #5 /var/mediawiki/includes/MediaWiki.php(67): wfGetScriptUrl(string) > #6 /var/mediawiki/load.php(50): MediaWiki->__construct() Bug: T252923 Change-Id: I1d4a166b6dff8b0e19fce3fab409f4a89e734ee6
2020-05-28 02:14:07 +00:00
/**
* Append a caller description to an error message
*
* @internal For use by MWExceptionHandler to override 'exception.file' in error logs.
* @param string $msg Formatted message from formatCallerDescription() and getCallerDescription()
* @return null|array<string,string> Null if unable to recognise all parts, or array with:
* - 'file': string of file path
* - 'line': string of line number
* - 'func': string of function or method name
* - 'message': Re-formatted version of $msg for use with ErrorException,
* so as to not include file/line twice.
*/
public static function parseCallerDescription( $msg ) {
$match = null;
preg_match( '/(.*) \[Called from ([^ ]+) in ([^ ]+) at line (\d+)\]$/', $msg, $match );
if ( $match ) {
return [
'message' => "{$match[1]} [Called from {$match[2]}]",
'func' => $match[2],
'file' => $match[3],
'line' => $match[4],
];
} else {
return null;
}
}
/**
* Send a message to the debug log and optionally also trigger a PHP
* error, depending on the $level argument.
*
* @param string $msg Message to send
* @param string $group Log group on which to send the message
* @param int|bool $level Error level to use; set to false to not trigger an error
*/
private static function sendMessage( $msg, $group, $level ) {
if ( $level !== false ) {
trigger_error( $msg, $level );
}
wfDebugLog( $group, $msg );
}
/**
* This is a method to pass messages from wfDebug to the pretty debugger.
* Do NOT use this method, use MWDebug::log or wfDebug()
*
* @since 1.19
* @param string $str
* @param array $context
*/
public static function debugMsg( $str, $context = [] ) {
global $wgDebugComments, $wgShowDebug;
if ( self::$enabled || $wgDebugComments || $wgShowDebug ) {
if ( $context ) {
$prefix = '';
if ( isset( $context['prefix'] ) ) {
$prefix = $context['prefix'];
} elseif ( isset( $context['channel'] ) && $context['channel'] !== 'wfDebug' ) {
$prefix = "[{$context['channel']}] ";
}
if ( isset( $context['seconds_elapsed'] ) && isset( $context['memory_used'] ) ) {
$prefix .= "{$context['seconds_elapsed']} {$context['memory_used']} ";
}
$str = LegacyLogger::interpolate( $str, $context );
$str = $prefix . $str;
}
self::$debug[] = rtrim( UtfNormal\Validator::cleanUp( $str ) );
}
}
/**
* Begins profiling on a database query
*
* @since 1.19
* @param string $sql
* @param string $function
* @param float $runTime Query run time
rdbms: Restore debug toolbar "Queries" feature This broke after e0cc49ce3971e19, due to the field 'master' being removed from the log context. The LegacyLogger logic forwarding these messages to MWDebug (for the debug toolbar) however, was dependant on. Users of debug toolbar experienced a silent failure because the logic in question is very tolerant of missing fields. This is because it uses those fields to distinguish the 'sql' messages from channel=DBQuery from other messages in the same channel. Making that less fragile is outside the scope of this commit. This commit: * Restore the basic functionality by making sure MWDebug::query() gets called again for DBQuery messages. * Remove the code relating to the 'master' field as this no longer exists in RDBMS. It also wasn't used anywhere (to be used, it would need to be read by mediawiki.debug/debug.js). * Remove unexpanded "{method}" and "{runtime}" noise in the debug toolbar text. This was introduced by he conversion to PSR-3 logging.. These fields are already rendered separately by the toolbar and should not be part of the "SQL" column. To do this, we need to log the $sql bit as its own key, so I've made this a context field as well. * Reduce the condition logic in LegacyLogger to only looking for 'DBQuery' and 'sql'. This way, if it breaks again it will still call the logic within and emit E_NOTICE instead, which would help detect the issue (and still fallback to at least showing the queries). Unlike before this commit where it took quite some time to figure out why it wasn't working. * The above fixes still weren't enough to get queries to show up in the Debug toolbar for me. Turns out, this was because my local setup (mediawiki-docker-dev) uses a master-replica set up. The setup doesn't use any custom LBFactory config, just plain $wgDBservers. The logic for turning these plain settings into LBFactory (in MWLBFactory.php) does kick in, and does run (unlike if I had custom wgLBFactoryConf). But, the DBO_DEBUG flag didn't make it through because of the += operator preferring any pre-existing value my setup has, which is just `DBO_DEFAULT`. Merging 'flags' keys seems unsafe in general, but adding DBO_DEBUG based on $wgDebugDumpSql seems innocent and doesn't affect other behaviour (it's a case of DWIM). Bug: T231742 Change-Id: I122bb1a65620a7ae4e1943136c975b63524a5111
2019-10-05 01:56:12 +00:00
* @param string $dbhost
* @return bool True if debugger is enabled, false otherwise
*/
rdbms: Restore debug toolbar "Queries" feature This broke after e0cc49ce3971e19, due to the field 'master' being removed from the log context. The LegacyLogger logic forwarding these messages to MWDebug (for the debug toolbar) however, was dependant on. Users of debug toolbar experienced a silent failure because the logic in question is very tolerant of missing fields. This is because it uses those fields to distinguish the 'sql' messages from channel=DBQuery from other messages in the same channel. Making that less fragile is outside the scope of this commit. This commit: * Restore the basic functionality by making sure MWDebug::query() gets called again for DBQuery messages. * Remove the code relating to the 'master' field as this no longer exists in RDBMS. It also wasn't used anywhere (to be used, it would need to be read by mediawiki.debug/debug.js). * Remove unexpanded "{method}" and "{runtime}" noise in the debug toolbar text. This was introduced by he conversion to PSR-3 logging.. These fields are already rendered separately by the toolbar and should not be part of the "SQL" column. To do this, we need to log the $sql bit as its own key, so I've made this a context field as well. * Reduce the condition logic in LegacyLogger to only looking for 'DBQuery' and 'sql'. This way, if it breaks again it will still call the logic within and emit E_NOTICE instead, which would help detect the issue (and still fallback to at least showing the queries). Unlike before this commit where it took quite some time to figure out why it wasn't working. * The above fixes still weren't enough to get queries to show up in the Debug toolbar for me. Turns out, this was because my local setup (mediawiki-docker-dev) uses a master-replica set up. The setup doesn't use any custom LBFactory config, just plain $wgDBservers. The logic for turning these plain settings into LBFactory (in MWLBFactory.php) does kick in, and does run (unlike if I had custom wgLBFactoryConf). But, the DBO_DEBUG flag didn't make it through because of the += operator preferring any pre-existing value my setup has, which is just `DBO_DEFAULT`. Merging 'flags' keys seems unsafe in general, but adding DBO_DEBUG based on $wgDebugDumpSql seems innocent and doesn't affect other behaviour (it's a case of DWIM). Bug: T231742 Change-Id: I122bb1a65620a7ae4e1943136c975b63524a5111
2019-10-05 01:56:12 +00:00
public static function query( $sql, $function, $runTime, $dbhost ) {
if ( !self::$enabled ) {
return false;
}
// Replace invalid UTF-8 chars with a square UTF-8 character
// This prevents json_encode from erroring out due to binary SQL data
$sql = preg_replace(
'/(
[\xC0-\xC1] # Invalid UTF-8 Bytes
| [\xF5-\xFF] # Invalid UTF-8 Bytes
| \xE0[\x80-\x9F] # Overlong encoding of prior code point
| \xF0[\x80-\x8F] # Overlong encoding of prior code point
| [\xC2-\xDF](?![\x80-\xBF]) # Invalid UTF-8 Sequence Start
| [\xE0-\xEF](?![\x80-\xBF]{2}) # Invalid UTF-8 Sequence Start
| [\xF0-\xF4](?![\x80-\xBF]{3}) # Invalid UTF-8 Sequence Start
| (?<=[\x0-\x7F\xF5-\xFF])[\x80-\xBF] # Invalid UTF-8 Sequence Middle
| (?<![\xC2-\xDF]|[\xE0-\xEF]|[\xE0-\xEF][\x80-\xBF]|[\xF0-\xF4]
| [\xF0-\xF4][\x80-\xBF]|[\xF0-\xF4][\x80-\xBF]{2})[\x80-\xBF] # Overlong Sequence
| (?<=[\xE0-\xEF])[\x80-\xBF](?![\x80-\xBF]) # Short 3 byte sequence
| (?<=[\xF0-\xF4])[\x80-\xBF](?![\x80-\xBF]{2}) # Short 4 byte sequence
| (?<=[\xF0-\xF4][\x80-\xBF])[\x80-\xBF](?![\x80-\xBF]) # Short 4 byte sequence (2)
)/x',
'■',
$sql
);
// last check for invalid utf8
$sql = UtfNormal\Validator::cleanUp( $sql );
self::$query[] = [
rdbms: Restore debug toolbar "Queries" feature This broke after e0cc49ce3971e19, due to the field 'master' being removed from the log context. The LegacyLogger logic forwarding these messages to MWDebug (for the debug toolbar) however, was dependant on. Users of debug toolbar experienced a silent failure because the logic in question is very tolerant of missing fields. This is because it uses those fields to distinguish the 'sql' messages from channel=DBQuery from other messages in the same channel. Making that less fragile is outside the scope of this commit. This commit: * Restore the basic functionality by making sure MWDebug::query() gets called again for DBQuery messages. * Remove the code relating to the 'master' field as this no longer exists in RDBMS. It also wasn't used anywhere (to be used, it would need to be read by mediawiki.debug/debug.js). * Remove unexpanded "{method}" and "{runtime}" noise in the debug toolbar text. This was introduced by he conversion to PSR-3 logging.. These fields are already rendered separately by the toolbar and should not be part of the "SQL" column. To do this, we need to log the $sql bit as its own key, so I've made this a context field as well. * Reduce the condition logic in LegacyLogger to only looking for 'DBQuery' and 'sql'. This way, if it breaks again it will still call the logic within and emit E_NOTICE instead, which would help detect the issue (and still fallback to at least showing the queries). Unlike before this commit where it took quite some time to figure out why it wasn't working. * The above fixes still weren't enough to get queries to show up in the Debug toolbar for me. Turns out, this was because my local setup (mediawiki-docker-dev) uses a master-replica set up. The setup doesn't use any custom LBFactory config, just plain $wgDBservers. The logic for turning these plain settings into LBFactory (in MWLBFactory.php) does kick in, and does run (unlike if I had custom wgLBFactoryConf). But, the DBO_DEBUG flag didn't make it through because of the += operator preferring any pre-existing value my setup has, which is just `DBO_DEFAULT`. Merging 'flags' keys seems unsafe in general, but adding DBO_DEBUG based on $wgDebugDumpSql seems innocent and doesn't affect other behaviour (it's a case of DWIM). Bug: T231742 Change-Id: I122bb1a65620a7ae4e1943136c975b63524a5111
2019-10-05 01:56:12 +00:00
'sql' => "$dbhost: $sql",
'function' => $function,
'time' => $runTime,
];
return true;
}
/**
* Returns a list of files included, along with their size
*
* @param IContextSource $context
* @return array
*/
protected static function getFilesIncluded( IContextSource $context ) {
$files = get_included_files();
$fileList = [];
foreach ( $files as $file ) {
$size = filesize( $file );
$fileList[] = [
'name' => $file,
'size' => $context->getLanguage()->formatSize( $size ),
];
}
return $fileList;
}
/**
* Returns the HTML to add to the page for the toolbar
*
* @since 1.19
* @param IContextSource $context
* @return string
*/
public static function getDebugHTML( IContextSource $context ) {
global $wgDebugComments;
$html = '';
if ( self::$enabled ) {
self::log( 'MWDebug output complete' );
$debugInfo = self::getDebugInfo( $context );
// Cannot use OutputPage::addJsConfigVars because those are already outputted
// by the time this method is called.
$html = ResourceLoader::makeInlineScript(
Initial support for Content Security Policy, disabled by default The primary goal here is a defense in depth measure to stop an attacker who found a bug in the parser allowing them to insert malicious attributes. This wouldn't stop someone who could insert a full script tag (since at current it can't distinguish between malicious and legit user js). It also would not prevent DOM-based or reflected XSS for anons, as the nonce value is guessable for anons when receiving a response cached by varnish. However, the limited protection of just stopping stored XSS where the attacker only has control of attributes, is still a big win in my opinion. (But it wouldn't prevent someone who has that type of xss from abusing things like data-ooui attribute). This will likely break many gadgets. Its expected that any sort of rollout on Wikimedia will be done very slowly, with lots of testing and the report-only option to begin with. This is behind feature flags that are off by default, so merging this patch should not cause any change in default behaviour. This may break some extensions (The most obvious one is charinsert (See fe648d41005), but will probably need some testing in report-only mode to see if anything else breaks) This uses the unsafe-eval option of CSP, in order to support RL's local storage thingy. For better security, we may want to remove some of the sillier uses of eval (e.g. jquery.ui.datepicker.js). For more info, see spec: https://www.w3.org/TR/CSP2/ Additionally see: https://www.mediawiki.org/wiki/Requests_for_comment/Content-Security-Policy Bug: T135963 Change-Id: I80f6f469ba4c0b608385483457df96ccb7429ae5
2016-02-29 04:13:10 +00:00
ResourceLoader::makeConfigSetScript( [ 'debugInfo' => $debugInfo ] ),
$context->getOutput()->getCSP()->getNonce()
);
}
if ( $wgDebugComments ) {
$html .= "<!-- Debug output:\n" .
htmlspecialchars( implode( "\n", self::$debug ), ENT_NOQUOTES ) .
"\n\n-->";
}
return $html;
}
/**
* Generate debug log in HTML for displaying at the bottom of the main
* content area.
* If $wgShowDebug is false, an empty string is always returned.
*
* @since 1.20
* @return string HTML fragment
*/
public static function getHTMLDebugLog() {
global $wgShowDebug;
if ( !$wgShowDebug ) {
return '';
}
$ret = "\n<hr />\n<strong>Debug data:</strong><ul id=\"mw-debug-html\">\n";
foreach ( self::$debug as $line ) {
$display = nl2br( htmlspecialchars( trim( $line ) ) );
$ret .= "<li><code>$display</code></li>\n";
}
$ret .= '</ul>' . "\n";
return Html::rawElement( 'div', [ 'id' => 'mw-html-debug-log' ], $ret );
}
/**
* Append the debug info to given ApiResult
*
* @param IContextSource $context
* @param ApiResult $result
*/
public static function appendDebugInfoToApiResult( IContextSource $context, ApiResult $result ) {
if ( !self::$enabled ) {
return;
}
// output errors as debug info, when display_errors is on
// this is necessary for all non html output of the api, because that clears all errors first
$obContents = ob_get_contents();
if ( $obContents ) {
$obContentArray = explode( '<br />', $obContents );
foreach ( $obContentArray as $obContent ) {
if ( trim( $obContent ) ) {
self::debugMsg( Sanitizer::stripAllTags( $obContent ) );
}
}
}
self::log( 'MWDebug output complete' );
$debugInfo = self::getDebugInfo( $context );
API: Overhaul ApiResult, make format=xml not throw, and add json formatversion ApiResult was a mess: some methods could only be used with an array reference instead of manipulating the stored data, methods that had both array-ref and internal-data versions had names that didn't at all correspond, some methods that worked on an array reference were annoyingly non-static, and then the whole mess with setIndexedTagName. ApiFormatXml is also entirely annoying to deal with, as it liked to throw exceptions if certain metadata wasn't provided that no other formatter required. Its legacy also means we have this silly convention of using empty-string rather than boolean true, annoying restrictions on keys (leading to things that should be hashes being arrays of key-value object instead), '*' used as a key all over the place, and so on. So, changes here: * ApiResult is no longer an ApiBase or a ContextSource. * Wherever sensible, ApiResult provides a static method working on an arrayref and a non-static method working on internal data. * Metadata is now always added to ApiResult's internal data structure. Formatters are responsible for stripping it if necessary. "raw mode" is deprecated. * New metadata to replace the '*' key, solve the array() => '[]' vs '{}' question, and so on. * New class for formatting warnings and errors using i18n messages, and support for multiple errors and a more machine-readable format for warnings. For the moment, though, the actual output will not be changing yet (see T47843 for future plans). * New formatversion parameter for format=json and format=php, to select between BC mode and the modern output. * In BC mode, booleans will be converted to empty-string presence style; modules currently returning booleans will need to use ApiResult::META_BC_BOOLS to preserve their current output. Actual changes to the API modules' output (e.g. actually returning booleans for the new formatversion) beyond the use of ApiResult::setContentValue() are left for a future change. Bug: T76728 Bug: T57371 Bug: T33629 Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678f
2014-12-03 22:14:22 +00:00
ApiResult::setIndexedTagName( $debugInfo, 'debuginfo' );
ApiResult::setIndexedTagName( $debugInfo['log'], 'line' );
ApiResult::setIndexedTagName( $debugInfo['debugLog'], 'msg' );
ApiResult::setIndexedTagName( $debugInfo['queries'], 'query' );
ApiResult::setIndexedTagName( $debugInfo['includes'], 'queries' );
$result->addValue( null, 'debuginfo', $debugInfo );
}
/**
* Returns the HTML to add to the page for the toolbar
*
* @param IContextSource $context
* @return array
*/
public static function getDebugInfo( IContextSource $context ) {
if ( !self::$enabled ) {
return [];
}
$request = $context->getRequest();
$branch = GitInfo::currentBranch();
if ( GitInfo::isSHA1( $branch ) ) {
// If it's a detached HEAD, the SHA1 will already be
// included in the MW version, so don't show it.
$branch = false;
}
return [
'mwVersion' => MW_VERSION,
'phpEngine' => 'PHP',
'phpVersion' => PHP_VERSION,
'gitRevision' => GitInfo::headSHA1(),
'gitBranch' => $branch,
'gitViewUrl' => GitInfo::headViewUrl(),
'time' => $request->getElapsedTime(),
'log' => self::$log,
'debugLog' => self::$debug,
'queries' => self::$query,
'request' => [
'method' => $request->getMethod(),
'url' => $request->getRequestURL(),
'headers' => $request->getAllHeaders(),
'params' => $request->getValues(),
],
'memory' => $context->getLanguage()->formatSize( memory_get_usage() ),
'memoryPeak' => $context->getLanguage()->formatSize( memory_get_peak_usage() ),
'includes' => self::getFilesIncluded( $context ),
];
}
}