Skip to content

Security Fix for Remote Code Execution - huntr.dev #8

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.

Sign up for GitHub

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

Open
huntr-helper wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Security Fix for Remote Code Execution - huntr.dev #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b81de97
Fix Arbitary Code Execution
alromh87 Sep 9, 2020
7778d0e
Merge pull request #1 from alromh87/master
JamieSlome Sep 14, 2020
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
30 changes: 16 additions & 14 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,21 @@ function readBlob(repository, revision, file, callback) {
exports.readBlob = readBlob;

exports.getBranches = function(repository, callback) {
child.exec("git branch -l", {cwd: repository}, function(error, stdout) {
child.execFile("git", ["branch", "-l"], {cwd: repository}, function(error, stdout) {
if (error) return callback(error);
callback(null, stdout.split(/\n/).slice(0, -1).map(function(s) { return s.slice(2); }));
});
};

exports.getSha = function(repository, revision, callback) {
child.exec("git rev-parse '" + revision.replace(/'/g, "'\''") + "'", {cwd: repository}, function(error, stdout) {
child.execFile("git", ["rev-parse", revision.replace(/'/g, "'\''")], {cwd: repository}, function(error, stdout) {
if (error) return callback(error);
callback(null, stdout.trim());
});
};

exports.getBranchCommits = function(repository, callback) {
child.exec("git for-each-ref refs/heads/ --sort=-authordate --format='%(objectname)\t%(refname:short)\t%(authordate:iso8601)\t%(authoremail)'", {cwd: repository}, function(error, stdout) {
child.execFile("git", ["for-each-ref", "refs/heads/", "--sort=-authordate", "--format=%(objectname)\t%(refname:short)\t%(authordate:iso8601)\t%(authoremail)"], {cwd: repository}, function(error, stdout) {
if (error) return callback(error);
callback(null, stdout.split("\n").map(function(line) {
var fields = line.split("\t"),
Expand All @@ -66,9 +66,9 @@ exports.getBranchCommits = function(repository, callback) {

exports.getCommit = function(repository, revision, callback) {
if (arguments.length < 3) callback = revision, revision = null;
child.exec(shaRe.test(revision)
? "git log -1 --date=iso " + revision + " --format='%H\n%ad'"
: "git for-each-ref --count 1 --sort=-authordate 'refs/heads/" + (revision ? revision.replace(/'/g, "'\''") : "") + "' --format='%(objectname)\n%(authordate:iso8601)'", {cwd: repository}, function(error, stdout) {
child.execFile("git", shaRe.test(revision)
? ["log", "-1", "--date=iso", revision, "--format=%H\n%ad"]
: ["for-each-ref", "--count", "1", "--sort=-authordate", "refs/heads/" + (revision ? revision.replace(/'/g, "'\''") : ""), "--format=%(objectname)\n%(authordate:iso8601)"], {cwd: repository}, function(error, stdout) {
if (error) return callback(error);
var lines = stdout.split("\n"),
sha = lines[0],
Expand All @@ -83,22 +83,24 @@ exports.getCommit = function(repository, revision, callback) {

exports.getRelatedCommits = function(repository, branch, sha, callback) {
if (!shaRe.test(sha)) return callback(new Error("invalid SHA: " + sha));
child.exec("git log --format='%H' '" + branch.replace(/'/g, "'\''") + "' | grep -C1 " + sha, {cwd: repository}, function(error, stdout) {
child.execFile("git", ["--no-pager", "log", "--format='%H'", branch.replace(/'/g, "'\''")], {cwd: repository}, function(error, stdout) {
if (error) return callback(error);
var shas = stdout.split(/\n/),
i = shas.indexOf(sha);

const regRelCommits = new RegExp("(?:'([^(\r?\n)]*)'\r?\n)?'"+ sha + "'(?:\r?\n'([^(\r?\n)]*)'\r?\n)?")

const match = regRelCommits.exec(stdout)

callback(null, {
previous: shas[i + 1],
next: shas[i - 1]
previous: match[1] || '',
next: match[2] || ''
});
});
};

exports.listCommits = function(repository, sha1, sha2, callback) {
if (!shaRe.test(sha1)) return callback(new Error("invalid SHA: " + sha1));
if (!shaRe.test(sha2)) return callback(new Error("invalid SHA: " + sha2));
child.exec("git log --format='%H\t%ad' " + sha1 + ".." + sha2, {cwd: repository}, function(error, stdout) {
child.execFile("git", ["log", "--format=%H\t%ad", sha1 + ".." + sha2], {cwd: repository}, function(error, stdout) {
if (error) return callback(error);
callback(null, stdout.split(/\n/).slice(0, -1).map(function(commit) {
var fields = commit.split(/\t/);
Expand All @@ -111,7 +113,7 @@ exports.listCommits = function(repository, sha1, sha2, callback) {
};

exports.listAllCommits = function(repository, callback) {
child.exec("git log --branches --format='%H\t%ad\t%an\t%s'", {cwd: repository}, function(error, stdout) {
child.execFile("git", ["log", "--branches", "--format='%H\t%ad\t%an\t%s'"], {cwd: repository}, function(error, stdout) {
if (error) return callback(error);
callback(null, stdout.split(/\n/).slice(0, -1).map(function(commit) {
var fields = commit.split(/\t/);
Expand All @@ -126,7 +128,7 @@ exports.listAllCommits = function(repository, callback) {
};

exports.listTree = function(repository, revision, callback) {
child.exec("git ls-tree -r " + revision, {cwd: repository}, function(error, stdout) {
child.execFile("git", ["ls-tree", "-r", revision], {cwd: repository}, function(error, stdout) {
if (error) return callback(error);
callback(null, stdout.split(/\n/).slice(0, -1).map(function(commit) {
var fields = commit.split(/\t/);
Expand Down