Previously it relied on wfGetServerUrl to decide the url,
which passed PROTO_CURRENT on to wfExpandUrl(), when then uses
global $wgRequest and checks getProtocol() on that.
For typical web requests, these would be the same object by
reference, but the needless indirection makes the code harder
to reason about and harder to test.
Instead, check this locally and pass on an explicit HTTP or HTTPS
to wfGetServerUrl/wfExpandUrl.
Change-Id: I797bd2f909625536c3af36f015fb2e94bf922ba9
return $this->requestUrl;
}
return $this->requestUrl;
}
- public function getFullRequestURL() {
- // Pass an explicit PROTO constant instead of PROTO_CURRENT so that we
- // do not rely on state from the global $wgRequest object (which it would,
- // via wfGetServerUrl/wfExpandUrl/$wgRequest->protocol).
- if ( $this->protocol === 'http' ) {
- return wfGetServerUrl( PROTO_HTTP ) . $this->getRequestURL();
- } else {
- return wfGetServerUrl( PROTO_HTTPS ) . $this->getRequestURL();
- }
- }
-
public function getProtocol() {
return $this->protocol;
}
public function getProtocol() {
return $this->protocol;
}
* in HTML or other output.
*
* If $wgServer is protocol-relative, this will return a fully
* in HTML or other output.
*
* If $wgServer is protocol-relative, this will return a fully
- * qualified URL with the protocol that was used for this request.
+ * qualified URL with the protocol of this request object.
*
* @return string
*/
public function getFullRequestURL() {
*
* @return string
*/
public function getFullRequestURL() {
- return wfGetServerUrl( PROTO_CURRENT ) . $this->getRequestURL();
+ // Pass an explicit PROTO constant instead of PROTO_CURRENT so that we
+ // do not rely on state from the global $wgRequest object (which it would,
+ // via wfGetServerUrl/wfExpandUrl/$wgRequest->protocol).
+ if ( $this->getProtocol() === 'http' ) {
+ return wfGetServerUrl( PROTO_HTTP ) . $this->getRequestURL();
+ } else {
+ return wfGetServerUrl( PROTO_HTTPS ) . $this->getRequestURL();
+ }
* @group WebRequest
*/
class WebRequestTest extends MediaWikiTestCase {
* @group WebRequest
*/
class WebRequestTest extends MediaWikiTestCase {
protected function setUp() {
parent::setUp();
$this->oldServer = $_SERVER;
protected function setUp() {
parent::setUp();
$this->oldServer = $_SERVER;
+ $this->oldWgRequest = $GLOBALS['wgRequest'];
+ $this->oldWgServer = $GLOBALS['wgServer'];
}
protected function tearDown() {
$_SERVER = $this->oldServer;
}
protected function tearDown() {
$_SERVER = $this->oldServer;
+ $GLOBALS['wgRequest'] = $this->oldWgRequest;
+ $GLOBALS['wgServer'] = $this->oldWgServer;
$this->assertSame( [ 'x' ], $req->getValueNames( [ 'y' ] ), 'Exclude keys' );
}
$this->assertSame( [ 'x' ], $req->getValueNames( [ 'y' ] ), 'Exclude keys' );
}
+ /**
+ * @covers WebRequest
+ */
+ public function testGetFullRequestURL() {
+ // Stub this for wfGetServerUrl()
+ $GLOBALS['wgServer'] = '//wiki.test';
+ $req = $this->getMock( WebRequest::class, [ 'getRequestURL', 'getProtocol' ] );
+ $req->method( 'getRequestURL' )->willReturn( '/path' );
+ $req->method( 'getProtocol' )->willReturn( 'https' );
+
+ $this->assertSame(
+ 'https://wiki.test/path',
+ $req->getFullRequestURL()
+ );
+ }
+
/**
* @dataProvider provideGetIP
* @covers WebRequest::getIP
/**
* @dataProvider provideGetIP
* @covers WebRequest::getIP