url validator util

2026-01-15 19:41:06 +02:00
parent 5d443dda10
commit be228fa48a
3 changed files with 120 additions and 2 deletions
@@ -48,7 +48,7 @@ class UrlValidator
    {
        $siteUrl = rtrim($this->config->get('siteUrl') ?? '', '/');

-        if (str_starts_with($url, $siteUrl)) {
+        if (UrlValidatorUtil::validate($url, $siteUrl)) {
            return;
        }

@@ -60,7 +60,7 @@ class UrlValidator
        foreach ($portals as $portal) {
            $siteUrl = rtrim($portal->getUrl() ?? '', '/');

-            if (str_starts_with($url, $siteUrl)) {
+            if (UrlValidatorUtil::validate($url, $siteUrl)) {
                return;
            }
        }
@@ -0,0 +1,59 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2026 EspoCRM, Inc.
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Tools\UserSecurity\Password\Recovery;
+
+use const FILTER_VALIDATE_URL;
+use const PHP_URL_HOST;
+
+/**
+ * @internal
+ */
+class UrlValidatorUtil
+{
+    public static function validate(string $url, string $siteUrl): bool
+    {
+        $host = parse_url($url, PHP_URL_HOST);
+        $siteHost = parse_url($siteUrl, PHP_URL_HOST);
+
+        if ($host !== $siteHost) {
+            return false;
+        }
+
+        if (!filter_var($url, FILTER_VALIDATE_URL)) {
+            return false;
+        }
+
+        if (!str_starts_with($url, $siteUrl)) {
+            return false;
+        }
+
+        return true;
+    }
+}
@@ -0,0 +1,59 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2026 EspoCRM, Inc.
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace tests\unit\Espo\Tools\UserSecurity\Password;
+
+use Espo\Tools\UserSecurity\Password\Recovery\UrlValidatorUtil;
+use PHPUnit\Framework\TestCase;
+
+class UrlValidatorUtilTest extends TestCase
+{
+    public function testValidate(): void
+    {
+        $this->assertTrue(
+            UrlValidatorUtil::validate('https://test.com', 'https://test.com')
+        );
+
+        $this->assertTrue(
+            UrlValidatorUtil::validate('https://test.com/test', 'https://test.com')
+        );
+
+        $this->assertTrue(
+            UrlValidatorUtil::validate('https://test.com/test', 'https://test.com/test')
+        );
+
+        $this->assertFalse(
+            UrlValidatorUtil::validate('https://test.com.test', 'https://test.com')
+        );
+
+        $this->assertFalse(
+            UrlValidatorUtil::validate('https://test.com.test<test', 'https://test.com')
+        );
+    }
+}