Skip to content

Fix for CVE-2022-37460 - Removed "shell=True", made args a list, and revised to handle stdin in function #96014

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

Closed
wants to merge 1 commit into from
Closed

Fix for CVE-2022-37460 - Removed "shell=True", made args a list, and revised to handle stdin in function #96014

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions Tools/scripts/get-remote-certificate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@
import sys
import tempfile

from subprocess import DEVNULL


def fetch_server_certificate (host, port):

def subproc(cmd):
def subproc(cmd, stdin=None):
from subprocess import Popen, PIPE, STDOUT
proc = Popen(cmd, stdout=PIPE, stderr=STDOUT, shell=True)
proc = Popen(cmd, stdout=PIPE, stderr=STDOUT, stdin=stdin)
status = proc.wait()
output = proc.stdout.read()
return status, output
Expand Down Expand Up @@ -50,15 +52,14 @@ def strip_to_x509_cert(certfile_contents, outfile=None):
with open(tfile, "w") as fp:
fp.write("quit\n")
try:
status, output = subproc(
'openssl s_client -connect "%s:%s" -showcerts < "%s"' %
(host, port, tfile))
cmd = ['openssl', 's_client', '-connect', '%s:%s' % (host, port), '-showcerts']
status, output = subproc(cmd, stdin=tfile)
finally:
os.unlink(tfile)
else:
status, output = subproc(
'openssl s_client -connect "%s:%s" -showcerts < /dev/null' %
(host, port))
cmd = ['openssl', 's_client', '-connect', '%s:%s' % (host, port), '-showcerts']
status, output = subproc(cmd, stdin=DEVNULL)

if status != 0:
raise RuntimeError('OpenSSL connect failed with status %s and '
'output: %r' % (status, output))
Expand Down