mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-06 06:29:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

When url quoting items, encode as UTF-8 first

Browse Source
This commit is contained in:
Greg Neagle
2015-06-10 09:01:26 -07:00
parent 7b4ddff2ba
commit b37a514624
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/client/munkilib/updatecheck.py
View File

@@ -814,7 +814,7 @@ def download_installeritem(item_pl, installinfo, uninstalling=False):
else:
if not downloadbaseurl.endswith('/'):
downloadbaseurl = downloadbaseurl + '/'
pkgurl = downloadbaseurl + urllib2.quote(location)
pkgurl = downloadbaseurl + urllib2.quote(location.encode('UTF-8'))
pkgname = getInstallerItemBasename(location)
munkicommon.display_debug2('Download base URL is: %s', downloadbaseurl)
@@ -2505,7 +2505,8 @@ def getCatalogs(cataloglist):
for catalogname in cataloglist:
if not catalogname in CATALOG:
catalogurl = catalogbaseurl + urllib2.quote(catalogname)
catalogurl = catalogbaseurl + urllib2.quote(
catalogname.encode('UTF-8'))
catalogpath = os.path.join(catalog_dir, catalogname)
munkicommon.display_detail('Getting catalog %s...', catalogname)
message = 'Retrieving catalog "%s"...' % catalogname
@@ -2674,7 +2675,7 @@ def getPrimaryManifest(alternate_id):
if not manifest:
manifest = getmanifest(
manifesturl + urllib2.quote(clientidentifier.encode('utf-8')))
manifesturl + urllib2.quote(clientidentifier.encode('UTF-8')))
if manifest:
# record this info for later
munkicommon.report['ManifestName'] = clientidentifier
@@ -2791,7 +2792,7 @@ def download_icons(item_list):
if not os.path.splitext(icon_name)[1] in icon_known_exts:
icon_name += '.png'
icon_list.append(icon_name)
icon_url = icon_base_url + urllib2.quote(icon_name)
icon_url = icon_base_url + urllib2.quote(icon_name.encode('UTF-8'))
icon_path = os.path.join(icon_dir, icon_name)
if os.path.isfile(icon_path):
xattr_hash = fetch.getxattr(icon_path, fetch.XATTR_SHA)