cybercyst/bruno
1
0
Fork 0
mirror of https://github.com/usebruno/bruno.git synced 2025-05-05 23:42:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Line-breaks in $<mock> built-ins are breaking JSON req body

Browse Source
This commit is contained in:
ramki-bruno 2025-04-11 12:34:19 +05:30
parent c950806541
commit 6ff49589be
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/bruno-electron/src/ipc/network/interpolate-vars.js
View File

@ -14,13 +14,25 @@ const getContentType = (headers = {}) => {
return contentType; return contentType;
}; };
const interpolateMockVars = (str) => { const interpolateMockVars = (str, { escapeJSONStrings }) => {
const patternRegex = /\{\{\$(\w+)\}\}/g; const patternRegex = /\{\{\$(\w+)\}\}/g;
return str.replace(patternRegex, (match, keyword) => { return str.replace(patternRegex, (match, keyword) => {
const replacement = mockDataFunctions[keyword]?.(); let replacement = mockDataFunctions[keyword]?.();
if (replacement === undefined) return match; if (replacement === undefined) return match;
return String(replacement); replacement = String(replacement);
if (!escapeJSONStrings) return replacement;
// All the below chars inside of a JSON String field
// will make it invalid JSON. So we will have to escape them with `\`.
// This is not exhaustive but selective to what faker-js can output.
if (!/[\\\n\r\t\"]/.test(replacement)) return replacement;
return replacement
.replace(/\\/g, '\\\\')
.replace(/\n/g, '\\n')
.replace(/\r/g, '\\r')
.replace(/\t/g, '\\t')
.replace(/\"/g, '\\"');
}); });
}; };
@ -45,7 +57,7 @@ const interpolateVars = (request, envVariables = {}, runtimeVariables = {}, proc
}); });
}); });
const _interpolate = (str) => { const _interpolate = (str, { escapeJSONStrings } = {}) => {
if (!str || !str.length || typeof str !== 'string') { if (!str || !str.length || typeof str !== 'string') {
return str; return str;
} }
@ -66,7 +78,7 @@ const interpolateVars = (request, envVariables = {}, runtimeVariables = {}, proc
} }
}; };
return interpolateMockVars(interpolate(str, combinedVars)); return interpolateMockVars(interpolate(str, combinedVars), { escapeJSONStrings });
}; };
request.url = _interpolate(request.url); request.url = _interpolate(request.url);
@ -85,12 +97,12 @@ const interpolateVars = (request, envVariables = {}, runtimeVariables = {}, proc
if (contentType.includes('json') && !Buffer.isBuffer(request.data)) { if (contentType.includes('json') && !Buffer.isBuffer(request.data)) {
if (typeof request.data === 'string') { if (typeof request.data === 'string') {
if (request.data.length) { if (request.data.length) {
request.data = _interpolate(request.data); request.data = _interpolate(request.data, { escapeJSONStrings: true });
} }
} else if (typeof request.data === 'object') { } else if (typeof request.data === 'object') {
try { try {
let parsed = JSON.stringify(request.data); const jsonDoc = JSON.stringify(request.data);
parsed = _interpolate(parsed); const parsed = _interpolate(jsonDoc, { escapeJSONStrings: true });
request.data = JSON.parse(parsed); request.data = JSON.parse(parsed);
} catch (err) {} } catch (err) {}
} }