Skip to content

use proxy in sanity check of custom easyblock to install OpenSSL wrapper #2922

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
boegel merged 7 commits into from
Mar 6, 2024
Merged

use proxy in sanity check of custom easyblock to install OpenSSL wrapper #2922

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f145d9f
use proxy in sanity check
truib Apr 23, 2023
d0f2faf
break long string
truib Apr 23, 2023
dbf2269
moving value to first line of string definition
truib Apr 23, 2023
7283f11
Revert "moving value to first line of string definition"
truib Apr 23, 2023
204ac3e
f string not available with older versions of Python
truib Feb 23, 2024
4d6322b
Merge branch 'develop' of github.com:easybuilders/easybuild-easyblock…
truib Feb 23, 2024
0e6ad9c
add import of urlparse
truib Feb 23, 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
14 changes: 13 additions & 1 deletion easybuild/easyblocks/o/openssl_wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
import os
import re

from urllib.parse import urlparse

from easybuild.tools import LooseVersion

from easybuild.easyblocks.generic.bundle import Bundle
Expand Down Expand Up @@ -376,6 +378,15 @@ def sanity_check_step(self):
'dirs': ssl_dirs,
}

# use proxy to connect if https_proxy environment variable is defined
proxy_arg = ''
if os.environ.get('https_proxy'):
# only use host & port from https_proxy env var, that is, strip
# any protocol prefix and trailing slashes
proxy_parsed = urlparse(os.environ.get('https_proxy'))
if proxy_parsed.netloc:
proxy_arg = ' -proxy %s' % proxy_parsed.netloc

if LooseVersion(self.version) >= LooseVersion('3') and self.version.count('.') == 0:
ssl_ver_comp_chars = 1
else:
Expand All @@ -384,7 +395,8 @@ def sanity_check_step(self):
custom_commands = [
# make sure that version mentioned in output of 'openssl version' matches version we are using
"ssl_ver=$(openssl version); [ ${ssl_ver:8:%s} == '%s' ]" % (ssl_ver_comp_chars, self.majmin_version),
"echo | openssl s_client -connect github.com:443 -verify 9 | grep 'Verify return code: 0 (ok)'",
("echo | openssl s_client%s -connect github.com:443 -verify 9 "
"| grep 'Verify return code: 0 (ok)'" % proxy_arg),
]

super(Bundle, self).sanity_check_step(custom_paths=custom_paths, custom_commands=custom_commands)
Expand Down