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>
96 lines
2.4 KiB
Go
96 lines
2.4 KiB
Go
// Copyright 2018 Google LLC All Rights Reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package name
|
|
|
|
import (
|
|
"strings"
|
|
)
|
|
|
|
const (
|
|
// These have the form: sha256:<hex string>
|
|
// TODO(dekkagaijin): replace with opencontainers/go-digest or docker/distribution's validation.
|
|
digestChars = "sh:0123456789abcdef"
|
|
digestDelim = "@"
|
|
)
|
|
|
|
// Digest stores a digest name in a structured form.
|
|
type Digest struct {
|
|
Repository
|
|
digest string
|
|
original string
|
|
}
|
|
|
|
// Ensure Digest implements Reference
|
|
var _ Reference = (*Digest)(nil)
|
|
|
|
// Context implements Reference.
|
|
func (d Digest) Context() Repository {
|
|
return d.Repository
|
|
}
|
|
|
|
// Identifier implements Reference.
|
|
func (d Digest) Identifier() string {
|
|
return d.DigestStr()
|
|
}
|
|
|
|
// DigestStr returns the digest component of the Digest.
|
|
func (d Digest) DigestStr() string {
|
|
return d.digest
|
|
}
|
|
|
|
// Name returns the name from which the Digest was derived.
|
|
func (d Digest) Name() string {
|
|
return d.Repository.Name() + digestDelim + d.DigestStr()
|
|
}
|
|
|
|
// String returns the original input string.
|
|
func (d Digest) String() string {
|
|
return d.original
|
|
}
|
|
|
|
func checkDigest(name string) error {
|
|
return checkElement("digest", name, digestChars, 7+64, 7+64)
|
|
}
|
|
|
|
// NewDigest returns a new Digest representing the given name.
|
|
func NewDigest(name string, opts ...Option) (Digest, error) {
|
|
// Split on "@"
|
|
parts := strings.Split(name, digestDelim)
|
|
if len(parts) != 2 {
|
|
return Digest{}, newErrBadName("a digest must contain exactly one '@' separator (e.g. registry/repository@digest) saw: %s", name)
|
|
}
|
|
base := parts[0]
|
|
digest := parts[1]
|
|
|
|
// Always check that the digest is valid.
|
|
if err := checkDigest(digest); err != nil {
|
|
return Digest{}, err
|
|
}
|
|
|
|
tag, err := NewTag(base, opts...)
|
|
if err == nil {
|
|
base = tag.Repository.Name()
|
|
}
|
|
|
|
repo, err := NewRepository(base, opts...)
|
|
if err != nil {
|
|
return Digest{}, err
|
|
}
|
|
return Digest{
|
|
Repository: repo,
|
|
digest: digest,
|
|
original: name,
|
|
}, nil
|
|
}
|