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>
97 lines
4.7 KiB
Go
97 lines
4.7 KiB
Go
// Note: Consider the API unstable until the code supports at least three different image formats or transports.
|
||
|
||
package signature
|
||
|
||
import (
|
||
"bytes"
|
||
"errors"
|
||
"fmt"
|
||
"io"
|
||
"strings"
|
||
|
||
// This code is used only to parse the data in an explicitly-untrusted
|
||
// code path, where cryptography is not relevant. For now, continue to
|
||
// use this frozen deprecated implementation. When mechanism_openpgp.go
|
||
// migrates to another implementation, this should migrate as well.
|
||
//lint:ignore SA1019 See above
|
||
"golang.org/x/crypto/openpgp" //nolint:staticcheck
|
||
)
|
||
|
||
// SigningMechanism abstracts a way to sign binary blobs and verify their signatures.
|
||
// Each mechanism should eventually be closed by calling Close().
|
||
type SigningMechanism interface {
|
||
// Close removes resources associated with the mechanism, if any.
|
||
Close() error
|
||
// SupportsSigning returns nil if the mechanism supports signing, or a SigningNotSupportedError.
|
||
SupportsSigning() error
|
||
// Sign creates a (non-detached) signature of input using keyIdentity.
|
||
// Fails with a SigningNotSupportedError if the mechanism does not support signing.
|
||
Sign(input []byte, keyIdentity string) ([]byte, error)
|
||
// Verify parses unverifiedSignature and returns the content and the signer's identity
|
||
Verify(unverifiedSignature []byte) (contents []byte, keyIdentity string, err error)
|
||
// UntrustedSignatureContents returns UNTRUSTED contents of the signature WITHOUT ANY VERIFICATION,
|
||
// along with a short identifier of the key used for signing.
|
||
// WARNING: The short key identifier (which corresponds to "Key ID" for OpenPGP keys)
|
||
// is NOT the same as a "key identity" used in other calls to this interface, and
|
||
// the values may have no recognizable relationship if the public key is not available.
|
||
UntrustedSignatureContents(untrustedSignature []byte) (untrustedContents []byte, shortKeyIdentifier string, err error)
|
||
}
|
||
|
||
// signingMechanismWithPassphrase is an internal extension of SigningMechanism.
|
||
type signingMechanismWithPassphrase interface {
|
||
SigningMechanism
|
||
|
||
// Sign creates a (non-detached) signature of input using keyIdentity and passphrase.
|
||
// Fails with a SigningNotSupportedError if the mechanism does not support signing.
|
||
SignWithPassphrase(input []byte, keyIdentity string, passphrase string) ([]byte, error)
|
||
}
|
||
|
||
// SigningNotSupportedError is returned when trying to sign using a mechanism which does not support that.
|
||
type SigningNotSupportedError string
|
||
|
||
func (err SigningNotSupportedError) Error() string {
|
||
return string(err)
|
||
}
|
||
|
||
// NewGPGSigningMechanism returns a new GPG/OpenPGP signing mechanism for the user’s default
|
||
// GPG configuration ($GNUPGHOME / ~/.gnupg)
|
||
// The caller must call .Close() on the returned SigningMechanism.
|
||
func NewGPGSigningMechanism() (SigningMechanism, error) {
|
||
return newGPGSigningMechanismInDirectory("")
|
||
}
|
||
|
||
// NewEphemeralGPGSigningMechanism returns a new GPG/OpenPGP signing mechanism which
|
||
// recognizes _only_ public keys from the supplied blob, and returns the identities
|
||
// of these keys.
|
||
// The caller must call .Close() on the returned SigningMechanism.
|
||
func NewEphemeralGPGSigningMechanism(blob []byte) (SigningMechanism, []string, error) {
|
||
return newEphemeralGPGSigningMechanism([][]byte{blob})
|
||
}
|
||
|
||
// gpgUntrustedSignatureContents returns UNTRUSTED contents of the signature WITHOUT ANY VERIFICATION,
|
||
// along with a short identifier of the key used for signing.
|
||
// WARNING: The short key identifier (which corresponds to "Key ID" for OpenPGP keys)
|
||
// is NOT the same as a "key identity" used in other calls to this interface, and
|
||
// the values may have no recognizable relationship if the public key is not available.
|
||
func gpgUntrustedSignatureContents(untrustedSignature []byte) (untrustedContents []byte, shortKeyIdentifier string, err error) {
|
||
// This uses the Golang-native OpenPGP implementation instead of gpgme because we are not doing any cryptography.
|
||
md, err := openpgp.ReadMessage(bytes.NewReader(untrustedSignature), openpgp.EntityList{}, nil, nil)
|
||
if err != nil {
|
||
return nil, "", err
|
||
}
|
||
if !md.IsSigned {
|
||
return nil, "", errors.New("The input is not a signature")
|
||
}
|
||
content, err := io.ReadAll(md.UnverifiedBody)
|
||
if err != nil {
|
||
// Coverage: An error during reading the body can happen only if
|
||
// 1) the message is encrypted, which is not our case (and we don’t give ReadMessage the key
|
||
// to decrypt the contents anyway), or
|
||
// 2) the message is signed AND we give ReadMessage a corresponding public key, which we don’t.
|
||
return nil, "", err
|
||
}
|
||
|
||
// Uppercase the key ID for minimal consistency with the gpgme-returned fingerprints
|
||
// (but note that key ID is a suffix of the fingerprint only for V4 keys, not V3)!
|
||
return content, strings.ToUpper(fmt.Sprintf("%016X", md.SignedByKeyId)), nil
|
||
}
|