Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
20 changes: 18 additions & 2 deletions src/lib/sandbox-base-image-platform-digest.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -197,13 +197,24 @@ describe("sandbox base-image pinned platform digest resolution", () => {
});
});

it("falls back to the Dockerfile-pinned digest when RepoDigests JSON is malformed", () => {
it("preserves metadata for an exact digest when RepoDigests JSON is malformed (#9386)", () => {
dockerMocks.imageInspect.mockImplementation((ref: string) => ({
status: ref === REF ? 0 : 1,
}));
dockerMocks.imageInspectFormat.mockImplementation((format: string, ref: string) =>
(
new Map([[`{{json .RepoDigests}}\0${REF}`, "{not-json"]]).get(`${format}\0${ref}`) ?? ""
new Map([
[`{{json .RepoDigests}}\0${REF}`, "{not-json"],
[
`{{json .}}\0${REF}`,
JSON.stringify({
Id: IMAGE_ID,
RepoDigests: [],
Os: "linux",
Architecture: "amd64",
}),
],
]).get(`${format}\0${ref}`) ?? ""
).trim(),
);

Expand All @@ -218,6 +229,11 @@ describe("sandbox base-image pinned platform digest resolution", () => {
digest: DIGEST,
source: "pinned",
pinnedRemoteRef: REF,
metadata: {
ref: REF,
digest: DIGEST,
imageId: IMAGE_ID,
},
});
expect(traceMocks.add).toHaveBeenCalledWith(
"nemoclaw.sandbox_base_image.repodigest_parse_failed",
Expand Down
23 changes: 23 additions & 0 deletions src/lib/sandbox-base-image/resolution-metadata.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,29 @@ describe("sandbox base-image resolution metadata lifecycle", () => {
);
});

it("preserves an exact digest resolution when Docker omits RepoDigests (#9386)", () => {
mocks.dockerImageInspectFormat.mockReturnValue(
JSON.stringify({ ...inspected, RepoDigests: [] }),
);

expect(createSandboxBaseImageResolutionMetadata(options, KEY, publishedResolution)).toEqual(
metadata,
);
});
Comment thread
ericksoa marked this conversation as resolved.
Resolved

it("rejects sparse RepoDigests when the resolved reference is not the exact digest", () => {
mocks.dockerImageInspectFormat.mockReturnValue(
JSON.stringify({ ...inspected, RepoDigests: [] }),
);

expect(
createSandboxBaseImageResolutionMetadata(options, KEY, {
...publishedResolution,
ref: `${IMAGE_NAME}:published`,
}),
).toBeNull();
});

it("finalizes a local fallback with identity metadata and no repository digest (#4680)", () => {
const localResolution: SandboxBaseImageResolution = {
ref: options.localTag,
Expand Down
11 changes: 10 additions & 1 deletion src/lib/sandbox-base-image/resolution-metadata.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,16 @@ export function createSandboxBaseImageResolutionMetadata(
if (resolution.digest) {
const expectedRepoDigest = `${options.imageName}@${resolution.digest}`;
const repoDigests = Array.isArray(inspected?.RepoDigests) ? inspected.RepoDigests : [];
if (!repoDigests.some((entry) => String(entry) === expectedRepoDigest)) return null;
// Docker may omit RepoDigests after resolving an exact platform manifest.
// The resolver's exact same-repository digest ref remains immutable proof.
const exactResolvedReference =
/^sha256:[0-9a-f]{64}$/u.test(resolution.digest) && resolution.ref === expectedRepoDigest;
if (
!exactResolvedReference &&
!repoDigests.some((entry) => String(entry) === expectedRepoDigest)
) {
return null;
}
}

return {
Expand Down
Loading