Ignore port for trusted domains

This lead to a lot of confusion in the past and did not really offer any value. Let's remove the port check therefore. (it's anyways not really a part of the domain)

Fixes https://github.com/owncloud/core/issues/12150 and https://github.com/owncloud/core/issues/12123 and also a problem reported by @DeepDiver1975.

diff --git a/config/config.sample.php b/config/config.sample.php
index a7f92d93615b2871a71a6516dcbb3f2535be0347..11c7a44b1ecc8f466f6d2c27576f07087a5232a5 100644 (file)
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -65,7 +65,7 @@ $CONFIG = array(
 'trusted_domains' =>
   array (
     'demo.example.org',
-    'otherdomain.example.org:8080',
+    'otherdomain.example.org',
   ),
 
 

diff --git a/lib/base.php b/lib/base.php
index 4cd9203248e90d9673552f18ed566d4108b60e5d..27b12339b243ea9c57de0d3a72db73037c310475 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -573,14 +573,8 @@ class OC {
                        header('HTTP/1.1 400 Bad Request');
                        header('Status: 400 Bad Request');
 
-                       $domain = $_SERVER['SERVER_NAME'];
-                       // Append port to domain in case it is not
-                       if($_SERVER['SERVER_PORT'] !== '80' && $_SERVER['SERVER_PORT'] !== '443') {
-                               $domain .= ':'.$_SERVER['SERVER_PORT'];
-                       }
-
                        $tmpl = new OCP\Template('core', 'untrustedDomain', 'guest');
-                       $tmpl->assign('domain', $domain);
+                       $tmpl->assign('domain', $_SERVER['SERVER_NAME']);
                        $tmpl->printPage();
 
                        exit();

diff --git a/lib/private/request.php b/lib/private/request.php
index 221a21a258f352d4f322dcd9a5ce2099bfd088ad..b9b237760881b33c79db414bbc7f671dc570e9d9 100644 (file)
--- a/lib/private/request.php
+++ b/lib/private/request.php
@@ -13,7 +13,7 @@ class OC_Request {
        const USER_AGENT_ANDROID_MOBILE_CHROME = '#Android.*Chrome/[.0-9]*#';
        const USER_AGENT_FREEBOX = '#^Mozilla/5\.0$#';
 
-       const REGEX_LOCALHOST = '/^(127\.0\.0\.1|localhost)(:[0-9]+|)$/';
+       const REGEX_LOCALHOST = '/^(127\.0\.0\.1|localhost)$/';
 
        /**
         * Check overwrite condition
@@ -36,13 +36,26 @@ class OC_Request {
         * have been configured
         */
        public static function isTrustedDomain($domain) {
-               $trustedList = \OC_Config::getValue('trusted_domains', array());
+               // Extract port from domain if needed
+               $pos = strrpos($domain, ':');
+               if ($pos !== false) {
+                       $port = substr($domain, $pos + 1);
+                       if (is_numeric($port)) {
+                               $domain = substr($domain, 0, $pos);
+                       }
+               }
+
+               // FIXME: Empty config array defaults to true for now. - Deprecate this behaviour with ownCloud 8.
+               $trustedList = \OC::$server->getConfig()->getSystemValue('trusted_domains', array());
                if (empty($trustedList)) {
                        return true;
                }
+
+               // Always allow access from localhost
                if (preg_match(self::REGEX_LOCALHOST, $domain) === 1) {
                        return true;
                }
+
                return in_array($domain, $trustedList);
        }
 

diff --git a/tests/lib/request.php b/tests/lib/request.php
index bff84e1b03f73200af6b0d24bed882ae2dfca715..07b6d4cc89b53b39d2744ce2ec091b231162bb8e 100644 (file)
--- a/tests/lib/request.php
+++ b/tests/lib/request.php
@@ -208,7 +208,7 @@ class Test_Request extends PHPUnit_Framework_TestCase {
        }
 
        public function trustedDomainDataProvider() {
-               $trustedHostTestList = array('host.one.test:8080', 'host.two.test:8080');
+               $trustedHostTestList = array('host.one.test', 'host.two.test', '[1fff:0:a88:85a3::ac1f]');
                return array(
                        // empty defaults to true
                        array(null, 'host.one.test:8080', true),
@@ -217,8 +217,12 @@ class Test_Request extends PHPUnit_Framework_TestCase {
 
                        // trust list when defined
                        array($trustedHostTestList, 'host.two.test:8080', true),
-                       array($trustedHostTestList, 'host.two.test:9999', false),
+                       array($trustedHostTestList, 'host.two.test:9999', true),
                        array($trustedHostTestList, 'host.three.test:8080', false),
+                       array($trustedHostTestList, 'host.two.test:8080:aa:222', false),
+                       array($trustedHostTestList, '[1fff:0:a88:85a3::ac1f]', true),
+                       array($trustedHostTestList, '[1fff:0:a88:85a3::ac1f]:801', true),
+                       array($trustedHostTestList, '[1fff:0:a88:85a3::ac1f]:801:34', false),
 
                        // trust localhost regardless of trust list
                        array($trustedHostTestList, 'localhost', true),