Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
4186230
feat(artifacts): add ORAS-backed OCI transport and shared pkg/signatu…
osterman Oct 31, 2026
0cde54a
feat(artifacts): add artifact service, producers, snapshotting, and c…
osterman Oct 31, 2026
97d4f88
fix(artifacts): close replaced readers and ignore directory times in …
osterman Nov 8, 2026
f667bd2
fix(artifacts): address CodeRabbit findings for the ORAS transport an…
osterman Nov 1, 2026
6e94a0b
fix(artifacts): address remaining CodeRabbit findings for the OCI tra…
osterman Nov 10, 2026
930596f
refactor(artifacts): split reconcile and key verification to satisfy …
osterman Nov 11, 2026
5e6e594
fix(artifacts): reject paths through regular files
osterman Nov 11, 2026
6d84917
fix(artifacts): harden service and transport review findings
osterman Nov 11, 2026
e0851d4
fix(artifacts): replace destinations atomically
osterman Nov 11, 2026
22f8e65
test(artifact): allow reported ambiguous lock creates in conformance
osterman Nov 12, 2026
ab1d743
fix(oci): classify manifest scan failures as integrity errors and bou…
osterman Nov 13, 2026
d220e77
fix(artifact): wrap staged-file errors and bound the final source rec…
osterman Nov 13, 2026
6d547cc
fix(signature): classify signing backend failures with a static sentinel
osterman Nov 13, 2026
66c4d97
test(artifact): use the generated signer mock in conformance
osterman Nov 13, 2026
5716ddd
fix(artifact): report a repeated native graph copy as unchanged
osterman Nov 13, 2026
344da54
test(artifact): use generated mocks for optional repository interfaces
osterman Nov 13, 2026
b9a577c
test(artifact): use generated repository mocks for the consume test h…
osterman Nov 13, 2026
5ced6de
test(oci): use generated mocks for the transport test doubles
osterman Nov 13, 2026
b781e85
fix(oci): serialize layout tag updates with index commits
osterman Nov 13, 2026
c27145a
fix(artifact): anchor sibling document reads to the checked parent di…
osterman Nov 13, 2026
2de4d41
fix(oci): keep streaming layers uploadable through the legacy graph a…
osterman Nov 13, 2026
f2a4cc7
fix(oci): require referrer registration before accepting an attachmen…
osterman Nov 13, 2026
57d9fd0
refactor(artifact): share the signer format check across repositories
osterman Nov 13, 2026
e4e1936
refactor(artifact): keep document and subject scanning within lint li…
osterman Nov 13, 2026
09e499b
fix(artifacts): address transport service review findings
osterman Nov 14, 2026
59b0753
fix(oci): guard copy observer set in legacy non-distributable test
osterman Nov 14, 2026
08e1ab7
fix(artifact): use t.Skipf in the conformance helper
osterman Nov 15, 2026
b391317
fix(artifact): copy caller-owned data at the produce and service boun…
osterman Nov 15, 2026
cc84187
fix(artifact): isolate the in-memory repository's state and honor del…
osterman Nov 15, 2026
b1bf163
fix(artifact): stop archive extraction when the context is canceled
osterman Nov 15, 2026
b1bcccc
fix(oci): keep the selected root, referrer metadata and credential gu…
osterman Nov 15, 2026
43ced25
fix(signature): reject Ed25519 trusted keys that cannot verify by digest
osterman Nov 15, 2026
d460fdd
fix(materialize): honor cancellation in metadata reads, replace guard…
osterman Nov 15, 2026
d9e3aa1
fix(snapshot): recheck metadata after the final hash, honor cancellat…
osterman Nov 15, 2026
c4a39fc
fix(produce): classify stream, archive-open and metadata-source failures
osterman Nov 15, 2026
221b3cf
fix(artifact): add Metadata and VerificationPolicy clones and test bo…
osterman Nov 15, 2026
36a10c9
fix(service): keep cancellation, description copies and staging readable
osterman Nov 15, 2026
25c5ca2
test(artifacttest): recheck the subject after the signer returns
osterman Nov 15, 2026
2b11023
test(service): replace the hand-written repointing repository with a …
osterman Nov 15, 2026
4fc07d3
refactor(materialize): name the archive read stage parameter for what…
osterman Nov 15, 2026
83c1efa
test(produce): match the %q-quoted source path in the metadata failur…
osterman Nov 15, 2026
63349ff
fix(artifact): address CodeRabbit review findings on the transport layer
osterman Nov 16, 2026
12efe5f
fix(artifact): address the second round of CodeRabbit findings
osterman Nov 16, 2026
711c998
fix(artifact): address the third round of CodeRabbit findings
osterman Nov 16, 2026
cc7a396
refactor(artifact): keep link containment and legacy graph building u…
osterman Nov 16, 2026
2831f0a
fix(artifact): address the fourth round of CodeRabbit findings
osterman Nov 16, 2026
20abf4a
fix(oci): stop verifying a subject manifest body when the context is …
osterman Nov 16, 2026
7d50671
fix(artifacts): preserve historical merge resolutions after stack repair
osterman Nov 17, 2026
db7a712
test(errors): make CI color rendering terminal capability explicit
osterman Nov 17, 2026
f57b540
fix(artifact): enforce bound reads and consistent admission checks
osterman Nov 17, 2026
d9bad8d
fix(oci): preserve layout classification and token precedence
osterman Nov 17, 2026
a237e65
test(snapshot): respect Windows open-file replacement restriction
osterman Nov 17, 2026
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
18 changes: 18 additions & 0 deletions errors/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -1608,6 +1608,8 @@ var (
ErrArtifactStoreInvalidArgs = errors.New("invalid artifact store arguments")
ErrArtifactMetadataFailed = errors.New("failed to load artifact metadata")
ErrArtifactIntegrityFailed = errors.New("artifact integrity check failed")
ErrArtifactSigningFailed = errors.New("failed to sign artifact")
ErrPathThroughNonDirectory = errors.New("path passes through a non-directory")

// CI cache errors.
ErrCacheUnavailable = errors.New("CI cache is not available in this environment")
Expand Down Expand Up @@ -2117,6 +2119,22 @@ var (
// ErrArtifactTooLarge is returned when a record, document, or evidence blob exceeds its bounded-read limit.
ErrArtifactTooLarge = errors.New("artifact data exceeds the size limit")

// ErrArtifactSourceChanged is returned when source content changed while it was being captured,
// so an inventory would describe different bytes than the ones staged.
ErrArtifactSourceChanged = errors.New("artifact source changed during capture")

// ErrArtifactVerificationFailed is returned when no permitted signature satisfies a required
// trust set. It is a policy error raised before any consumption or destination publication.
ErrArtifactVerificationFailed = errors.New("artifact signature verification failed")

// ErrArtifactPublicationAmbiguous is returned when a mutation failed in a way that could not be
// reconciled: the completed reference could not be proven to hold, or to lack, the expected content.
ErrArtifactPublicationAmbiguous = errors.New("artifact publication outcome is ambiguous")

// ErrSymlinkLoop is returned when resolving a path follows more symlinks than the bound allows, which
// means the links form a loop.
ErrSymlinkLoop = errors.New("symlink loop")

// ErrArtifactStreamFailed is returned when reading or closing an artifact stream fails. The
// underlying I/O error is wrapped alongside it for diagnostics.
ErrArtifactStreamFailed = errors.New("artifact stream failed")
Expand Down
2 changes: 2 additions & 0 deletions errors/formatter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,8 @@ func TestShouldUseColorInCI(t *testing.T) {
}

func TestFormatInCIUsesColorUnlessDisabled(t *testing.T) {
// TERM=dumb deliberately disables automatic styling, even in CI.
t.Setenv("TERM", "xterm-256color")
t.Setenv("CI", "true")
t.Setenv("NO_COLOR", "")

Expand Down
22 changes: 22 additions & 0 deletions errors/signature.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package errors

import "errors"

// Shared signature-verification sentinels used by pkg/signature. Adapters that predate the shared
// package translate these to their legacy sentinels so existing callers keep matching.
var (
// ErrSignatureInvalid indicates signature evidence is malformed, untrusted, or does not match the subject.
ErrSignatureInvalid = errors.New("signature does not satisfy the trust policy")

// ErrSignatureConfigInvalid indicates the verification policy itself is unusable (for example an empty identity).
ErrSignatureConfigInvalid = errors.New("invalid signature verification configuration")

// ErrSignatureKeyUnsupported indicates a configured trusted key cannot verify bundles by subject digest alone.
ErrSignatureKeyUnsupported = errors.New("signature key type cannot verify by digest")

// ErrSignatureOffline indicates trust material cannot be fetched while verifying offline.
ErrSignatureOffline = errors.New("signature trust material is unavailable offline")

// ErrSignatureSigningFailed indicates a signing backend failed to produce signature evidence.
ErrSignatureSigningFailed = errors.New("signing backend failed to produce a signature")
)
2 changes: 1 addition & 1 deletion go.mod

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

259 changes: 259 additions & 0 deletions pkg/archive/deterministic.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,259 @@
package archive

import (
"archive/tar"
"archive/zip"
"compress/gzip"
"errors"
"fmt"
"io"
"io/fs"
"sort"
"strings"
"time"

errUtils "github.com/cloudposse/atmos/errors"
"github.com/cloudposse/atmos/pkg/perf"
)

// MemberKind is the type of a [Member] written by [WriteDeterministic].
type MemberKind int

// Member kinds. Devices, sockets, and other special files are never representable.
const (
// MemberFile is a regular file whose bytes come from [Member.Open].
MemberFile MemberKind = iota

// MemberDirectory is a directory entry.
MemberDirectory

// MemberSymlink is a symbolic link to [Member.Target].
MemberSymlink
)

// deterministicPermMask holds the permission bits a deterministic member may carry. Privileged
// bits (setuid, setgid, sticky) are always cleared.
const deterministicPermMask fs.FileMode = 0o777

// Member is one explicitly described archive entry for [WriteDeterministic]. Unlike [PackOptions]
// sources, members never touch the filesystem on their own: the caller supplies the bytes, so the
// output depends only on the declared paths, modes, and content.
type Member struct {
// Path is the relative, slash-separated path inside the archive.
Path string

// Kind is file, directory, or symlink.
Kind MemberKind

// Mode holds the ordinary permission bits. Executable bits are preserved; other bits are
// written as given. Privileged bits are cleared.
Mode fs.FileMode

// Size is the exact byte length of a file's content.
Size int64

// Target is a symlink's target; empty for other kinds.
Target string

// Open returns a reader over a file's content. The writer closes it. Nil for other kinds.
Open func() (io.ReadCloser, error)
}

// tarEpoch is the timestamp stamped into every deterministic tar entry.
var tarEpoch = time.Unix(0, 0).UTC()

// zipEpoch is the timestamp stamped into every deterministic zip entry. 1980-01-01 is the earliest
// time the zip DOS timestamp field can represent.
var zipEpoch = time.Date(1980, 1, 1, 0, 0, 0, 0, time.UTC)

// WriteDeterministic writes members to w as a zip, tar, or tgz archive whose bytes depend only on
// the members: entries are sorted by path, timestamps are pinned to a fixed epoch, owners are
// normalized to zero and empty names, gzip headers carry no name or time, and permission bits
// (including executable bits) are preserved. Identical members always produce identical bytes for
// one Go toolchain. It does not alter the behavior of [Run]; that path keeps its own defaults.
func WriteDeterministic(w io.Writer, format string, members []Member) error {
defer perf.Track(nil, "archive.WriteDeterministic")()

sorted, err := sortMembers(members)
if err != nil {
return err
}
switch normalizeFormat(format) {
case FormatTar:
return writeDeterministicTar(w, sorted)
case FormatTGZ:
return writeDeterministicTGZ(w, sorted)
case FormatZip:
return writeDeterministicZip(w, sorted)
default:
return errUtils.Build(errUtils.ErrArchiveFormatNotImplemented).
WithExplanationf("deterministic writing supports zip, tar, and tgz, not %q", format).
WithContext("format", format).
Err()
}
}

// sortMembers returns a path-sorted copy and rejects duplicate paths.
func sortMembers(members []Member) ([]Member, error) {
sorted := make([]Member, len(members))
copy(sorted, members)
sort.Slice(sorted, func(i, j int) bool { return sorted[i].Path < sorted[j].Path })
for index := range sorted {
if sorted[index].Path == "" || strings.HasPrefix(sorted[index].Path, "/") {
return nil, memberError(sorted[index].Path, errUtils.ErrArchiveInvalidSubpath)
}
if index > 0 && sorted[index].Path == sorted[index-1].Path {
return nil, memberError(sorted[index].Path, errUtils.ErrArchiveWriteFailed)
}
}
return sorted, nil
}

func memberError(path string, sentinel error) error {
return fmt.Errorf("%w: member %q is empty, absolute, or duplicated", sentinel, path)
}

func writeDeterministicTGZ(w io.Writer, members []Member) error {
gz := gzip.NewWriter(w)
if err := writeDeterministicTar(gz, members); err != nil {
_ = gz.Close()
return err
}
if err := gz.Close(); err != nil {
return writeFailedError("gzip", err)
}
return nil
}

func writeDeterministicTar(w io.Writer, members []Member) error {
tw := tar.NewWriter(w)
for index := range members {
if err := writeTarMember(tw, &members[index]); err != nil {
_ = tw.Close()
return err
}
}
if err := tw.Close(); err != nil {
return writeFailedError("tar", err)
}
return nil
}

func writeTarMember(tw *tar.Writer, member *Member) error {
header := &tar.Header{
Name: member.Path,
Mode: int64(member.Mode & deterministicPermMask),
ModTime: tarEpoch,
}
switch member.Kind {
case MemberDirectory:
header.Typeflag = tar.TypeDir
header.Name += "/"
case MemberSymlink:
header.Typeflag = tar.TypeSymlink
header.Linkname = member.Target
header.Mode = 0
case MemberFile:
header.Typeflag = tar.TypeReg
header.Size = member.Size
default:
return memberError(member.Path, errUtils.ErrArchiveWriteFailed)
}
if err := tw.WriteHeader(header); err != nil {
return writeFailedError(member.Path, err)
}
if member.Kind != MemberFile {
return nil
}
return copyMemberContent(tw, member)
}

func writeDeterministicZip(w io.Writer, members []Member) error {
zw := zip.NewWriter(w)
for index := range members {
if err := writeZipMember(zw, &members[index]); err != nil {
_ = zw.Close()
return err
}
}
if err := zw.Close(); err != nil {
return writeFailedError("zip", err)
}
return nil
}

func writeZipMember(zw *zip.Writer, member *Member) error {
header := &zip.FileHeader{Name: member.Path, Method: zip.Deflate, Modified: zipEpoch}
perm := member.Mode & deterministicPermMask
switch member.Kind {
case MemberDirectory:
header.Name += "/"
header.Method = zip.Store
header.SetMode(fs.ModeDir | perm)
case MemberSymlink:
header.Method = zip.Store
header.SetMode(fs.ModeSymlink)
case MemberFile:
header.SetMode(perm)
default:
return memberError(member.Path, errUtils.ErrArchiveWriteFailed)
}
out, err := zw.CreateHeader(header)
if err != nil {
return writeFailedError(member.Path, err)
}
switch member.Kind {
case MemberSymlink:
if _, err := io.WriteString(out, member.Target); err != nil {
return writeFailedError(member.Path, err)
}
case MemberFile:
return copyMemberContent(out, member)
}
return nil
}

// copyMemberContent copies exactly member.Size bytes and fails if the source is shorter or longer,
// so an archive never describes bytes other than the ones it carries.
func copyMemberContent(dst io.Writer, member *Member) (err error) {
if member.Open == nil {
return memberError(member.Path, errUtils.ErrArchiveWriteFailed)
}
src, err := member.Open()
if err != nil {
return writeFailedError(member.Path, err)
}
// A failed close can mean the source did not verify, so it is kept alongside any copy error.
defer func() {
if closeErr := src.Close(); closeErr != nil {
err = errors.Join(err, writeFailedError(member.Path, closeErr))
}
}()

written, err := io.Copy(dst, io.LimitReader(src, member.Size))
if err != nil {
return writeFailedError(member.Path, err)
}
if written != member.Size {
return writeFailedError(member.Path, io.ErrUnexpectedEOF)
}
return rejectExtraContent(src, member)
}

// rejectExtraContent reads until a byte or the end of the source. A reader may legally return no
// bytes and no error from a single call, so one read cannot prove the source has ended. The probe
// never touches the archive writer, so extra content is not written before the failure.
func rejectExtraContent(src io.Reader, member *Member) error {
var extra [1]byte
for {
n, readErr := src.Read(extra[:])
switch {
case n > 0:
return writeFailedError(member.Path, fmt.Errorf("%w: content is longer than the declared %d bytes", errUtils.ErrArchiveWriteFailed, member.Size))
case errors.Is(readErr, io.EOF):
return nil
case readErr != nil:
return writeFailedError(member.Path, readErr)
}
}
}
Loading
Loading