From bd11faa203800921c0cc89fddc7cd902d2d21c38 Mon Sep 17 00:00:00 2001 From: David Mehren Date: Fri, 30 Oct 2020 18:40:09 +0100 Subject: Use URL constructor instead of regex to check for valid URL Fixes #545 Co-authored-by: Yannick Bungers Signed-off-by: David Mehren --- public/js/extra.js | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/public/js/extra.js b/public/js/extra.js index a6b01a91..0a95b1b1 100644 --- a/public/js/extra.js +++ b/public/js/extra.js @@ -178,16 +178,11 @@ function slugifyWithUTF8 (text) { } export function isValidURL (str) { - const pattern = new RegExp('^(https?:\\/\\/)?' + // protocol - '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // domain name - '((\\d{1,3}\\.){3}\\d{1,3}))' + // OR ip (v4) address - '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // port and path - '(\\?[;&a-z\\d%_.~+=-]*)?' + // query string - '(\\#[-a-z\\d_]*)?$', 'i') // fragment locator - if (!pattern.test(str)) { + try { + const url = new URL(str) + return ['http:', 'https:'].includes(url.protocol) + } catch (e) { return false - } else { - return true } } -- cgit v1.2.3