Support non-http/https URL schemes

brandonkelly · brandonkelly · commit aecedbc9673a · 2024-04-19T10:48:44.000-07:00
Fixes #14830
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Fixed a bug where the Database Backup utility was present when the `backupCommand` config setting was set to `false`.
 - Fixed an error that occurred when running the `db/convert-charset` command, if any tables contained `char` or `varchar` foreign key columns. ([#14815](https://github.com/craftcms/cms/issues/14815))
 - Fixed a bug where parsed first/last names could have different casing than the full name that was submitted. ([#14723](https://github.com/craftcms/cms/issues/14723))
+- Fixed a bug where `craft\helpers\UrlHelper::isAbsoluteUrl()` was returning `false` for URLs with schemes other than `http` or `https`, such as `mailto` and `tel`. ([#14830](https://github.com/craftcms/cms/issues/14830))
 
 ## 4.8.9 - 2024-04-10
 
diff --git a/src/helpers/UrlHelper.php b/src/helpers/UrlHelper.php
@@ -27,7 +27,10 @@ class UrlHelper
      */
     public static function isAbsoluteUrl(string $url): bool
     {
-        return (str_starts_with($url, 'http://') || str_starts_with($url, 'https://'));
+        // From https://developer.apple.com/documentation/webkit/wkwebviewconfiguration/2875766-seturlschemehandler:
+        // > Scheme names are case sensitive, must start with an ASCII letter, and may contain only ASCII letters,
+        // > numbers, the “+” character, the “-” character, and the “.” character.
+        return (bool)preg_match('/^[a-z][a-z0-9+-.]*:/i', $url);
     }
 
     /**
diff --git a/tests/unit/helpers/UrlHelperTest.php b/tests/unit/helpers/UrlHelperTest.php
@@ -31,6 +31,8 @@ class UrlHelperTest extends TestCase
     public const NON_ABSOLUTE_URL = 'craftcms.com/';
     public const NON_ABSOLUTE_URL_WWW = 'www.craftcms.com/';
     public const PROTOCOL_RELATIVE_URL = '//craftcms.com/';
+    public const EMAIL_URL = 'mailto:test@abc.com';
+    public const TEL_URL = 'tel:+10123456789';
 
     /**
      * @var UnitTester
@@ -303,6 +305,8 @@ public function isAbsoluteUrlDataProvider(): array
             'absolute-url-www' => [true, self::ABSOLUTE_URL_WWW],
             'non-url' => [false, self::NON_ABSOLUTE_URL],
             'non-absolute-url-www' => [false, self::NON_ABSOLUTE_URL_WWW],
+            'email-url' => [true, self::EMAIL_URL],
+            'tel-url' => [true, self::TEL_URL],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,10 @@ class UrlHelper`
`27`	`27`	`*/`
`28`	`28`	`public static function isAbsoluteUrl(string $url): bool`
`29`	`29`	`{`
`30`		`- return (str_starts_with($url, 'http://') \|\| str_starts_with($url, 'https://'));`
	`30`	`+ // From https://developer.apple.com/documentation/webkit/wkwebviewconfiguration/2875766-seturlschemehandler:`
	`31`	`+ // > Scheme names are case sensitive, must start with an ASCII letter, and may contain only ASCII letters,`
	`32`	`+ // > numbers, the “+” character, the “-” character, and the “.” character.`
	`33`	`+ return (bool)preg_match('/^[a-z][a-z0-9+-.]*:/i', $url);`
`31`	`34`	`}`
`32`	`35`
`33`	`36`	`/**`