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>
69 lines
2.3 KiB
Go
69 lines
2.3 KiB
Go
// Copyright 2015 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
// Package jsonpb provides functionality to marshal and unmarshal between a
|
|
// protocol buffer message and JSON. It follows the specification at
|
|
// https://developers.google.com/protocol-buffers/docs/proto3#json.
|
|
//
|
|
// Do not rely on the default behavior of the standard encoding/json package
|
|
// when called on generated message types as it does not operate correctly.
|
|
//
|
|
// Deprecated: Use the "google.golang.org/protobuf/encoding/protojson"
|
|
// package instead.
|
|
package jsonpb
|
|
|
|
import (
|
|
"github.com/golang/protobuf/proto"
|
|
"google.golang.org/protobuf/reflect/protoreflect"
|
|
"google.golang.org/protobuf/reflect/protoregistry"
|
|
"google.golang.org/protobuf/runtime/protoimpl"
|
|
)
|
|
|
|
// AnyResolver takes a type URL, present in an Any message,
|
|
// and resolves it into an instance of the associated message.
|
|
type AnyResolver interface {
|
|
Resolve(typeURL string) (proto.Message, error)
|
|
}
|
|
|
|
type anyResolver struct{ AnyResolver }
|
|
|
|
func (r anyResolver) FindMessageByName(message protoreflect.FullName) (protoreflect.MessageType, error) {
|
|
return r.FindMessageByURL(string(message))
|
|
}
|
|
|
|
func (r anyResolver) FindMessageByURL(url string) (protoreflect.MessageType, error) {
|
|
m, err := r.Resolve(url)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return protoimpl.X.MessageTypeOf(m), nil
|
|
}
|
|
|
|
func (r anyResolver) FindExtensionByName(field protoreflect.FullName) (protoreflect.ExtensionType, error) {
|
|
return protoregistry.GlobalTypes.FindExtensionByName(field)
|
|
}
|
|
|
|
func (r anyResolver) FindExtensionByNumber(message protoreflect.FullName, field protoreflect.FieldNumber) (protoreflect.ExtensionType, error) {
|
|
return protoregistry.GlobalTypes.FindExtensionByNumber(message, field)
|
|
}
|
|
|
|
func wellKnownType(s protoreflect.FullName) string {
|
|
if s.Parent() == "google.protobuf" {
|
|
switch s.Name() {
|
|
case "Empty", "Any",
|
|
"BoolValue", "BytesValue", "StringValue",
|
|
"Int32Value", "UInt32Value", "FloatValue",
|
|
"Int64Value", "UInt64Value", "DoubleValue",
|
|
"Duration", "Timestamp",
|
|
"NullValue", "Struct", "Value", "ListValue":
|
|
return string(s.Name())
|
|
}
|
|
}
|
|
return ""
|
|
}
|
|
|
|
func isMessageSet(md protoreflect.MessageDescriptor) bool {
|
|
ms, ok := md.(interface{ IsMessageSet() bool })
|
|
return ok && ms.IsMessageSet()
|
|
}
|