extern/bruno
1
0
Fork 1
mirror of https://github.com/usebruno/bruno.git synced 2025-01-03 04:29:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor code around https.Agent for flexibility

Browse Source
This commit is contained in:
Brent Shikoski 2023-09-08 21:23:27 -05:00
parent e328a4615e
commit 593210456a
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/bruno-cli/src/runner/run-single-request.js
View File

@ -47,26 +47,29 @@ const runSingleRequest = async function (filename, bruJson, collectionPath, coll
const options = getOptions();
const insecure = get(options, 'insecure', false);
const httpsAgentRequestFields = {};
if(insecure) {
request.httpsAgent = new https.Agent({
rejectUnauthorized: false
});
httpsAgentRequestFields['rejectUnauthorized'] = false;
}
else {
const cacertArray = [options['cacert'], process.env.SSL_CERT_FILE, process.env.NODE_EXTRA_CA_CERTS];
const cacertFile = cacertArray.find(el => el);
const cacert = cacertArray.find(el => el);
if (cacert && cacert.length > 1) {
try {
caCrt = fs.readFileSync(cacert)
request.httpsAgent = new https.Agent({
ca: caCrt
});
caCrt = fs.readFileSync(cacert);
httpsAgentRequestFields['ca'] = caCrt;
} catch(err) {
console.log('Error reading CA cert file:' + cacert, err);
}
}
}
if (Object.keys(httpsAgentRequestFields).length > 0) {
request.httpsAgent = new https.Agent({
...httpsAgentRequestFields
});
}
// stringify the request url encoded params
if(request.headers['content-type'] === 'application/x-www-form-urlencoded') {
request.data = qs.stringify(request.data);

18
packages/bruno-electron/src/ipc/network/index.js
View File

@ -148,11 +148,9 @@ const registerNetworkIpc = (mainWindow, watcher, lastOpenedCollections) => {
const preferences = getPreferences();
const sslVerification = get(preferences, 'request.sslVerification', true);
const httpsAgentRequestFields = {};
if(!sslVerification) {
request.httpsAgent = new https.Agent({
rejectUnauthorized: false
});
httpsAgentRequestFields['rejectUnauthorized'] = false;
}
else {
const cacertArray = [preferences['cacert'], process.env.SSL_CERT_FILE, process.env.NODE_EXTRA_CA_CERTS];
@ -160,16 +158,20 @@ const registerNetworkIpc = (mainWindow, watcher, lastOpenedCollections) => {
if (cacertFile && cacertFile.length > 1) {
try {
const fs = require('fs');
caCrt = fs.readFileSync(cacertFile)
request.httpsAgent = new https.Agent({
ca: caCrt
});
caCrt = fs.readFileSync(cacertFile);
httpsAgentRequestFields['ca'] = caCrt;
} catch(err) {
console.log('Error reading CA cert file:' + cacertFile, err);
}
}
}
if (Object.keys(httpsAgentRequestFields).length > 0) {
request.httpsAgent = new https.Agent({
...httpsAgentRequestFields
});
}
const response = await axios(request);
// run post-response vars