From bfbfcc8f881f4b0a5e1727504346f221fc19f7e2 Mon Sep 17 00:00:00 2001 From: Jonas Date: Tue, 5 Mar 2024 12:10:22 +0100 Subject: [PATCH] fix: Make URL pattern regexes match localhost and URLs with ports E.g. the file reference widget should work with links to Nextcloud on localhost. This adjusts the URL pattern regexes in server to be in sync with the ones in `@nextcloud/vue`. See nextcloud-libraries/nextcloud-vue#5176 for further details. Signed-off-by: Jonas --- core/src/OCP/comments.js | 2 +- lib/public/IURLGenerator.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/OCP/comments.js b/core/src/OCP/comments.js index cd1e8a8fa77b5..e67e2d7726c54 100644 --- a/core/src/OCP/comments.js +++ b/core/src/OCP/comments.js @@ -34,7 +34,7 @@ import $ from 'jquery' * * This is a copy of the backend regex in IURLGenerator, make sure to adjust both when changing */ -const urlRegex = /(\s|^)(https?:\/\/)((?:[-A-Z0-9+_]+\.)+[-A-Z]+(?:\/[-A-Z0-9+&@#%?=~_|!:,.;()]*)*)(\s|$)/ig +const urlRegex = /(\s|^)(https?:\/\/)([-A-Z0-9+_.]+(?::[0-9]+)?(?:\/[-A-Z0-9+&@#%?=~_|!:,.;()]*)*)(\s|$)/ig; /** * @param {any} content - diff --git a/lib/public/IURLGenerator.php b/lib/public/IURLGenerator.php index f62503f14ec84..0c7dc070778c5 100644 --- a/lib/public/IURLGenerator.php +++ b/lib/public/IURLGenerator.php @@ -51,7 +51,7 @@ interface IURLGenerator { * * @since 25.0.0 */ - public const URL_REGEX_NO_MODIFIERS = '(\s|\n|^)(https?:\/\/)((?:[-A-Z0-9+_]+\.)+[-A-Z]+(?:\/[-A-Z0-9+&@#%?=~_|!:,.;()]*)*)(\s|\n|$)'; + public const URL_REGEX_NO_MODIFIERS = '(\s|\n|^)(https?:\/\/)([-A-Z0-9+_.]+(?::[0-9]+)?(?:\/[-A-Z0-9+&@#%?=~_|!:,.;()]*)*)(\s|\n|$)'; /** * Returns the URL for a route