Correctly handle encryption/decryption changes in non-OCI formats #1932
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mtrmac
force-pushed
the
encryption-UpdatedImage
branch
4 times, most recently
from
daa120c
to
4141d23
Compare
mtrmac
added
the
kind/bug
mtrmac
force-pushed
the
encryption-UpdatedImage
branch
from
4141d23
to
f1ce56d
Compare
mtrmac
force-pushed
the
encryption-UpdatedImage
branch
5 times, most recently
from
a796912
to
879a27a
Compare
mtrmac
force-pushed
the
encryption-UpdatedImage
branch
from
879a27a
to
7eeed2c
Compare
mtrmac
force-pushed
the
encryption-UpdatedImage
branch
from
7eeed2c
to
6ae3c59
Compare
... to cut down on the repetitiveness. Should not change (test) behavior. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
mtrmac
force-pushed
the
encryption-UpdatedImage
branch
from
6ae3c59
to
0f27515
Compare
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
mtrmac
force-pushed
the
encryption-UpdatedImage
branch
2 times, most recently
from
0e54f28
to
ea39042
Compare
|
This is now ready for review. To test: openssl genrsa -out ociprivate.key 1024
openssl rsa -in ociprivate.key -pubout > ocipublic.key
skopeo --override-os linux --insecure-policy copy --encryption-key jwe:./ocipublic.key docker://quay.io/libpod/alpine oci:nginx_encrypted
bin/skopeo --debug --override-os linux --insecure-policy copy --decryption-key ./ociprivate.key oci:nginx_encrypted docker-archive:t.tar |
mtrmac
changed the title
This was referenced Sep 6, 2023
mtrmac
force-pushed
the
encryption-UpdatedImage
branch
from
ea39042
to
f78377f
Compare
rhatdan
reviewed
Sep 7, 2023
internal/image/oci.go
Outdated
| // FIXME: s/Zsdt/Zstd/ after ocicrypt with https://github.com/containers/ocicrypt/pull/91 is released | ||
| case ociencspec.MediaTypeLayerEnc, ociencspec.MediaTypeLayerGzipEnc, ociencspec.MediaTypeLayerZstdEnc, | ||
| ociencspec.MediaTypeLayerNonDistributableEnc, ociencspec.MediaTypeLayerNonDistributableGzipEnc, ociencspec.MediaTypeLayerNonDistributableZsdtEnc: | ||
| return nil, fmt.Errorf("Error during manifest conversion: %q: encrypted layers are not supported in docker images", layers[idx].MediaType) |
There was a problem hiding this comment.
Please don't start error messages with Error.
Otherwize podman and buildah end up with
Error: Error ...
There was a problem hiding this comment.
I know there are other examples, which I can open a PR to fix.
There was a problem hiding this comment.
Thanks for the reminder, I have fixed the newly added errors at least.
... and add tests. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
…rmats Previously this would try first converting to the other format, and that would fail because the other format can't represent encrypted layers. So, do the layer edits for decryption first. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
…yption Signed-off-by: Miloslav Trmač <mitr@redhat.com>
mtrmac
force-pushed
the
encryption-UpdatedImage
branch
from
f78377f
to
cc1d30b
Compare
|
LGTM |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This