Skip to content

bug(policy): move policy verification to sub-manifest level #758

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

Closed
ricardomaraschini wants to merge 1 commit into from
Closed

bug(policy): move policy verification to sub-manifest level #758

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
45 changes: 24 additions & 21 deletions common/pkg/json-proxy/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,25 +127,6 @@ func (h *handler) openImageImpl(ctx context.Context, args []any, allowNotFound b
return ret, err
}

policyContext, err := h.getPolicyContext()
if err != nil {
return ret, err
}
defer func() {
if err := policyContext.Destroy(); err != nil {
retErr = noteCloseFailure(retErr, "tearing down policy context", err)
}
}()

unparsedTopLevel := image.UnparsedInstance(imgsrc, nil)
allowed, err := policyContext.IsRunningImageAllowed(ctx, unparsedTopLevel)
if err != nil {
return ret, err
}
if !allowed {
return ret, errors.New("internal inconsistency: policy verification failed without returning an error")
}

// Note that we never return zero as an imageid; this code doesn't yet
// handle overflow though.
h.imageSerial++
Expand Down Expand Up @@ -254,10 +235,11 @@ func (h *handler) returnBytes(retval any, buf []byte) (replyBuf, error) {
// cacheTargetManifest is invoked when GetManifest or GetConfig is invoked
// the first time for a given image. If the requested image is a manifest
// list, this function resolves it to the image matching the calling process'
// operating system and architecture.
// operating system and architecture. The image admission against the policy
// is done here.
//
// TODO: Add GetRawManifest or so that exposes manifest lists.
func (h *handler) cacheTargetManifest(ctx context.Context, img *openImage) error {
func (h *handler) cacheTargetManifest(ctx context.Context, img *openImage) (retErr error) {
if img.cachedimg != nil {
return nil
}
Expand All @@ -280,6 +262,27 @@ func (h *handler) cacheTargetManifest(ctx context.Context, img *openImage) error
} else {
target = unparsedToplevel
}

// check the image admission against the policy. admission is checked
// against the sub-manifest in case of manifest lists.
policyContext, err := h.getPolicyContext()
if err != nil {
return err
}
defer func() {
if err := policyContext.Destroy(); err != nil {
retErr = noteCloseFailure(retErr, "tearing down policy context", err)
}
}()

allowed, err := policyContext.IsRunningImageAllowed(ctx, target)
if err != nil {
return err
}
if !allowed {
return errors.New("internal inconsistency: policy verification failed without returning an error")
}

cachedimg, err := image.FromUnparsedImage(ctx, h.sysctx, target)
if err != nil {
return err
Expand Down
Loading