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

merge

Browse Source
This commit is contained in:
isaiM6
2022-08-01 16:21:38 -07:00
parent 5c7c355d95 6a33083790
commit 6a8a687616
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/hoppscotch-data/src/variables.ts
View File

@@ -40,6 +40,7 @@ export function parseTemplateStringEV(
let result = str let result = str
let depth = 0 let depth = 0
let errorBound = 0
while (result.match(REGEX_ENV_VAR) != null && depth <= ENV_MAX_EXPAND_LIMIT) { while (result.match(REGEX_ENV_VAR) != null && depth <= ENV_MAX_EXPAND_LIMIT) {
result = decodeURI(encodeURI(result)).replace( result = decodeURI(encodeURI(result)).replace(
@@ -50,18 +51,21 @@ export function parseTemplateStringEV(
} }
/** /**
* TODO: Create an error state when there is a suspected loop while recursively expanding these variables * TODO: Create an error statement for variables
*/ */
while (result.match(REGEX_MY_VAR) != null && depth <= ENV_MAX_EXPAND_LIMIT) { while (result.match(REGEX_MY_VAR) != null && errorBound <= ENV_MAX_EXPAND_LIMIT) {
result = decodeURI(encodeURI(result)).replace( result = decodeURI(encodeURI(result)).replace(
REGEX_MY_VAR, REGEX_MY_VAR,
(_, p1) => myVariables.find((x) => x.key === p1)?.value || "" (_, p1) => myVariables.find((x) => x.key === p1)?.value || ""
) )
errorBound++
} }
return depth > ENV_MAX_EXPAND_LIMIT if (depth <= ENV_MAX_EXPAND_LIMIT && errorBound <= ENV_MAX_EXPAND_LIMIT) {
? E.left(ENV_EXPAND_LOOP) return E.right(result)
: E.right(result) } else {
return E.left(ENV_EXPAND_LOOP)
}
} }
/** /**