Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lgtm: Fix insecure SSL/TLS version by removing dead code

This commit is contained in:
Daniel Mensinger 2019-12-05 12:18:56 +01:00 committed by Michael Hirsch, Ph.D
parent 75133d5d12
commit e21f5959a5
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mesonbuild/wrap/wrap.py
View File

@ -34,7 +34,9 @@ if typing.TYPE_CHECKING:
import http.client import http.client
try: try:
import ssl # Importing is just done to check if SSL exists, so all warnings
# regarding 'imported but unused' can be safely ignored
import ssl # noqa
has_ssl = True has_ssl = True
API_ROOT = 'https://wrapdb.mesonbuild.com/v1/' API_ROOT = 'https://wrapdb.mesonbuild.com/v1/'
except ImportError: except ImportError:
@ -44,14 +46,6 @@ except ImportError:
req_timeout = 600.0 req_timeout = 600.0
ssl_warning_printed = False ssl_warning_printed = False
def build_ssl_context() -> 'ssl.SSLContext':
ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
ctx.options |= ssl.OP_NO_SSLv2
ctx.options |= ssl.OP_NO_SSLv3
ctx.verify_mode = ssl.CERT_REQUIRED
ctx.load_default_certs()
return ctx
def quiet_git(cmd: typing.List[str], workingdir: str) -> typing.Tuple[bool, str]: def quiet_git(cmd: typing.List[str], workingdir: str) -> typing.Tuple[bool, str]:
try: try:
pc = subprocess.run(['git', '-C', workingdir] + cmd, universal_newlines=True, pc = subprocess.run(['git', '-C', workingdir] + cmd, universal_newlines=True,
@ -66,7 +60,7 @@ def open_wrapdburl(urlstring: str) -> 'http.client.HTTPResponse':
global ssl_warning_printed global ssl_warning_printed
if has_ssl: if has_ssl:
try: try:
return urllib.request.urlopen(urlstring, timeout=req_timeout)# , context=build_ssl_context()) return urllib.request.urlopen(urlstring, timeout=req_timeout) # , context=ssl.create_default_context())
except urllib.error.URLError: except urllib.error.URLError:
if not ssl_warning_printed: if not ssl_warning_printed:
print('SSL connection failed. Falling back to unencrypted connections.', file=sys.stderr) print('SSL connection failed. Falling back to unencrypted connections.', file=sys.stderr)