diff --git a/functions/utils/valid.js b/functions/utils/valid.js index 3ca6c461d..745872e45 100644 --- a/functions/utils/valid.js +++ b/functions/utils/valid.js @@ -1,11 +1,10 @@ -function generateIPRE(protocol) { +const wsRegex = generateREForProtocol("^(wss?:\\/\\/)?") +const sseRegex = generateREForProtocol("^(https?:\\/\\/)?") +const socketioRegex = generateREForProtocol("^((wss?:\\/\\/)|(https?:\\/\\/))?") + +function generateREForProtocol(protocol) { return new RegExp( - `${protocol}(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]).){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$` - ) -} -function generateHostnameRE(protocol) { - return new RegExp( - `${protocol}(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]).)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9/])$` + `${protocol}[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b([-a-zA-Z0-9()@:%_\\+.~#?&\\/\\/=]*)` ) } @@ -13,28 +12,19 @@ function generateHostnameRE(protocol) { * valid url for ws/wss */ export function wsValid(url) { - const protocol = "^(wss?:\\/\\/)?" - const validIP = generateIPRE(protocol) - const validHostname = generateHostnameRE(protocol) - return validIP.test(url) || validHostname.test(url) + return wsRegex.test(url) } /** * valid url for http/https */ export function sseValid(url) { - const protocol = "^(https?:\\/\\/)?" - const validIP = generateIPRE(protocol) - const validHostname = generateHostnameRE(protocol) - return validIP.test(url) || validHostname.test(url) + return sseRegex.test(url) } /** * valid url for ws/wss/http/https */ export function socketioValid(url) { - const protocol = "^((wss?:\\/\\/)|(https?:\\/\\/))?" - const validIP = generateIPRE(protocol) - const validHostname = generateHostnameRE(protocol) - return validIP.test(url) || validHostname.test(url) + return socketioRegex.test(url) }