Skip to content

Commit

Permalink
fix: Make URL pattern regexes match localhost and URLs with ports
Browse files Browse the repository at this point in the history
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 <jonas@freesources.org>
  • Loading branch information
mejo- committed Mar 5, 2024
1 parent ad8cb2c commit bfbfcc8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion core/src/OCP/comments.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Check failure on line 37 in core/src/OCP/comments.js

View workflow job for this annotation

GitHub Actions / NPM lint

Extra semicolon

/**
* @param {any} content -
Expand Down
2 changes: 1 addition & 1 deletion lib/public/IURLGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit bfbfcc8

Please sign in to comment.