Add a protocol to relative urls in FileHandler fixes #4918

[octfx]

This PR is made in Reference to #4918

Tries to add a protocol to a relative url, by checking wgCanonicalServer or the request through RequestContext::getMain. If both fail http is used as a fallback.

[kghbln]

@octfx Thanks for providing this patch and please excuse that is has been rotting here since.

@JeroenDeDauw Could you have a peep at this?

[JeroenDeDauw]

I'm afraid to merge this without tests

[octfx]

I'll try to add some when my time permits it!

[26]

I do not think this would work for two reasons:

• file_get_contents also does not understand protocol-less URIs. The URL also needs to be protocolized before it is passed to that.
• In the function protocolizeUrl, you return the unaltered canonical URL if it has a scheme. This means any path or query that was passed to the function would be lost.

I believe just removing lines 136 to 145 (the try-catch block) would fix the second issue. The first issue may be fixed by assigning the protocolized URL to a variable and passing that variable to both file_get_contents as well as get_headers.

[octfx]

I do not think this would work for two reasons:

• file_get_contents also does not understand protocol-less URIs. The URL also needs to be protocolized before it is passed to that.
• In the function protocolizeUrl, you return the unaltered canonical URL if it has a scheme. This means any path or query that was passed to the function would be lost.

I believe just removing lines 136 to 145 (the try-catch block) would fix the second issue. The first issue may be fixed by assigning the protocolized URL to a variable and passing that variable to both file_get_contents as well as get_headers.

Oh, the file_get_contents part is a good catch, that slipped through!

I've updated the try-catch block to add the canonical server protocol to the input url.

Further I've added some tests, but I couldn't get them to run locally as it always errored out with Use of undefined constant SMW_PHPUNIT_AUTOLOADER_FILE [...] boostrap.php on line 15 :/

[JeroenDeDauw]

@Seb35 does this look good to you?

[marijnvanwezel]

@JeroenDeDauw Could you take a look at this again when you have the time? We are facing this issue again.

[JeroenDeDauw]

@marijnvanwezel did you test that this patch fixes the issue?