btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Updated URL validation regex to be more lenient

Browse Source
This commit is contained in:
Andrew Bastin
2020-05-15 02:10:26 -04:00
parent ae9a9cf8cf
commit b1ffeb1f24
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
functions/utils/valid.js
View File

@@ -1,11 +1,6 @@
function generateIPRE(protocol) { function generateREForProtocol(protocol) {
return new RegExp( 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])$` `${protocol}[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b([-a-zA-Z0-9()@:%_\\+.~#?&\\/\\/=]*)`
)
}
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/])$`
) )
} }
@@ -14,9 +9,7 @@ function generateHostnameRE(protocol) {
*/ */
export function wsValid(url) { export function wsValid(url) {
const protocol = "^(wss?:\\/\\/)?" const protocol = "^(wss?:\\/\\/)?"
const validIP = generateIPRE(protocol) return generateREForProtocol(protocol).test(url)
const validHostname = generateHostnameRE(protocol)
return validIP.test(url) || validHostname.test(url)
} }
/** /**
@@ -24,9 +17,7 @@ export function wsValid(url) {
*/ */
export function sseValid(url) { export function sseValid(url) {
const protocol = "^(https?:\\/\\/)?" const protocol = "^(https?:\\/\\/)?"
const validIP = generateIPRE(protocol) return generateREForProtocol(protocol).test(url)
const validHostname = generateHostnameRE(protocol)
return validIP.test(url) || validHostname.test(url)
} }
/** /**
@@ -34,7 +25,5 @@ export function sseValid(url) {
*/ */
export function socketioValid(url) { export function socketioValid(url) {
const protocol = "^((wss?:\\/\\/)|(https?:\\/\\/))?" const protocol = "^((wss?:\\/\\/)|(https?:\\/\\/))?"
const validIP = generateIPRE(protocol) return generateREForProtocol(protocol).test(url)
const validHostname = generateHostnameRE(protocol)
return validIP.test(url) || validHostname.test(url)
} }