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>
90 lines
3.4 KiB
Go
90 lines
3.4 KiB
Go
// Note: Consider the API unstable until the code supports at least three different image formats or transports.
|
||
|
||
package signature
|
||
|
||
import (
|
||
"errors"
|
||
"fmt"
|
||
"strings"
|
||
|
||
"github.com/containers/image/v5/docker/reference"
|
||
"github.com/containers/image/v5/manifest"
|
||
"github.com/containers/image/v5/signature/internal"
|
||
"github.com/opencontainers/go-digest"
|
||
)
|
||
|
||
// SignOptions includes optional parameters for signing container images.
|
||
type SignOptions struct {
|
||
// Passphare to use when signing with the key identity.
|
||
Passphrase string
|
||
}
|
||
|
||
// SignDockerManifest returns a signature for manifest as the specified dockerReference,
|
||
// using mech and keyIdentity, and the specified options.
|
||
func SignDockerManifestWithOptions(m []byte, dockerReference string, mech SigningMechanism, keyIdentity string, options *SignOptions) ([]byte, error) {
|
||
manifestDigest, err := manifest.Digest(m)
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
sig := newUntrustedSignature(manifestDigest, dockerReference)
|
||
|
||
var passphrase string
|
||
if options != nil {
|
||
passphrase = options.Passphrase
|
||
// The gpgme implementation can’t use passphrase with \n; reject it here for consistent behavior.
|
||
if strings.Contains(passphrase, "\n") {
|
||
return nil, errors.New("invalid passphrase: must not contain a line break")
|
||
}
|
||
}
|
||
|
||
return sig.sign(mech, keyIdentity, passphrase)
|
||
}
|
||
|
||
// SignDockerManifest returns a signature for manifest as the specified dockerReference,
|
||
// using mech and keyIdentity.
|
||
func SignDockerManifest(m []byte, dockerReference string, mech SigningMechanism, keyIdentity string) ([]byte, error) {
|
||
return SignDockerManifestWithOptions(m, dockerReference, mech, keyIdentity, nil)
|
||
}
|
||
|
||
// VerifyDockerManifestSignature checks that unverifiedSignature uses expectedKeyIdentity to sign unverifiedManifest as expectedDockerReference,
|
||
// using mech.
|
||
func VerifyDockerManifestSignature(unverifiedSignature, unverifiedManifest []byte,
|
||
expectedDockerReference string, mech SigningMechanism, expectedKeyIdentity string) (*Signature, error) {
|
||
expectedRef, err := reference.ParseNormalizedNamed(expectedDockerReference)
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
sig, err := verifyAndExtractSignature(mech, unverifiedSignature, signatureAcceptanceRules{
|
||
validateKeyIdentity: func(keyIdentity string) error {
|
||
if keyIdentity != expectedKeyIdentity {
|
||
return internal.NewInvalidSignatureError(fmt.Sprintf("Signature by %s does not match expected fingerprint %s", keyIdentity, expectedKeyIdentity))
|
||
}
|
||
return nil
|
||
},
|
||
validateSignedDockerReference: func(signedDockerReference string) error {
|
||
signedRef, err := reference.ParseNormalizedNamed(signedDockerReference)
|
||
if err != nil {
|
||
return internal.NewInvalidSignatureError(fmt.Sprintf("Invalid docker reference %s in signature", signedDockerReference))
|
||
}
|
||
if signedRef.String() != expectedRef.String() {
|
||
return internal.NewInvalidSignatureError(fmt.Sprintf("Docker reference %s does not match %s",
|
||
signedDockerReference, expectedDockerReference))
|
||
}
|
||
return nil
|
||
},
|
||
validateSignedDockerManifestDigest: func(signedDockerManifestDigest digest.Digest) error {
|
||
matches, err := manifest.MatchesDigest(unverifiedManifest, signedDockerManifestDigest)
|
||
if err != nil {
|
||
return err
|
||
}
|
||
if !matches {
|
||
return internal.NewInvalidSignatureError(fmt.Sprintf("Signature for docker digest %q does not match", signedDockerManifestDigest))
|
||
}
|
||
return nil
|
||
},
|
||
})
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
return sig, nil
|
||
}
|