aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <morris.jobke@gmail.com>2013-08-26 02:59:31 -0700
committerMorris Jobke <morris.jobke@gmail.com>2013-08-26 02:59:31 -0700
commit653bc9a477a6f4833d9f34e1442d419cbb9429f8 (patch)
treed8df141fd4d3ffe4437ca2ccace8c3b98b938343
parenta5873a96fa769e6281084ad50b2fb10d5040247b (diff)
parent85f1de884fc2d582a9c66ec3d3b783b9e0a5ccaa (diff)
downloadnextcloud-server-653bc9a477a6f4833d9f34e1442d419cbb9429f8.tar.gz
nextcloud-server-653bc9a477a6f4833d9f34e1442d419cbb9429f8.zip
Merge pull request #4281 from owncloud/ie8-multiselect
Better ie8 multiselect
-rw-r--r--core/css/multiselect.css7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/css/multiselect.css b/core/css/multiselect.css
index a2d1b20d3a5..c25446808ea 100644
--- a/core/css/multiselect.css
+++ b/core/css/multiselect.css
@@ -103,3 +103,10 @@ ul.multiselectoptions > li.creator > input {
padding: 5px;
margin: -5px;
}
+
+.ie8 div.multiselect span:first-child {
+ display:block;
+ position:relative;
+ width: 90%;
+ margin-right:-1px;
+}
ref='#n150'>150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307
<?php
/**
 * Copyright (c) 2013 Thomas Müller <thomas.mueller@tmit.eu>
 * This file is licensed under the Affero General Public License version 3 or
 * later.
 * See the COPYING-README file.
 */

class Test_Request extends PHPUnit_Framework_TestCase {

	public function setUp() {
		OC::$server->getConfig()->setSystemValue('overwritewebroot', '/domain.tld/ownCloud');

		OC::$server->getConfig()->setSystemValue('trusted_proxies', array());
		OC::$server->getConfig()->setSystemValue('forwarded_for_headers', array());
	}

	public function tearDown() {
		OC::$server->getConfig()->setSystemValue('overwritewebroot', '');
		OC::$server->getConfig()->setSystemValue('trusted_proxies', array());
		OC::$server->getConfig()->setSystemValue('forwarded_for_headers', array());
	}

	public function testScriptNameOverWrite() {
		$_SERVER['REMOTE_ADDR'] = '10.0.0.1';
		$_SERVER['SCRIPT_FILENAME'] = __FILE__;

		$scriptName = OC_Request::scriptName();
		$this->assertEquals('/domain.tld/ownCloud/tests/lib/request.php', $scriptName);
	}

	public function testGetRemoteAddress() {
		$_SERVER['REMOTE_ADDR'] = '10.0.0.2';
		$_SERVER['HTTP_X_FORWARDED'] = '10.4.0.5, 10.4.0.4';
		$_SERVER['HTTP_X_FORWARDED_FOR'] = '192.168.0.233';

		// Without having specified a trusted remote address
		$this->assertEquals('10.0.0.2', OC_Request::getRemoteAddress());

		// With specifying a trusted remote address but no trusted header
		OC::$server->getConfig()->setSystemValue('trusted_proxies', array('10.0.0.2'));
		$this->assertEquals('10.0.0.2', OC_Request::getRemoteAddress());

		// With specifying a trusted remote address and trusted headers
		OC::$server->getConfig()->setSystemValue('trusted_proxies', array('10.0.0.2'));
		OC::$server->getConfig()->setSystemValue('forwarded_for_headers', array('HTTP_X_FORWARDED'));
		$this->assertEquals('10.4.0.5', OC_Request::getRemoteAddress());
		OC::$server->getConfig()->setSystemValue('forwarded_for_headers', array('HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR', 'HTTP_X_FORWARDED'));
		$this->assertEquals('192.168.0.233', OC_Request::getRemoteAddress());

		// With specifying multiple trusted remote addresses and trusted headers
		OC::$server->getConfig()->setSystemValue('trusted_proxies', array('10.3.4.2', '10.0.0.2', '127.0.3.3'));
		OC::$server->getConfig()->setSystemValue('forwarded_for_headers', array('HTTP_X_FORWARDED'));
		$this->assertEquals('10.4.0.5', OC_Request::getRemoteAddress());
		OC::$server->getConfig()->setSystemValue('forwarded_for_headers', array('HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR', 'HTTP_X_FORWARDED'));
		$this->assertEquals('192.168.0.233', OC_Request::getRemoteAddress());
	}

	/**
	 * @dataProvider rawPathInfoProvider
	 * @param $expected
	 * @param $requestUri
	 * @param $scriptName
	 */
	public function testRawPathInfo($expected, $requestUri, $scriptName) {
		$_SERVER['REQUEST_URI'] = $requestUri;
		$_SERVER['SCRIPT_NAME'] = $scriptName;
		$rawPathInfo = OC_Request::getRawPathInfo();
		$this->assertEquals($expected, $rawPathInfo);
	}

	function rawPathInfoProvider() {
		return array(
			array('/core/ajax/translations.php', 'index.php/core/ajax/translations.php', 'index.php'),
			array('/core/ajax/translations.php', '/index.php/core/ajax/translations.php', '/index.php'),
			array('/core/ajax/translations.php', '//index.php/core/ajax/translations.php', '/index.php'),
			array('', '/oc/core', '/oc/core/index.php'),
			array('', '/oc/core/', '/oc/core/index.php'),
			array('', '/oc/core/index.php', '/oc/core/index.php'),
			array('/core/ajax/translations.php', '/core/ajax/translations.php', 'index.php'),
			array('/core/ajax/translations.php', '//core/ajax/translations.php', '/index.php'),
			array('/core/ajax/translations.php', '/oc/core/ajax/translations.php', '/oc/index.php'),
			array('/1', '/oc/core/1', '/oc/core/index.php'),
		);
	}

	/**
	 * @dataProvider rawPathInfoThrowsExceptionProvider
	 * @expectedException Exception
	 *
	 * @param $requestUri
	 * @param $scriptName
	 */
	public function testRawPathInfoThrowsException($requestUri, $scriptName) {
		$_SERVER['REQUEST_URI'] = $requestUri;
		$_SERVER['SCRIPT_NAME'] = $scriptName;
		OC_Request::getRawPathInfo();
	}

	function rawPathInfoThrowsExceptionProvider() {
		return array(
			array('/oc/core1', '/oc/core/index.php'),
		);
	}

	/**
	 * @dataProvider userAgentProvider
	 */
	public function testUserAgent($testAgent, $userAgent, $matches) {
		$_SERVER['HTTP_USER_AGENT'] = $testAgent;
		$this->assertEquals($matches, OC_Request::isUserAgent($userAgent));
	}

	function userAgentProvider() {
		return array(
			array(
				'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0)',
				OC_Request::USER_AGENT_IE,
				true
			),
			array(
				'Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Firefox/24.0',
				OC_Request::USER_AGENT_IE,
				false
			),
			array(
				'Mozilla/5.0 (Linux; Android 4.4; Nexus 4 Build/KRT16S) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.59 Mobile Safari/537.36',
				OC_Request::USER_AGENT_ANDROID_MOBILE_CHROME,
				true
			),
			array(
				'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0)',
				OC_Request::USER_AGENT_ANDROID_MOBILE_CHROME,
				false
			),
			// test two values
			array(
				'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0)',
				array(
					OC_Request::USER_AGENT_IE,
					OC_Request::USER_AGENT_ANDROID_MOBILE_CHROME,
				),
				true
			),
			array(
				'Mozilla/5.0 (Linux; Android 4.4; Nexus 4 Build/KRT16S) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.59 Mobile Safari/537.36',
				array(
					OC_Request::USER_AGENT_IE,
					OC_Request::USER_AGENT_ANDROID_MOBILE_CHROME,
				),
				true
			),
			array(
				'Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Firefox/24.0',
				OC_Request::USER_AGENT_FREEBOX,
				false
			),
			array(
				'Mozilla/5.0',
				OC_Request::USER_AGENT_FREEBOX,
				true
			),
			array(
				'Fake Mozilla/5.0',
				OC_Request::USER_AGENT_FREEBOX,
				false
			),
		);
	}

	public function testInsecureServerHost() {
		unset($_SERVER['HTTP_X_FORWARDED_HOST']);
		unset($_SERVER['HTTP_HOST']);
		unset($_SERVER['SERVER_NAME']);
		$_SERVER['SERVER_NAME'] = 'from.server.name:8080';
		$host = OC_Request::insecureServerHost();
		$this->assertEquals('from.server.name:8080', $host);

		$_SERVER['HTTP_HOST'] = 'from.host.header:8080';
		$host = OC_Request::insecureServerHost();
		$this->assertEquals('from.host.header:8080', $host);

		$_SERVER['HTTP_X_FORWARDED_HOST'] = 'from.forwarded.host:8080';
		$host = OC_Request::insecureServerHost();
		$this->assertEquals('from.forwarded.host:8080', $host);

		$_SERVER['HTTP_X_FORWARDED_HOST'] = 'from.forwarded.host2:8080,another.one:9000';
		$host = OC_Request::insecureServerHost();
		$this->assertEquals('from.forwarded.host2:8080', $host);

		// clean up
		unset($_SERVER['HTTP_X_FORWARDED_HOST']);
		unset($_SERVER['HTTP_HOST']);
		unset($_SERVER['SERVER_NAME']);
	}

	public function testGetOverwriteHost() {
		unset($_SERVER['REMOTE_ADDR']);
		OC_Config::deleteKey('overwritecondaddr');
		OC_Config::deleteKey('overwritehost');
		$host = OC_Request::getOverwriteHost();
		$this->assertNull($host);

		OC_Config::setValue('overwritehost', '');
		$host = OC_Request::getOverwriteHost();
		$this->assertNull($host);

		OC_Config::setValue('overwritehost', 'host.one.test:8080');
		$host = OC_Request::getOverwriteHost();
		$this->assertEquals('host.one.test:8080', $host);

		$_SERVER['REMOTE_ADDR'] = 'somehost.test:8080';
		OC_Config::setValue('overwritecondaddr', '^somehost\..*$');
		$host = OC_Request::getOverwriteHost();
		$this->assertEquals('host.one.test:8080', $host);

		OC_Config::setValue('overwritecondaddr', '^somethingelse.*$');
		$host = OC_Request::getOverwriteHost();
		$this->assertNull($host);

		// clean up
		unset($_SERVER['REMOTE_ADDR']);
		OC_Config::deleteKey('overwritecondaddr');
		OC_Config::deleteKey('overwritehost');
	}

	/**
	 * @dataProvider trustedDomainDataProvider
	 */
	public function testIsTrustedDomain($trustedDomains, $testDomain, $result) {
		OC_Config::deleteKey('trusted_domains');
		if ($trustedDomains !== null) {
			OC_Config::setValue('trusted_domains', $trustedDomains);
		}

		$this->assertEquals($result, OC_Request::isTrustedDomain($testDomain));

		// clean up
		OC_Config::deleteKey('trusted_domains');
	}

	public function trustedDomainDataProvider() {
		$trustedHostTestList = array('host.one.test:8080', 'host.two.test:8080');
		return array(
			// empty defaults to true
			array(null, 'host.one.test:8080', true),
			array('', 'host.one.test:8080', true),
			array(array(), 'host.one.test:8080', true),

			// trust list when defined
			array($trustedHostTestList, 'host.two.test:8080', true),
			array($trustedHostTestList, 'host.two.test:9999', false),
			array($trustedHostTestList, 'host.three.test:8080', false),

			// trust localhost regardless of trust list
			array($trustedHostTestList, 'localhost', true),
			array($trustedHostTestList, 'localhost:8080', true),
			array($trustedHostTestList, '127.0.0.1', true),
			array($trustedHostTestList, '127.0.0.1:8080', true),

			// do not trust invalid localhosts
			array($trustedHostTestList, 'localhost:1:2', false),
			array($trustedHostTestList, 'localhost: evil.host', false),
		);
	}

	public function testServerHost() {
		OC_Config::deleteKey('overwritecondaddr');
		OC_Config::setValue('overwritehost', 'overwritten.host:8080');
		OC_Config::setValue(
			'trusted_domains',
			array(
				'trusted.host:8080',
				'second.trusted.host:8080'
			)
		);
		$_SERVER['HTTP_HOST'] = 'trusted.host:8080';

		// CLI always gives localhost
		$oldCLI = OC::$CLI;
		OC::$CLI = true;
		$host = OC_Request::serverHost();
		$this->assertEquals('localhost', $host);
		OC::$CLI = false;

		// overwritehost overrides trusted domain
		$host = OC_Request::serverHost();
		$this->assertEquals('overwritten.host:8080', $host);

		// trusted domain returned when used
		OC_Config::deleteKey('overwritehost');
		$host = OC_Request::serverHost();
		$this->assertEquals('trusted.host:8080', $host);

		// trusted domain returned when untrusted one in header
		$_SERVER['HTTP_HOST'] = 'untrusted.host:8080';
		OC_Config::deleteKey('overwritehost');
		$host = OC_Request::serverHost();
		$this->assertEquals('trusted.host:8080', $host);

		// clean up
		OC_Config::deleteKey('overwritecondaddr');
		OC_Config::deleteKey('overwritehost');
		unset($_SERVER['HTTP_HOST']);
		OC::$CLI = $oldCLI;
	}
}