Skip to content

replaced request library with axios library to remove vulnerabilities #298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 25 additions & 10 deletions commands/build_info.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const request = require("request");
const https = require('https');
const axios = require('axios');
const constants = require("./utils/constants.js");
const process = require("process");

Expand Down Expand Up @@ -40,6 +41,7 @@ function get_build_info(args) {
}
}
let options = {
method: 'get',
url: constants[env].BUILD_BASE_URL + args.buildId,
auth: {
username: username,
Expand All @@ -55,25 +57,38 @@ function get_build_info(args) {
return;
} else {
if (args["reject_unauthorized"] == "false") {
options["rejectUnauthorized"] = false;
options.httpsAgent = new https.Agent({ rejectUnauthorized: false });
console.log("Setting rejectUnauthorized to false for web requests");
}
}
}

request.get(options, (err, res, body) => {
if (err) {
reject(err);
axios(options)
.then(response => {
if (response.data.status == "success") {
resolve(response.data.data);
} else {
if (res.statusCode == "401") {
resolve(response.data.message);
}
})
.catch(error => {
if (error.response) {
// The request was made and the server responded with a status code
// that falls out of the range of 2xx
if (error.response.status == 401) {
resolve("Unauthorized");
} else if (JSON.parse(body).status == "success") {
resolve(JSON.parse(body).data);
} else {
resolve(JSON.parse(body).message);
console.log(error.response.data);
}
} else if (error.request) {
// The request was made but no response was received
// `error.request` is an instance of XMLHttpRequest in the browser and an instance of
// http.ClientRequest in node.js
console.log(error.cause);
} else {
reject(error);
}
});
})
});
}

Expand Down
55 changes: 28 additions & 27 deletions commands/build_stop.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const request = require("request");
const https = require('https');
const axios = require('axios');
const constants = require("./utils/constants.js");
const process = require("process");
const fs = require("fs");
Expand Down Expand Up @@ -66,6 +67,7 @@ function stop_session(args) {
}

let options = {
method: 'put',
url: constants[env].BUILD_STOP_URL + args.session_id,
headers: {
Authorization: "Token " + access_key,
Expand All @@ -82,39 +84,38 @@ function stop_session(args) {
return;
} else {
if (args["reject_unauthorized"] == "false") {
options["rejectUnauthorized"] = false;
options.httpsAgent = new https.Agent({ rejectUnauthorized: false });
console.log("Setting rejectUnauthorized to false for web requests");
}
}
}
request.put(options, function (err, resp, body) {
if (err) {
reject(err);

axios(options)
.then(response => {
if(response.data.length == 0){
resolve("No tests to stop in session " + args.session_id);
} else {
try {
responseData = JSON.parse(body);
} catch (e) {
console.log("Error in JSON response", body);
responseData = null;
}
if (resp.statusCode != 200) {
if (responseData && responseData["error"]) {
reject(responseData["error"]);
} else {
console.log(responseData);
reject("error", responseData);
}
} else {
if (responseData.length == 0) {
resolve("No tests to stop in session " + args.session_id);
}
resolve(
"Session Stopped successfully, No. of tests stopped are: " +
responseData.length
);
resolve(
"Session Stopped successfully, No. of tests stopped are: " +
response.data.length
);
}
})
.catch(error => {
if (error.response != null) {
if (error.response.status != 200) {
reject(error.response.data)
}
} else if (error.request) {
// The request was made but no response was received
// `error.request` is an instance of XMLHttpRequest in the browser and an instance of http.ClientRequest in node.js
reject(error.cause);
} else {
reject(error);
}
});
})


});
}

Expand Down
82 changes: 56 additions & 26 deletions commands/generate_reports.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const request = require("request");
const https = require('https');
const axios = require('axios');
const constants = require("./utils/constants.js");
const process = require("process");
const build_stats = require("./utils/poller/build_stats.js");
Expand Down Expand Up @@ -27,33 +28,34 @@ function download_artefact(
const stream = fs.createWriteStream(file_path);
stream.end();
let options = {
method: 'get',
url: constants[env].REPORT_URL + test_id,
auth: {
username: username,
password: access_key,
},
gzip: true,
timeout: 120000,
responseType: 'stream'
};
if (rejectUnauthorized == false) {
options["rejectUnauthorized"] = false;
options.httpsAgent = new https.Agent({ rejectUnauthorized: false });
console.log("Setting rejectUnauthorized to false for web requests");
}

request(options, (err, res, body) => {
if (err) {
reject(err);
}
response_code = res.statusCode;
resp = res
}).pipe(
fs
.createWriteStream(file_path, {
axios(options)
.then((response) => {
response_code = response.status;
resp = response;
response.data.pipe(
fs.createWriteStream(file_path, {
overwrite: true,
})
.on("finish", function () {
if (response_code == 200) {
const zip = new StreamZip({ file: file_path });
);

response.data.on('end', function () {
if (response_code == 200) {
const zip = new StreamZip({ file: file_path });
zip.on("ready", () => {
zip.extract(null, old_path, (err, count) => {
zip.close();
Expand All @@ -64,18 +66,37 @@ function download_artefact(
: `Extracted ${count} entries for ` + test_id
);
});
});
} else {
fs.unlinkSync(file_path);
if (resp.body != null) {
const responseObject = JSON.parse(resp.body);
const dataValue = responseObject.data;
reject("Could not download artefacts for test id " + test_id + " with reason " + dataValue);
}
reject("Could not download artefacts for test id " + test_id);
})
}
});

})
.catch((error) => {

if (error.response) {
resp = error.response
// The request was made and the server responded with a status code
// that falls out of the range of 2xx
if (error.response.status == 401) {
resolve("Unauthorized");
} else {
fs.unlinkSync(file_path);
if (resp.data != null) {
const responseObject = resp.data;
const dataValue = responseObject.data;
reject("Could not download artefacts for test id " + test_id + " with reason " + dataValue);
}
})
);
reject("Could not download artefacts for test id " + test_id);
}
} else if (error.request) {
console.log(error.cause);
} else {
reject(error);
}

});


});
}

Expand Down Expand Up @@ -233,6 +254,15 @@ function generate_report(args) {
});
}

function generate_report_command(args) {
generate_report(args)
.then(function (resp) {})
.catch(function (err) {
console.log("ERR:", err);
});
};

module.exports = {
generate_report:generate_report
generate_report:generate_report,
generate_report_command:generate_report_command
};
55 changes: 32 additions & 23 deletions commands/utils/batch/batch_runner.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ const process = require("process");
const archive = require("../archive.js");
const WebSocket = require("ws");
const { type } = require("os");
const request = require("request");
const { del } = require("request");
const { delete_archive } = require("../archive.js");
const poller = require("../poller/poller.js");
const builds = require("../poller/build");
const batcher = require("./batcher.js");
const reports = require("../../../commands/generate_reports.js");
const { fail } = require("yargs");
const https = require('https');
const axios = require('axios');

var batchCounter = 0;
var totalBatches = 0;
Expand All @@ -23,30 +23,18 @@ function run_test(payload, env = "prod", rejectUnauthorized) {
return new Promise(function (resolve, reject) {
let options = {
url: constants[env].INTEGRATION_BASE_URL + constants.RUN_URL,
body: payload,
data: payload,
};
if (rejectUnauthorized == false) {
options["rejectUnauthorized"] = false;
options.httpsAgent = new https.Agent({ rejectUnauthorized: false });
}
let responseData = null;
request.post(options, function (err, resp, body) {
if (err) {
reject(err);
} else {
try {
responseData = JSON.parse(body);
} catch (e) {
console.log("Error in JSON response", body);
responseData = null;
}
if (resp.statusCode != 200) {
if (responseData && responseData["error"]) {
reject(responseData["error"]);
} else {
reject(responseData);
}
} else {
build_id = responseData["value"]["message"]

axios.post(options.url, options.data, options)
.then(response => {
responseData = response.data;
// console.log(response);
build_id = responseData["value"]["message"]
.split("=")
[responseData["value"]["message"].split("=").length - 1].split(
"&"
Expand Down Expand Up @@ -79,9 +67,30 @@ function run_test(payload, env = "prod", rejectUnauthorized) {
}
resolve(session_id);
}
})
.catch(error => {
if (error.response) {
// The request was made and the server responded with a status code
// that falls out of the range of 2xx
if (error.response.status != 200) {
if (error.response && error.response.data) {
reject(error.response.data);
} else {
reject(error.response);
}
} else {
reject(error.response);
}
} else if (error.request) {
// The request was made but no response was received
// `error.request` is an instance of XMLHttpRequest in the browser and an instance of
// http.ClientRequest in node.js
reject(error.cause);
} else {
reject(error);
}
});
})

});
}

Expand Down
Loading