summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Oster <jon.oster@here.com>2018-06-07 11:10:07 +0200
committerlbonn <lbonn@users.noreply.github.com>2018-06-12 09:23:55 +0200
commit642559cd005076bc4f53fd066b8ce4a62be72864 (patch)
tree81491607279e5443b914168a670772392710a579
parent1a196b33ec15fa8b12688bf0cec2ad1859d08990 (diff)
downloadmeta-updater-642559cd005076bc4f53fd066b8ce4a62be72864.tar.gz
Bugfix: strip whitespace and newlines from tuf URL in credentials.zip
-rw-r--r--recipes-sota/aktualizr/garage-sign-version.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-sota/aktualizr/garage-sign-version.inc b/recipes-sota/aktualizr/garage-sign-version.inc
index 66e3ffd..f2d04e8 100644
--- a/recipes-sota/aktualizr/garage-sign-version.inc
+++ b/recipes-sota/aktualizr/garage-sign-version.inc
@@ -8,7 +8,7 @@ python () {
8 with zipfile.ZipFile(d.getVar("SOTA_PACKED_CREDENTIALS", True), 'r') as zip_ref: 8 with zipfile.ZipFile(d.getVar("SOTA_PACKED_CREDENTIALS", True), 'r') as zip_ref:
9 try: 9 try:
10 with zip_ref.open('tufrepo.url', mode='r') as url_file: 10 with zip_ref.open('tufrepo.url', mode='r') as url_file:
11 url = url_file.read().decode() + '/health/version' 11 url = url_file.read().decode().strip(' \t\n') + '/health/version'
12 except (KeyError, ValueError, RuntimeError): 12 except (KeyError, ValueError, RuntimeError):
13 return 13 return
14 r = urllib.request.urlopen(url) 14 r = urllib.request.urlopen(url)