Commit graph

1181 commits

Author SHA1 Message Date
jenkins-bot
02f10d2bdd Merge "Deprecate wfCheckLimits(), nothing calls this anymore" 2014-06-26 15:34:38 +00:00
jenkins-bot
add089c254 Merge "Only use limit.sh if /bin/bash executable, instead of if linux." 2014-06-25 21:53:56 +00:00
Kevin Israel
74e6ce4fd6 Don't parse disable_functions INI value
In wfDebugBacktrace() and wfShellExecDisabled(), use function_exists()
instead of getting the value of the disable_functions INI setting,
then splitting it into a list of functions, then checking that list
for the function to be called.

Also removed the check for Zend Optimizer, an old PHP extension that
does not work with PHP 5.3.

Change-Id: I04f0e026f8a6e0414f08d5302aff6c084a1d19a7
2014-06-25 20:24:28 +00:00
Chad Horohoe
85d7e6203f Deprecate wfCheckLimits(), nothing calls this anymore
Some old things in SVN called it, hence the deprecation.

Change-Id: Iefabd1a6bee261a393f3b1af083c8a075abf1e48
2014-06-25 11:22:39 -07:00
rillke
548b7de4dd Typo in documentation: wgMaxShell not wgShellMax
Change-Id: I02f2437c33e87ea389e4bbb753af0c6cc18b4410
2014-06-23 15:02:37 +02:00
Kevin Israel
476b532f15 Fix copy-paste error in wfIsConfiguredProxy()
It should call IP::isConfiguredProxy(), not IP::isTrustedProxy().

Follows-up e323bc3393.

Change-Id: I3caf8261f6058aa1a243c055b746b2fa61b1bf49
2014-06-20 01:27:33 -04:00
Brian Wolff
3e108ea4d8 Only use limit.sh if /bin/bash executable, instead of if linux.
gute on irc just mentioned how his BusyBox server identifies as
linux but doesn't have bash installed. Additionally I see no
reason to limit limit.sh to linux, if for example somebody has
installed bash on a different *nix.

Change-Id: I51677295ab6bbc58fc5152106cf2c4c32bd1b0ea
2014-06-19 22:13:48 -03:00
Kevin Israel
b9e1d5f5c0 Add hash_equals() fallback and use it
Two classes (User and SpecialRunJobs) currently contain string
equality checks that purport to be timing-attack resistant.

Reduce code duplication by adding and using a fallback for the
hash_equals() function from PHP 5.6 (currently in beta), in a way
addressing the comment "@todo: make a common method for this".

Change-Id: Iece006ec0216edb3fc5fbef7cc6ec00a6d182775
2014-05-28 20:52:08 -04:00
jenkins-bot
4f42c2bbe4 Merge "Make HTTPS port configurable" 2014-05-23 22:47:03 +00:00
Sergio Santoro
9736bf082c wfDebugMem: Fix binary prefix and improve usability
* Fix: wfDebugMem no longer reports kibibytes as kilobytes
* Usability: wfDebugMem now uses unit symbols (e.g. KiB)

Change-Id: I1ab8aa3ccdb0fdea307913ada4ed42964d7fe960
2014-05-22 16:22:12 +02:00
awjrichards
86f68d31d3 Make HTTPS port configurable
Introduces wgHttpsPort configuration variable and makes use of it when
appropriate in wfExpandUrl()

Bug: 65184
Change-Id: I325ee0ff7be16de2a964fb7d8654b88cbd5fe239
2014-05-19 13:23:13 -07:00
Brandon Black
e323bc3393 Speed up CIDR matching from $wgSquidServersNoPurge
This adds a new generic library class IPSet, which precomputes
a reasonably-efficient data structure from the input list of
addresses and CIDR net/mask specs for fast runtime matching,
and then uses it to check trusted XFF-setters.

See also: 32b4f19f173fc5cff1029eedee63a39a2d72dd3a
Bug: 57021
Change-Id: Ia3b12fb90c3e7e492374a128943b014481cc2730
2014-05-15 17:23:12 +00:00
Bartosz Dziewoński
c3aa5ef597 Create Parser::stripOuterParagraph to avoid code duplication
We've had the logic for stripping the outer <p/> element in three
separate places. The version in OutputPage was missing the '$' at the
end of the regex, that was most likely a mistake caused by the
duplication.

Also, extend the logic in order not to generate invalid HTML if the
input contains more than one <p/> tag. Added tests for this and the
previous behaviour.

https://www.mail-archive.com/mediawiki-api@lists.wikimedia.org/msg03188.html

Change-Id: I6bb3597898324556df912a23a7ffc9ff250b8f58
2014-05-15 12:20:19 -04:00
Siebrand Mazeland
e9eb00b203 Make phpcs-strict pass on includes/ (1/~10)
Change-Id: Ib51381a2261d064988ba2f39b71c0252f2458faf
2014-05-11 19:14:17 +00:00
umherirrender
5a93df2fba Fix some @params documentation in includes/{GlobalFunctions,User.php}
Swapped some "$var type" to "type $var" or added missing types
before the $var. Changed some other types to match the more common
spelling. Makes beginning of some text in capital.

Change-Id: If8c0cf4627fc62ff288d33658e327ae80548f5c5
2014-04-23 09:53:38 +00:00
Bartosz Dziewoński
59002d8935 Consistently use '@deprecated since <version>'
Variants included 'in <version>', 'as of <version>' and just the
version number.

Some @deprecated annotations do not have the version number at all,
I want to hunt them down separately.

Change-Id: I8208c6097098f4735d4f51bc42254675f1f27f6d
2014-04-15 22:18:19 +02:00
Aaron Schulz
1f19a345bc Revert "Work around HHVM bug with stdin/stdout in proc_open()"
This was fixed in HHVM (https://github.com/facebook/hhvm/issues/1247).

This reverts commit 52e546640c.

bug: 56597
Change-Id: I9c97ba5645d794ff562347979e3f2027eb8b4534
2014-04-11 22:07:19 +00:00
Ori Livneh
b20f740e38 Convert <!-- timing data --> to a <script></script> block
This patch replaces:

  <!-- Served by mw1069 in 0.976 secs. -->

With:

  <script>mw.config.set({"wgBackendResponseTime":976,"wgHostname":"mw1069"});</script>

In the default HTML output of MediaWiki.

While the latter is a nearly twice as long, it is almost as readable for human
beings, while being substantially easy to get via JavaScript.

To get the values from the comment, you have to do something like:

  var comments, comment, hostname, duration;
  comments = $.grep( document.body.childNodes, function ( el ) {
	return el.nodeType === 8
  } );
  comment = comments.length
	? comments.pop().nodeValue.match( /(\S+) in ([\d.]+)/ ).slice( 1 )
	: [ null, null ];
  hostname = comment[0];
  respTime = parseFloat( comment[1] );

On the other hand, to get the values from the JavaScript code, you can simply:

  var hostname = mw.config.get( 'wgHostname' );
  var respTime = mw.config.get( 'wgBackendResponseTime' );

I believe that the ability to parse the number easily via JavaScript will make
it easier to include with other client-side measurements as part of reports on
site performance as experienced by users.

Change-Id: I895cd03f0968815484ff8cda4b23cc602ac555f0
2014-04-07 21:39:08 +00:00
Alexandre Emsenhuber
d966a5266f Send the profiler output to the 'profileoutput' log group
And deprecate $wgProfileOnly in the same time.

This has the advantage of allowing profiler output to be separated
from the main debug log file; or even be completely disabled while
keeping the other debugging messages.

Also updated the checks in wfLogProfilingData() to detect the cases
where the output would not be sent anywhere to not execute the
last part of the method which would be useless otherwise.

Backward compatibility with installations having $wgProfileOnly
set to true is kept by moving the log file from $wgDebugLogFile
to $wgDebugLogGroups['profileoutput'] in Setup.php in that case.

Change-Id: I7b35195e527dfa7978b710126ed4599e75dab46b
2014-03-28 07:39:08 +01:00
Thiemo Mättig
d0b400476e Fix/update inline documentations in GlobalFunctions
I mainly fixed PHPDoc comments that are highlighted by PHPStorm
as being wrong or incomplete.

* Fixed some wrong inline documentations, e.g. wrong @return types.
* Used the style suggested by the Doxygen and phpDocumentor
  documentations: @param type [$optional,...]
* Doxygen and phpDocumentor suggest the order: @param type $var
* Avoid unclear "varargs" and "mixed" if possible.
* Lowercased "array" and such, they are no classes.

Change-Id: Iff16e05fed6652cefec29e3d254807f52d84c9ab
2014-03-26 14:40:25 +00:00
Alexandre Emsenhuber
9cfd31a708 Remove wfDebugLog() call from wfSetupSession()
Since Iffba121a99 (00b7f76) with the removal of wfHttpOnlySafe(),
session cookie's parameters are based only on configuration
settings, so there is no point to spam the "cookie" log group
with predicitible values.

Change-Id: I8b1cdea929cefc32dd8b01c2ecbf2d76bb64189f
2014-03-25 19:41:18 +01:00
jenkins-bot
453ee14fe1 Merge "Remove $wgHttpOnlyBlacklist" 2014-03-25 13:13:34 +00:00
jenkins-bot
3e326854f2 Merge "Fix documentation of wfDebugLog()" 2014-03-25 07:19:54 +00:00
Alexandre Emsenhuber
59c42b90d5 Automatically add a new line at the end of wfLogDBError()
I found two calls to wfLogDBError() that do not add a new line
at the end of the message. So instead of adding them to that
entries, I changed wfLogDBError() to automatically put it on
icoming messages; as for wfDebugLog().

Change-Id: Id014b5827a0aeef6873ebf08d78f0a3d7581d63b
2014-03-23 10:30:59 +01:00
Alexandre Emsenhuber
1edba2526d Fix documentation of wfDebugLog()
- $public parameter does not exist anymore
- Put the type before the parameter name

Change-Id: I0f3a893803ab5466570ef45398f797e4714d9d37
2014-03-23 10:17:48 +01:00
Kevin Israel
00b7f76aaf Remove $wgHttpOnlyBlacklist
This hack was added in r34083 / 6b16f44108 to support IE for Mac.
That browser is no longer supported, and no additional user-agent
strings have been added in WMF configuration.

Change-Id: Iffba121a9964e2ad387fad8827ddfd8dabcbd12e
2014-03-20 21:19:08 -04:00
Alexandre Emsenhuber
19084be0a2 Allow to disable specific groups in $wgDebugLogGroups
So that they don't even appear in $wgDebugLogFile.

Change-Id: Ibf1a28fa566915d790e4d915354238441c3ff5c7
2014-02-26 20:46:14 +00:00
Alexandre Emsenhuber
8d701eeeea Remove trailing line breaks from wfDebugLog() messages
This is useless since the message is passed through trim() and a
line break is added afterwards.

Change-Id: I1a26b30a07f7c9c749fce5bb6b2b4b3d79901b7c
2014-02-04 22:16:13 +01:00
Alexandre Emsenhuber
a7a0883019 Enhance the destination control parameter of wfDebug() and wfDebugLog()
- The parameter is now a string, making is more understandable than
  boolean values
- It takes the same values in both wfDebug() and wfDebugLog() (except
  for 'private' which is only used in the latter)
- This adds a new possibility to wfDebugLog() to log the message either
  on the specific log or the general one, but not to the debug toolbar
- Old boolean values are still recognised for backward compatibility
- Also send the messages passed to wfDebugLog() to the debug toolbar
  when they are written to a specific log and not restricted to logs
- Updated the calls of and wfDebug() and wfDebugLog() with the last
  parameter to change it into a string
- Renamed MWDebug::sendWarning() to MWDebug::sendMessage() and added
  $group parameter to it; will not break anything since that method
  is marked as private
- Changed the call to wfDebug() from MWDebug::sendMessage() to use
  wfDebugLog() with 'log' as thrid parameter, so that those messages
  can be logged separately from the main log and they don't show up
  a second time on the "debug log" tab of the debug toolbar

Change-Id: I1be09d4c1d3408ed5b26a5db02691c17c0ec0926
2014-02-04 19:56:24 +00:00
Siebrand Mazeland
118567a4ba Remove some deprecated global functions
Some uses remained in Gerrit extensions, and patches have been submitted
to replace the usages. See below for details.

* in_string (deprecated in 1.21)
* wfGenerateToken (deprecated in 1.20) (had 2 uses)
* wfStreamFile (deprecated in 1.19) (had 1 use)
* wfUILang (deprecated in 1.18)

Change-Id: Ic67a968da8f37daf44503b98d00710eb99180805
2014-01-23 01:38:27 +01:00
aude
5963aa7ed7 Add ability to mark hooks as deprecated
Change-Id: I8fd29e97a2b5d02746b572a9c315fbe54faf36f2
2014-01-10 09:12:26 +01:00
Siebrand Mazeland
903a77b569 Update comment for wfMsgExt()
Change-Id: Ia705a5a1bcef6d2b5c94a003b44e7d15b58df249
2014-01-01 15:25:39 +00:00
umherirrender
44495315c2 Fix typo - fuction -> function
Change-Id: I5a82849af85296b324d460ed21d9a547c391d341
2013-12-30 18:48:11 +01:00
Aaron Schulz
6640bdf0d8 Removed deprecated functions and merged ProxyTools into GlobalFunctions
Kept wfGetIP() for now because it is still in use in the SecurePoll
extension and in WMF configuration.

Change-Id: Id412e37743f89bb67eb329a2f475f8496cf7b006
2013-12-16 12:54:16 +00:00
umherirrender
661c5c3f01 Fixed spacing
- Added space after foreach
- Added/Removed spaces inside arrays

Change-Id: Ia8775824fa33976b1a4dab43e07f1bff0c57479c
2013-12-08 20:31:47 +01:00
umherirrender
0bc583af2c Move closing parenthesis from multi line if and function to own line
The Line continuation Coding conventions prefers the closing parenthesis
on the same line than the beginning curly braces. This is done for ifs
and functions.
Also move some boolean operator from the end of a line to the beginning
and changed some indentation to make the condition hopefully better
readable.

Change-Id: Id0437b06bde86eb5a75bc59eefa19e7edb624426
2013-12-01 21:39:00 +01:00
Niklas Laxström
24c89161b4 Fix variable name in comments
Change-Id: I2fbe47f7843c40b2806ba40b031a6047715db5f3
2013-11-24 10:03:38 +00:00
umherirrender
5dbfd5bf80 Fixed spacing
- Removed trailing spaces in comments
- Removed multiple empty lines
- Removed space after object operator

Change-Id: I9fd3256ab490c7cd2034de3fd94e6be6e6d6d8f2
2013-11-21 18:52:25 +00:00
umherirrender
f153998317 Fixed spacing
- Removed double spaces
- Added space after if/switch/foreach
- Removed space on elseif
- Added space around parentheses
- Added newline at end of file
- Removed space before semicolon at end of line

Change-Id: Id40b87e04786c6111e6686d7f7eea1e588bdf37d
2013-11-19 19:03:54 +01:00
Yuri Astrakhan
5aa7c747ad Logic optimization for wfExpandUrl()
removed redundant checks of the same variable, making the code
slightly more efficient

Change-Id: Ice4d3c45e80ca1214e2c36444baf0ce87b15a59b
2013-11-16 14:55:08 -05:00
Chad Horohoe
52e546640c Work around HHVM bug with stdin/stdout in proc_open()
Bug: 56597
Change-Id: I06122d82fce4567be110ca25010c244dd9269c57
2013-11-08 04:48:04 +00:00
Chad Horohoe
5ff5bcfde7 Remove unused function
Change-Id: I68ad2093c08adba2a92344c7db0737c10db9d150
2013-11-06 16:19:38 -08:00
Chad Horohoe
dbab8a83d5 Remove unused function
Change-Id: I6a1386077282cbf8faf7b35311cd886e939c76a8
2013-11-06 16:18:54 -08:00
Chad Horohoe
f3d6db5843 Remove unused function
Change-Id: I51975357c91295f757532ff219a8db8ca939ba0c
2013-11-06 16:09:42 -08:00
jenkins-bot
fb0db00b92 Merge "Introduce WebRequest::getProtocol()" 2013-11-06 17:23:01 +00:00
Tim Starling
8af1c9503d Introduce WebRequest::getProtocol()
The use of static server detection outside of its intended use case
(i.e. at the start of DefaultSettings.php), for example in r93258, was
an architectural error. Every other bit of information about the web
request in non-setup code comes from non-static methods of WebRequest,
which allows the request object to be meaningfully replaced or
subclassed. The situation became increasingly ridiculous as more
callers of WebRequest::detectProtocol() were introduced. Two of the
callers were calling it non-statically! I suppose they had the right
idea, in a way.

Using a non-static call allows caching, which is a nice additional
benefit.

WebRequest::detectProtocolAndStdPort() was introduced in r93258 as part of
the introduction of WebRequest::detectProtocol(). It was basically
useless. Grep indicates there was only one caller in core and WMF
deployed extensions, and it is patched here.

Change-Id: Ia0a61e98fbff7a46ceaeebcb02236e5eac3df0e1
2013-11-06 21:13:10 +04:00
Ori Livneh
edac6c3716 Release notes & comment fix for Ib0ece5d5d
Adds release notes and fixes two inaccurate comments added in Ib0ece5d5d
("Configurable log sampling via $wgDebugLogGroups").

Change-Id: I224a0319b7432300d3cb6f4d14e61ea9d36ee228
2013-11-05 12:22:35 -08:00
Ori Livneh
2c25e14642 Configurable log sampling via $wgDebugLogGroups
Make it possible to configure a log-group-specific sampling factor by allowing
$wgDebugLogGroups values to be associative arrays with 'destination' & 'sample'
keys.

The immediate use-case I have in mind is the memcached log, which is too
verbose to enable in production. We could sample on the receiving end, but
doing so would not help MediaWiki, which would still be on the hook for
processing and dispatching every single record.

Idea was vetted by Dr. Manhattan:

<TimStarling> I think you could have each element in $wgDebugLogGroups be an
  associative array
<TimStarling> e.g. array( 'sample' => 1000, 'target' => "$host:$port")
<TimStarling> that would allow for more features to be added to it in
  future

Change-Id: Ib0ece5d5d9c2aadef13b77ac38995b0e47ac086f
2013-11-05 11:49:42 -08:00
jenkins-bot
853c6852ec Merge "Rename wfIsHipHop() to wfIsHHVM()" 2013-11-04 18:32:39 +00:00
Siebrand Mazeland
e61cb8218b Update docs and declare visibility on class props
Change-Id: Ib0f02202d075d4a56dc4e37b08d7ac9399e8c86c
2013-11-01 12:35:27 +01:00