aboutsummaryrefslogtreecommitdiffstats
path: root/host/utils
diff options
context:
space:
mode:
authorLane Kolbly <lane.kolbly@ni.com>2020-10-08 17:03:11 -0500
committerAaron Rossetto <aaron.rossetto@ni.com>2020-10-15 16:00:54 -0500
commit0167ad7608adb170970458b19735738808f0c5c8 (patch)
tree85427c21ca1d3d3c7222a56087c3488fdae49e6e /host/utils
parentc484b79a7672d6c5d0886199955b015d1b4bc387 (diff)
downloaduhd-0167ad7608adb170970458b19735738808f0c5c8.tar.gz
uhd-0167ad7608adb170970458b19735738808f0c5c8.tar.bz2
uhd-0167ad7608adb170970458b19735738808f0c5c8.zip
uhd_images_downloader: Add environment variable for http auth
This allows the image downloader to download files from restricted sources using HTTP basic auth, specifying the credentials in the UHD_IMAGES_USER and UHD_IMAGES_PASSWORD environment variables: ``` UHD_IMAGES_USER=lane UHD_IMAGES_PASSWORD=MyS3cretPassword uhd_images_downloader.py ```
Diffstat (limited to 'host/utils')
-rw-r--r--host/utils/uhd_images_downloader.py.in33
1 files changed, 31 insertions, 2 deletions
diff --git a/host/utils/uhd_images_downloader.py.in b/host/utils/uhd_images_downloader.py.in
index 927d6a481..b9bc2dd0b 100644
--- a/host/utils/uhd_images_downloader.py.in
+++ b/host/utils/uhd_images_downloader.py.in
@@ -60,6 +60,8 @@ except ImportError:
exit(0)
# pylint: disable=bad-whitespace
+_USERNAME_VARIABLE = "UHD_IMAGES_USER"
+_PASSWORD_VARIABLE = "UHD_IMAGES_PASSWORD"
_DEFAULT_TARGET_REGEX = "(fpga|fw|windrv)_default"
_BASE_DIR_STRUCTURE_PARTS = ["share", "uhd", "images"]
_DEFAULT_INSTALL_PATH = os.path.join("@CMAKE_INSTALL_PREFIX@", *_BASE_DIR_STRUCTURE_PARTS)
@@ -344,6 +346,31 @@ def print_target_list(manifest, args):
print(args.base_url+manifest_item[1]["url"])
+def parse_auth(env):
+ """
+ Parse a (potentially None) environment variable string as a username:password
+ for consumption by requests.
+ """
+ username = env.get(_USERNAME_VARIABLE, None)
+ password = env.get(_PASSWORD_VARIABLE, None)
+ if not username and not password:
+ return None
+
+ if not username:
+ raise RuntimeError(
+ "Password variable {} was specified, so username variable {} must be set as well"
+ .format(_PASSWORD_VARIABLE, _USERNAME_VARIABLE)
+ )
+
+ if not password:
+ raise RuntimeError(
+ "Username variable {} was specified, so password variable {} must as well"
+ .format(_USERNAME_VARIABLE, _PASSWORD_VARIABLE)
+ )
+
+ return (username, password)
+
+
def download(
images_url,
filename,
@@ -354,15 +381,17 @@ def download(
""" Run the download, show progress """
download_limit = download_limit or _DEFAULT_DOWNLOAD_LIMIT
log("TRACE", "Downloading {} to {}".format(images_url, filename))
+ auth = parse_auth(os.environ)
try:
resp = requests.get(images_url, stream=True, proxies=_PROXIES,
- headers={'User-Agent': 'UHD Images Downloader'})
+ headers={'User-Agent': 'UHD Images Downloader'},
+ auth=auth)
except TypeError:
# requests library versions pre-4c3b9df6091b65d8c72763222bd5fdefb7231149
# (Dec.'12) workaround
resp = requests.get(images_url, prefetch=False, proxies=_PROXIES,
headers={'User-Agent': 'UHD Images Downloader'},
- allow_redirects=True)
+ allow_redirects=True, auth=auth)
if resp.status_code != 200:
raise RuntimeError("URL does not exist: {}".format(images_url))
filesize = float(resp.headers.get('content-length', -1))