Wrong invalid URL check; closes #7642 (#7648)

* Wrong invalid URL check; closes #7642 * Improve URL checks Co-authored-by: Cédric Anne <cedric.anne@gmail.com> Co-authored-by: Cédric Anne <cedric.anne@gmail.com>
glpi-project · Jul 10, 2020 · d76b785 · d76b785
1 parent b4bdbb7
commit d76b785
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/inc/toolbox.class.php b/inc/toolbox.class.php
@@ -3462,7 +3462,7 @@ public static function isAPIDeprecated(string $class): bool {
     */
    public static function isValidWebUrl($url): bool {
       return (preg_match(
-         '#^http[s]?://[a-z0-9\-_]+(\.([a-z0-9\-]+\.)?[a-z]+)?(:\d+)?(/.*)?$#i',
+         '#^http[s]?://[a-z0-9\-_]+(\.([a-z0-9\-]+\.)*[a-z]+)?(:\d+)?(/.*)?$#i',
          $url
       ) === 1);
    }

diff --git a/tests/units/Toolbox.php b/tests/units/Toolbox.php
@@ -909,6 +909,8 @@ protected function urlProvider() {
          ['http://my.host.com:8080 /', false],
          ['http://my.host.com: 8080/', false],
          ['http://my.host.com :8080/', false],
+         ['http://helpdesk.global.glpi-project.org', true],
+         ['http://dev.helpdesk.global.glpi-project.org', true],
       ];
    }