Skip to content

bpo-40163: Fix multissltest download of old OpenSSL (GH-19329) #19329

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
tiran merged 1 commit into from
May 15, 2020
Merged

bpo-40163: Fix multissltest download of old OpenSSL (GH-19329) #19329

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Tools-Demos/2020-04-03-08-32-31.bpo-40163.lX8K4B.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix multissltest tool. OpenSSL has changed download URL for old releases.
The multissltest tool now tries to download from current and old download
URLs.
52 changes: 41 additions & 11 deletions Tools/ssl/multissltests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,12 @@
import os
try:
from urllib.request import urlopen
from urllib.error import HTTPError
except ImportError:
from urllib2 import urlopen
import subprocess
from urllib2 import urlopen, HTTPError
import shutil
import string
import subprocess
import sys
import tarfile

Expand Down Expand Up @@ -163,7 +165,7 @@

class AbstractBuilder(object):
library = None
url_template = None
url_templates = None
src_template = None
build_template = None
install_target = 'install'
Expand Down Expand Up @@ -202,6 +204,11 @@ def __eq__(self, other):
def __hash__(self):
return hash((self.library, self.version))

@property
def short_version(self):
"""Short version for OpenSSL download URL"""
return None

@property
def openssl_cli(self):
"""openssl CLI binary"""
Expand Down Expand Up @@ -255,11 +262,23 @@ def _download_src(self):
src_dir = os.path.dirname(self.src_file)
if not os.path.isdir(src_dir):
os.makedirs(src_dir)
url = self.url_template.format(self.version)
log.info("Downloading from {}".format(url))
req = urlopen(url)
# KISS, read all, write all
data = req.read()
data = None
for url_template in self.url_templates:
url = url_template.format(v=self.version, s=self.short_version)
log.info("Downloading from {}".format(url))
try:
req = urlopen(url)
# KISS, read all, write all
data = req.read()
except HTTPError as e:
log.error(
"Download from {} has from failed: {}".format(url, e)
)
else:
log.info("Successfully downloaded from {}".format(url))
break
if data is None:
raise ValueError("All download URLs have failed")
log.info("Storing {}".format(self.src_file))
with open(self.src_file, "wb") as f:
f.write(data)
Expand Down Expand Up @@ -380,7 +399,10 @@ def run_python_tests(self, tests, network=True):

class BuildOpenSSL(AbstractBuilder):
library = "OpenSSL"
url_template = "https://www.openssl.org/source/openssl-{}.tar.gz"
url_templates = (
"https://www.openssl.org/source/openssl-{v}.tar.gz",
"https://www.openssl.org/source/old/{s}/openssl-{v}.tar.gz"
)
src_template = "openssl-{}.tar.gz"
build_template = "openssl-{}"
# only install software, skip docs
Expand Down Expand Up @@ -419,12 +441,20 @@ def _post_install_300(self):
)
with open(openssl_fips_cnf, "w") as f:
f.write(OPENSSL_FIPS_CNF.format(self=self))
@property
def short_version(self):
"""Short version for OpenSSL download URL"""
short_version = self.version.rstrip(string.ascii_letters)
if short_version.startswith("0.9"):
short_version = "0.9.x"
return short_version


class BuildLibreSSL(AbstractBuilder):
library = "LibreSSL"
url_template = (
"https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-{}.tar.gz")
url_templates = (
"https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-{v}.tar.gz",
)
src_template = "libressl-{}.tar.gz"
build_template = "libressl-{}"

Expand Down