Skip to content

py2lcov and xml2lcov: Fix command injection from subprocess.run([..], shell=True, [..]) (fixes #350) #356

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

Merged
merged 3 commits into from
Dec 18, 2024
Merged

py2lcov and xml2lcov: Fix command injection from subprocess.run([..], shell=True, [..]) (fixes #350) #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd14040
xml2lcovutil.py: Extract variable lcov
hartwork Dec 18, 2024
170f36e
xml2lcov: Stop allowing command injection via xml2lcovutil.py
hartwork Dec 18, 2024
21bfd41
py2lcov: Stop allowing command injection
hartwork Dec 18, 2024
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
8 changes: 5 additions & 3 deletions bin/py2lcov
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,12 @@ Example:
while os.path.exists(xml):
xml = base + '.xml%d' % suffix
suffix += 1
cmd = "COVERAGE_FILE='%s' '%s' xml -o '%s'" % (f, args.cover_cmd, xml)
env = os.environ.copy()
env["COVERAGE_FILE"] = f
cmd = [args.cover_cmd, "xml", "-o", xml]
try:
#x = subprocess.run(cmd, capture_output=True, shell=True, check=True)
x = subprocess.run(cmd, shell=True, check=True, stdout=True, stderr=True)
#x = subprocess.run(cmd, capture_output=True, shell=False, check=True, env=env)
x = subprocess.run(cmd, shell=False, check=True, stdout=True, stderr=True, env=env)
except subprocess.CalledProcessError as err:
print("Error: error during XML conversion of %s: %s" % (
f, str(err)));
Expand Down
19 changes: 12 additions & 7 deletions bin/xml2lcovutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,14 +121,19 @@ def close(self):
self._outf.close()

if self._args.version and None == self._versionScript:
cmd = "'%(lcov)s' -a '%(info)s' -o '%(info)s' --version-script '%(vers)s' %(checksum)s--rc compute_file_version=1 --branch-coverage --ignore inconsistent" % {
'lcov': os.path.join(os.path.split(sys.argv[0])[0], 'lcov'),
'checksum': "--checksum " if self._args.checksum else '',
'info': self._args.output,
'vers' : self._args.version,
}
lcov = os.path.join(os.path.split(sys.argv[0])[0], 'lcov')
cmd = [
lcov,
"-a", self._args.output,
"-o", self._args.output,
"--version-script", self._args.version,
*(["--checksum"] if self._args.checksum else []),
"--rc", "compute_file_version=1",
"--branch-coverage",
"--ignore", "inconsistent",
]
try:
x = subprocess.run(cmd, shell=True, check=True, stdout=True, stderr=True)
x = subprocess.run(cmd, shell=False, check=True, stdout=True, stderr=True)
except subprocess.CalledProcessError as err:
print("Error during lcov version append operation: %s" % (
str(err)))
Expand Down