From b49e215617fc16d63d5795fd9ef6dd1f5794b1e7 Mon Sep 17 00:00:00 2001 From: Andrew Bastin Date: Fri, 15 May 2020 02:14:24 -0400 Subject: [PATCH] Refactor Realtime URL validation functions --- functions/utils/valid.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/functions/utils/valid.js b/functions/utils/valid.js index 1969969f2..745872e45 100644 --- a/functions/utils/valid.js +++ b/functions/utils/valid.js @@ -1,3 +1,7 @@ +const wsRegex = generateREForProtocol("^(wss?:\\/\\/)?") +const sseRegex = generateREForProtocol("^(https?:\\/\\/)?") +const socketioRegex = generateREForProtocol("^((wss?:\\/\\/)|(https?:\\/\\/))?") + function generateREForProtocol(protocol) { return new RegExp( `${protocol}[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b([-a-zA-Z0-9()@:%_\\+.~#?&\\/\\/=]*)` @@ -8,22 +12,19 @@ function generateREForProtocol(protocol) { * valid url for ws/wss */ export function wsValid(url) { - const protocol = "^(wss?:\\/\\/)?" - return generateREForProtocol(protocol).test(url) + return wsRegex.test(url) } /** * valid url for http/https */ export function sseValid(url) { - const protocol = "^(https?:\\/\\/)?" - return generateREForProtocol(protocol).test(url) + return sseRegex.test(url) } /** * valid url for ws/wss/http/https */ export function socketioValid(url) { - const protocol = "^((wss?:\\/\\/)|(https?:\\/\\/))?" - return generateREForProtocol(protocol).test(url) + return socketioRegex.test(url) }