vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make sure to decode manifests into utf-8 when necessary

Browse source 
This fixes a decoding error
This commit is contained in:
Joseph Schorr 2018-12-17 16:31:24 -05:00
parent 6cc7102ec8
commit 48e584905a
15 changed files with 268 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

7
image/docker/schema2/config.py
View file

@ -102,6 +102,7 @@ from dateutil.parser import parse as parse_date
from digest import digest_tools
from image.docker import ManifestException
from image.docker.schemautil import ensure_utf8
DOCKER_SCHEMA2_CONFIG_HISTORY_KEY = "history"
@ -185,7 +186,7 @@ class DockerSchema2Config(object):
self._config_bytes = config_bytes
try:
self._parsed = json.loads(config_bytes)
self._parsed = json.loads(ensure_utf8(config_bytes))
except ValueError as ve:
raise MalformedSchema2Config('malformed config data: %s' % ve)
@ -197,12 +198,12 @@ class DockerSchema2Config(object):
@property
def digest(self):
""" Returns the digest of this config object. """
return digest_tools.sha256_digest(self._config_bytes)
return digest_tools.sha256_digest(ensure_utf8(self._config_bytes))
@property
def size(self):
""" Returns the size of this config object. """
return len(self._config_bytes)
return len(ensure_utf8(self._config_bytes))
@property
def bytes(self):