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

5
image/docker/schema2/list.py
View file

@ -12,6 +12,7 @@ from image.docker.schema1 import DockerSchema1Manifest
from image.docker.schema2 import (DOCKER_SCHEMA2_MANIFESTLIST_CONTENT_TYPE,
DOCKER_SCHEMA2_MANIFEST_CONTENT_TYPE)
from image.docker.schema2.manifest import DockerSchema2Manifest
from image.docker.schemautil import ensure_utf8
logger = logging.getLogger(__name__)
@ -174,7 +175,7 @@ class DockerSchema2ManifestList(ManifestInterface):
self._manifest_bytes = manifest_bytes
try:
self._parsed = json.loads(manifest_bytes)
self._parsed = json.loads(ensure_utf8(manifest_bytes))
except ValueError as ve:
raise MalformedSchema2ManifestList('malformed manifest data: %s' % ve)
@ -195,7 +196,7 @@ class DockerSchema2ManifestList(ManifestInterface):
@property
def digest(self):
""" The digest of the manifest, including type prefix. """
return digest_tools.sha256_digest(self._manifest_bytes)
return digest_tools.sha256_digest(ensure_utf8(self._manifest_bytes))
@property
def media_type(self):