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>
134 lines
4.1 KiB
Go
134 lines
4.1 KiB
Go
/*
|
|
Copyright The ocicrypt Authors.
|
|
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 pkcs11
|
|
|
|
import (
|
|
"fmt"
|
|
"github.com/pkg/errors"
|
|
pkcs11uri "github.com/stefanberger/go-pkcs11uri"
|
|
"gopkg.in/yaml.v3"
|
|
)
|
|
|
|
// Pkcs11KeyFile describes the format of the pkcs11 (private) key file.
|
|
// It also carries pkcs11 module related environment variables that are transferred to the
|
|
// Pkcs11URI object and activated when the pkcs11 module is used.
|
|
type Pkcs11KeyFile struct {
|
|
Pkcs11 struct {
|
|
Uri string `yaml:"uri"`
|
|
} `yaml:"pkcs11"`
|
|
Module struct {
|
|
Env map[string]string `yaml:"env,omitempty"`
|
|
} `yaml:"module"`
|
|
}
|
|
|
|
// Pkcs11KeyFileObject is a representation of the Pkcs11KeyFile with the pkcs11 URI as an object
|
|
type Pkcs11KeyFileObject struct {
|
|
Uri *pkcs11uri.Pkcs11URI
|
|
}
|
|
|
|
// ParsePkcs11Uri parses a pkcs11 URI
|
|
func ParsePkcs11Uri(uri string) (*pkcs11uri.Pkcs11URI, error) {
|
|
p11uri := pkcs11uri.New()
|
|
err := p11uri.Parse(uri)
|
|
if err != nil {
|
|
return nil, errors.Wrapf(err, "Could not parse Pkcs11URI from file")
|
|
}
|
|
return p11uri, err
|
|
}
|
|
|
|
// ParsePkcs11KeyFile parses a pkcs11 key file holding a pkcs11 URI describing a private key.
|
|
// The file has the following yaml format:
|
|
// pkcs11:
|
|
// - uri : <pkcs11 uri>
|
|
// An error is returned if the pkcs11 URI is malformed
|
|
func ParsePkcs11KeyFile(yamlstr []byte) (*Pkcs11KeyFileObject, error) {
|
|
p11keyfile := Pkcs11KeyFile{}
|
|
|
|
err := yaml.Unmarshal([]byte(yamlstr), &p11keyfile)
|
|
if err != nil {
|
|
return nil, errors.Wrapf(err, "Could not unmarshal pkcs11 keyfile")
|
|
}
|
|
|
|
p11uri, err := ParsePkcs11Uri(p11keyfile.Pkcs11.Uri)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
p11uri.SetEnvMap(p11keyfile.Module.Env)
|
|
|
|
return &Pkcs11KeyFileObject{Uri: p11uri}, err
|
|
}
|
|
|
|
// IsPkcs11PrivateKey checks whether the given YAML represents a Pkcs11 private key
|
|
func IsPkcs11PrivateKey(yamlstr []byte) bool {
|
|
_, err := ParsePkcs11KeyFile(yamlstr)
|
|
return err == nil
|
|
}
|
|
|
|
// IsPkcs11PublicKey checks whether the given YAML represents a Pkcs11 public key
|
|
func IsPkcs11PublicKey(yamlstr []byte) bool {
|
|
_, err := ParsePkcs11KeyFile(yamlstr)
|
|
return err == nil
|
|
}
|
|
|
|
// Pkcs11Config describes the layout of a pkcs11 config file
|
|
// The file has the following yaml format:
|
|
// module-directories:
|
|
// - /usr/lib64/pkcs11/
|
|
// allowd-module-paths
|
|
// - /usr/lib64/pkcs11/libsofthsm2.so
|
|
type Pkcs11Config struct {
|
|
ModuleDirectories []string `yaml:"module-directories"`
|
|
AllowedModulePaths []string `yaml:"allowed-module-paths"`
|
|
}
|
|
|
|
// GetDefaultModuleDirectories returns module directories covering
|
|
// a variety of Linux distros
|
|
func GetDefaultModuleDirectories() []string {
|
|
dirs := []string{
|
|
"/usr/lib64/pkcs11/", // Fedora,RHEL,openSUSE
|
|
"/usr/lib/pkcs11/", // Fedora,ArchLinux
|
|
"/usr/local/lib/pkcs11/",
|
|
"/usr/lib/softhsm/", // Debian,Ubuntu
|
|
}
|
|
|
|
// Debian directory: /usr/lib/(x86_64|aarch64|arm|powerpc64le|s390x)-linux-gnu/
|
|
hosttype, ostype, q := getHostAndOsType()
|
|
if len(hosttype) > 0 {
|
|
dir := fmt.Sprintf("/usr/lib/%s-%s-%s/", hosttype, ostype, q)
|
|
dirs = append(dirs, dir)
|
|
}
|
|
return dirs
|
|
}
|
|
|
|
// GetDefaultModuleDirectoresFormatted returns the default module directories formatted for YAML
|
|
func GetDefaultModuleDirectoriesYaml(indent string) string {
|
|
res := ""
|
|
|
|
for _, dir := range GetDefaultModuleDirectories() {
|
|
res += indent + "- " + dir + "\n"
|
|
}
|
|
return res
|
|
}
|
|
|
|
// ParsePkcs11ConfigFile parses a pkcs11 config file hat influences the module search behavior
|
|
// as well as the set of modules that users are allowed to use
|
|
func ParsePkcs11ConfigFile(yamlstr []byte) (*Pkcs11Config, error) {
|
|
p11conf := Pkcs11Config{}
|
|
|
|
err := yaml.Unmarshal([]byte(yamlstr), &p11conf)
|
|
if err != nil {
|
|
return &p11conf, errors.Wrapf(err, "Could not parse Pkcs11Config")
|
|
}
|
|
return &p11conf, nil
|
|
}
|