886bda5f81
This changeset removes the static class `OC_Request` and moves the functions either into `IRequest` which is accessible via `\OC::$server::->getRequest()` or into a separated `TrustedDomainHelper` class for some helper methods which should not be publicly exposed. This changes only internal methods and nothing on the public API. Some public functions in `util.php` have been deprecated though in favour of the new non-static functions. Unfortunately some part of this code uses things like `__DIR__` and thus is not completely unit-testable. Where tests where possible they ahve been added though. Fixes https://github.com/owncloud/core/issues/13976 which was requested in https://github.com/owncloud/core/pull/13973#issuecomment-73492969
143 lines
3.5 KiB
PHP
143 lines
3.5 KiB
PHP
<?php
|
|
|
|
/**
|
|
* ownCloud - App Framework
|
|
*
|
|
* @author Bernhard Posselt
|
|
* @copyright 2015 Bernhard Posselt <dev@bernhard-posselt.com>
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
|
* License as published by the Free Software Foundation; either
|
|
* version 3 of the License, or any later version.
|
|
*
|
|
* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details.
|
|
*
|
|
* You should have received a copy of the GNU Affero General Public
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
|
|
namespace OCP\AppFramework;
|
|
|
|
use OC\AppFramework\Http\Request;
|
|
use OCP\AppFramework\Http\DataResponse;
|
|
|
|
|
|
class ChildOCSController extends OCSController {}
|
|
|
|
|
|
class OCSControllerTest extends \Test\TestCase {
|
|
|
|
private $controller;
|
|
|
|
public function testCors() {
|
|
$request = new Request(
|
|
[
|
|
'server' => [
|
|
'HTTP_ORIGIN' => 'test',
|
|
],
|
|
],
|
|
$this->getMock('\OCP\Security\ISecureRandom'),
|
|
$this->getMock('\OCP\IConfig')
|
|
);
|
|
$controller = new ChildOCSController('app', $request, 'verbs',
|
|
'headers', 100);
|
|
|
|
$response = $controller->preflightedCors();
|
|
|
|
$headers = $response->getHeaders();
|
|
|
|
$this->assertEquals('test', $headers['Access-Control-Allow-Origin']);
|
|
$this->assertEquals('verbs', $headers['Access-Control-Allow-Methods']);
|
|
$this->assertEquals('headers', $headers['Access-Control-Allow-Headers']);
|
|
$this->assertEquals('false', $headers['Access-Control-Allow-Credentials']);
|
|
$this->assertEquals(100, $headers['Access-Control-Max-Age']);
|
|
}
|
|
|
|
|
|
public function testXML() {
|
|
$controller = new ChildOCSController('app', new Request(
|
|
[],
|
|
$this->getMock('\OCP\Security\ISecureRandom'),
|
|
$this->getMock('\OCP\IConfig')
|
|
));
|
|
$expected = "<?xml version=\"1.0\"?>\n" .
|
|
"<ocs>\n" .
|
|
" <meta>\n" .
|
|
" <status>OK</status>\n" .
|
|
" <statuscode>400</statuscode>\n" .
|
|
" <message>OK</message>\n" .
|
|
" </meta>\n" .
|
|
" <data>\n" .
|
|
" <test>hi</test>\n" .
|
|
" </data>\n" .
|
|
"</ocs>\n";
|
|
|
|
$params = [
|
|
'data' => [
|
|
'test' => 'hi'
|
|
],
|
|
'statuscode' => 400
|
|
];
|
|
|
|
$out = $controller->buildResponse($params, 'xml')->render();
|
|
$this->assertEquals($expected, $out);
|
|
}
|
|
|
|
|
|
public function testXMLDataResponse() {
|
|
$controller = new ChildOCSController('app', new Request(
|
|
[],
|
|
$this->getMock('\OCP\Security\ISecureRandom'),
|
|
$this->getMock('\OCP\IConfig')
|
|
));
|
|
$expected = "<?xml version=\"1.0\"?>\n" .
|
|
"<ocs>\n" .
|
|
" <meta>\n" .
|
|
" <status>OK</status>\n" .
|
|
" <statuscode>400</statuscode>\n" .
|
|
" <message>OK</message>\n" .
|
|
" </meta>\n" .
|
|
" <data>\n" .
|
|
" <test>hi</test>\n" .
|
|
" </data>\n" .
|
|
"</ocs>\n";
|
|
|
|
$params = new DataResponse([
|
|
'data' => [
|
|
'test' => 'hi'
|
|
],
|
|
'statuscode' => 400
|
|
]);
|
|
|
|
$out = $controller->buildResponse($params, 'xml')->render();
|
|
$this->assertEquals($expected, $out);
|
|
}
|
|
|
|
|
|
public function testJSON() {
|
|
$controller = new ChildOCSController('app', new Request(
|
|
[],
|
|
$this->getMock('\OCP\Security\ISecureRandom'),
|
|
$this->getMock('\OCP\IConfig')
|
|
));
|
|
$expected = '{"status":"OK","statuscode":400,"message":"OK",' .
|
|
'"totalitems":"","itemsperpage":"","data":{"test":"hi"}}';
|
|
$params = [
|
|
'data' => [
|
|
'test' => 'hi'
|
|
],
|
|
'statuscode' => 400
|
|
];
|
|
|
|
$out = $controller->buildResponse($params, 'json')->render();
|
|
$this->assertEquals($expected, $out);
|
|
}
|
|
|
|
|
|
}
|