Version 5.22 introduced a new option to /etc/containers/policy.json called
keyPaths, see
https://github.com/containers/image/pull/1609
EL9 immediately took advantage of this new feature and started using it, see
04645c4a84
This quickly became an issue in our code: The go library (containers/image)
parses the configuration file very strictly and refuses to create a client
when policy.json with an unknown key is present on the filesystem. As we
used 5.21.1 that doesn't know the new key, our unit tests started to
failing when containers-common was present.
Reproducer:
podman run --pull=always --rm -it centos:stream9
dnf install -y dnf-plugins-core
dnf config-manager --set-enabled crb
dnf install -y gpgme-devel libassuan-devel krb5-devel golang git-core
git clone https://github.com/osbuild/osbuild-composer
cd osbuild-composer
# install the new containers-common and run the test
dnf install -y https://kojihub.stream.centos.org/kojifiles/packages/containers-common/1/44.el9/x86_64/containers-common-1-44.el9.x86_64.rpm
go test -count 1 ./...
# this returns:
--- FAIL: TestClientResolve (0.00s)
client_test.go:31:
Error Trace: client_test.go:31
Error: Received unexpected error:
Unknown key "keyPaths"
invalid policy in "/etc/containers/policy.json"
github.com/containers/image/v5/signature.NewPolicyFromFile
/osbuild-composer/vendor/github.com/containers/image/v5/signature/policy_config.go:88
github.com/osbuild/osbuild-composer/internal/container.NewClient
/osbuild-composer/internal/container/client.go:123
github.com/osbuild/osbuild-composer/internal/container_test.TestClientResolve
/osbuild-composer/internal/container/client_test.go:29
testing.tRunner
/usr/lib/golang/src/testing/testing.go:1439
runtime.goexit
/usr/lib/golang/src/runtime/asm_amd64.s:1571
Test: TestClientResolve
client_test.go:32:
Error Trace: client_test.go:32
Error: Expected value not to be nil.
Test: TestClientResolve
When run with an older containers-common, it succeeds:
dnf install -y https://kojihub.stream.centos.org/kojifiles/packages/containers-common/1/40.el9/x86_64/containers-common-1-40.el9.x86_64.rpm
go test -count 1 ./...
PASS
To sum it up, I had to upgrade github.com/containers/image/v5 to v5.22.0.
Unfortunately, this wasn't so simple, see
go get github.com/containers/image/v5@latest
go: github.com/containers/image/v5@v5.22.0 requires
github.com/letsencrypt/boulder@v0.0.0-20220331220046-b23ab962616e requires
github.com/honeycombio/beeline-go@v1.1.1 requires
github.com/gobuffalo/pop/v5@v5.3.1 requires
github.com/mattn/go-sqlite3@v2.0.3+incompatible: reading github.com/mattn/go-sqlite3/go.mod at revision v2.0.3: unknown revision v2.0.3
It turns out that github.com/mattn/go-sqlite3@v2.0.3+incompatible has been
recently retracted https://github.com/mattn/go-sqlite3/pull/998 and this
broke a ton of packages depending on it. I was able to fix it by adding
exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible
to our go.mod, see
https://github.com/mattn/go-sqlite3/issues/975#issuecomment-955661657
After adding it,
go get github.com/containers/image/v5@latest
succeeded and tools/prepare-source.sh took care of the rest.
Signed-off-by: Ondřej Budai <ondrej@budai.cz>
152 lines
4.6 KiB
Go
152 lines
4.6 KiB
Go
// Package zstd provides decompression of zstandard files.
|
|
//
|
|
// For advanced usage and examples, go to the README: https://github.com/klauspost/compress/tree/master/zstd#zstd
|
|
package zstd
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/binary"
|
|
"errors"
|
|
"log"
|
|
"math"
|
|
"math/bits"
|
|
)
|
|
|
|
// enable debug printing
|
|
const debug = false
|
|
|
|
// enable encoding debug printing
|
|
const debugEncoder = debug
|
|
|
|
// enable decoding debug printing
|
|
const debugDecoder = debug
|
|
|
|
// Enable extra assertions.
|
|
const debugAsserts = debug || false
|
|
|
|
// print sequence details
|
|
const debugSequences = false
|
|
|
|
// print detailed matching information
|
|
const debugMatches = false
|
|
|
|
// force encoder to use predefined tables.
|
|
const forcePreDef = false
|
|
|
|
// zstdMinMatch is the minimum zstd match length.
|
|
const zstdMinMatch = 3
|
|
|
|
// Reset the buffer offset when reaching this.
|
|
const bufferReset = math.MaxInt32 - MaxWindowSize
|
|
|
|
// fcsUnknown is used for unknown frame content size.
|
|
const fcsUnknown = math.MaxUint64
|
|
|
|
var (
|
|
// ErrReservedBlockType is returned when a reserved block type is found.
|
|
// Typically this indicates wrong or corrupted input.
|
|
ErrReservedBlockType = errors.New("invalid input: reserved block type encountered")
|
|
|
|
// ErrCompressedSizeTooBig is returned when a block is bigger than allowed.
|
|
// Typically this indicates wrong or corrupted input.
|
|
ErrCompressedSizeTooBig = errors.New("invalid input: compressed size too big")
|
|
|
|
// ErrBlockTooSmall is returned when a block is too small to be decoded.
|
|
// Typically returned on invalid input.
|
|
ErrBlockTooSmall = errors.New("block too small")
|
|
|
|
// ErrUnexpectedBlockSize is returned when a block has unexpected size.
|
|
// Typically returned on invalid input.
|
|
ErrUnexpectedBlockSize = errors.New("unexpected block size")
|
|
|
|
// ErrMagicMismatch is returned when a "magic" number isn't what is expected.
|
|
// Typically this indicates wrong or corrupted input.
|
|
ErrMagicMismatch = errors.New("invalid input: magic number mismatch")
|
|
|
|
// ErrWindowSizeExceeded is returned when a reference exceeds the valid window size.
|
|
// Typically this indicates wrong or corrupted input.
|
|
ErrWindowSizeExceeded = errors.New("window size exceeded")
|
|
|
|
// ErrWindowSizeTooSmall is returned when no window size is specified.
|
|
// Typically this indicates wrong or corrupted input.
|
|
ErrWindowSizeTooSmall = errors.New("invalid input: window size was too small")
|
|
|
|
// ErrDecoderSizeExceeded is returned if decompressed size exceeds the configured limit.
|
|
ErrDecoderSizeExceeded = errors.New("decompressed size exceeds configured limit")
|
|
|
|
// ErrUnknownDictionary is returned if the dictionary ID is unknown.
|
|
// For the time being dictionaries are not supported.
|
|
ErrUnknownDictionary = errors.New("unknown dictionary")
|
|
|
|
// ErrFrameSizeExceeded is returned if the stated frame size is exceeded.
|
|
// This is only returned if SingleSegment is specified on the frame.
|
|
ErrFrameSizeExceeded = errors.New("frame size exceeded")
|
|
|
|
// ErrFrameSizeMismatch is returned if the stated frame size does not match the expected size.
|
|
// This is only returned if SingleSegment is specified on the frame.
|
|
ErrFrameSizeMismatch = errors.New("frame size does not match size on stream")
|
|
|
|
// ErrCRCMismatch is returned if CRC mismatches.
|
|
ErrCRCMismatch = errors.New("CRC check failed")
|
|
|
|
// ErrDecoderClosed will be returned if the Decoder was used after
|
|
// Close has been called.
|
|
ErrDecoderClosed = errors.New("decoder used after Close")
|
|
|
|
// ErrDecoderNilInput is returned when a nil Reader was provided
|
|
// and an operation other than Reset/DecodeAll/Close was attempted.
|
|
ErrDecoderNilInput = errors.New("nil input provided as reader")
|
|
)
|
|
|
|
func println(a ...interface{}) {
|
|
if debug || debugDecoder || debugEncoder {
|
|
log.Println(a...)
|
|
}
|
|
}
|
|
|
|
func printf(format string, a ...interface{}) {
|
|
if debug || debugDecoder || debugEncoder {
|
|
log.Printf(format, a...)
|
|
}
|
|
}
|
|
|
|
// matchLen returns the maximum length.
|
|
// a must be the shortest of the two.
|
|
// The function also returns whether all bytes matched.
|
|
func matchLen(a, b []byte) int {
|
|
b = b[:len(a)]
|
|
for i := 0; i < len(a)-7; i += 8 {
|
|
if diff := load64(a, i) ^ load64(b, i); diff != 0 {
|
|
return i + (bits.TrailingZeros64(diff) >> 3)
|
|
}
|
|
}
|
|
|
|
checked := (len(a) >> 3) << 3
|
|
a = a[checked:]
|
|
b = b[checked:]
|
|
for i := range a {
|
|
if a[i] != b[i] {
|
|
return i + checked
|
|
}
|
|
}
|
|
return len(a) + checked
|
|
}
|
|
|
|
func load3232(b []byte, i int32) uint32 {
|
|
return binary.LittleEndian.Uint32(b[i:])
|
|
}
|
|
|
|
func load6432(b []byte, i int32) uint64 {
|
|
return binary.LittleEndian.Uint64(b[i:])
|
|
}
|
|
|
|
func load64(b []byte, i int) uint64 {
|
|
return binary.LittleEndian.Uint64(b[i:])
|
|
}
|
|
|
|
type byter interface {
|
|
Bytes() []byte
|
|
Len() int
|
|
}
|
|
|
|
var _ byter = &bytes.Buffer{}
|