Skip to content

oci: do not require top-level mediaType #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

oci: do not require top-level mediaType #128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions oci.jq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,28 @@ def validate_oci_subject_haver:
else . end
;

# Some objects have .mediaType fields which SHOULD NOT be unset but are still
# valid if they are missing, so we should emit a warning if they are unset but
# do not error out.
# usage: same as validate_IN(.mediaType; options).
# https://github.com/opencontainers/image-spec/security/advisories/GHSA-77vh-xpmg-72qh (CVE-2021-41190)
# https://github.com/opencontainers/image-spec/blob/v1.1.1/manifest.md
# https://github.com/opencontainers/image-spec/blob/v1.1.1/image-index.md
def validate_optional_mediatype(options):
if has("mediaType") then
validate_IN(.mediaType; options)
else [
# Output a warning message.
("warning: top-level mediaType field is missing from object (see CVE-2021-41190)\nexpected one of:\n\t\([ options | tojson ] | join("\n\t"))\n" | stderr | empty),
.
] | last end
;

# https://github.com/opencontainers/image-spec/blob/v1.1.1/image-index.md
def validate_oci_index($opt):
validate_IN(type; "object")
| validate_IN(.schemaVersion; 2)
| validate_IN(.mediaType; media_types_index)
| validate_optional_mediatype(media_types_index)
| if has("artifactType") then
validate(.artifactType; type == "string")
| validate_IN(.artifactType; null) # TODO acceptable values? (this check intentionally contradicts the one above so artifactType generates an error)
Expand Down Expand Up @@ -296,7 +313,7 @@ def validate_oci_index: validate_oci_index({});
def validate_oci_image($opt):
validate_IN(type; "object")
| validate_IN(.schemaVersion; 2)
| validate_IN(.mediaType; media_types_image)
| validate_optional_mediatype(media_types_image)
| if has("artifactType") then
validate(.artifactType; type == "string")
| validate_IN(.artifactType;
Expand Down