bbd5f28415
Doing this in the PHP code is not the right approach for multiple reasons: 1. A bug in the PHP code prevents them from being added to the response. 2. They are only added when something is served via PHP and not in other cases (that makes for example the newest IE UXSS which is not yet patched by Microsoft exploitable on ownCloud) 3. Some headers such as the Strict-Transport-Security might require custom modifications by administrators. This was not possible before and lead to buggy situations. This pull request moves those headers out of the PHP code and adds a security check to the admin settings performed via JS.
67 lines
2 KiB
PHP
67 lines
2 KiB
PHP
<?php
|
|
/**
|
|
* @author Lukas Reschke
|
|
* @copyright 2014 Lukas Reschke lukas@owncloud.com
|
|
*
|
|
* This file is licensed under the Affero General Public License version 3 or
|
|
* later.
|
|
* See the COPYING-README file.
|
|
*/
|
|
namespace OC\Settings\Controller;
|
|
|
|
use \OC\Settings\Application;
|
|
|
|
/**
|
|
* @package OC\Settings\Controller
|
|
*/
|
|
class SecuritySettingsControllerTest extends \PHPUnit_Framework_TestCase {
|
|
|
|
/** @var \OCP\AppFramework\IAppContainer */
|
|
private $container;
|
|
|
|
/** @var SecuritySettingsController */
|
|
private $securitySettingsController;
|
|
|
|
protected function setUp() {
|
|
$app = new Application();
|
|
$this->container = $app->getContainer();
|
|
$this->container['Config'] = $this->getMockBuilder('\OCP\IConfig')
|
|
->disableOriginalConstructor()->getMock();
|
|
$this->container['AppName'] = 'settings';
|
|
$this->securitySettingsController = $this->container['SecuritySettingsController'];
|
|
}
|
|
|
|
public function testTrustedDomainsWithExistingValues() {
|
|
$this->container['Config']
|
|
->expects($this->once())
|
|
->method('setSystemValue')
|
|
->with('trusted_domains', array('owncloud.org', 'owncloud.com', 'newdomain.com'));
|
|
$this->container['Config']
|
|
->expects($this->once())
|
|
->method('getSystemValue')
|
|
->with('trusted_domains')
|
|
->will($this->returnValue(array('owncloud.org', 'owncloud.com')));
|
|
|
|
$response = $this->securitySettingsController->trustedDomains('newdomain.com');
|
|
$expectedResponse = array('status' => 'success');
|
|
|
|
$this->assertSame($expectedResponse, $response);
|
|
}
|
|
|
|
public function testTrustedDomainsEmpty() {
|
|
$this->container['Config']
|
|
->expects($this->once())
|
|
->method('setSystemValue')
|
|
->with('trusted_domains', array('newdomain.com'));
|
|
$this->container['Config']
|
|
->expects($this->once())
|
|
->method('getSystemValue')
|
|
->with('trusted_domains')
|
|
->will($this->returnValue(''));
|
|
|
|
$response = $this->securitySettingsController->trustedDomains('newdomain.com');
|
|
$expectedResponse = array('status' => 'success');
|
|
|
|
$this->assertSame($expectedResponse, $response);
|
|
}
|
|
}
|