containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix trust not using local policy file 

When running the `trust` command, only the global policy.json file
was being taken into account.

Fixes #19073

[NO NEW TESTS NEEDED]

Signed-off-by: Ismael Arias <ismaelariasmn@gmail.com>
This commit is contained in:
Ismael Arias 2023-07-13 22:13:31 +02:00
parent 72ec8824a0
commit a3bbc3a2ca
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/trust/policy.go
View File

@ -14,9 +14,13 @@ import (
"github.com/containers/common/pkg/config" "github.com/containers/common/pkg/config"
"github.com/containers/image/v5/types" "github.com/containers/image/v5/types"
"github.com/containers/storage/pkg/homedir"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
// userPolicyFile is the path to the per user policy path.
var userPolicyFile = filepath.FromSlash(".config/containers/policy.json")
// policyContent is the overall structure of a policy.json file (= c/image/v5/signature.Policy) // policyContent is the overall structure of a policy.json file (= c/image/v5/signature.Policy)
type policyContent struct { type policyContent struct {
Default []repoContent `json:"default"` Default []repoContent `json:"default"`
@ -54,14 +58,16 @@ type genericRepoMap map[string]json.RawMessage
// DefaultPolicyPath returns a path to the default policy of the system. // DefaultPolicyPath returns a path to the default policy of the system.
func DefaultPolicyPath(sys *types.SystemContext) string { func DefaultPolicyPath(sys *types.SystemContext) string {
systemDefaultPolicyPath := config.DefaultSignaturePolicyPath if sys != nil && sys.SignaturePolicyPath != "" {
if sys != nil {
if sys.SignaturePolicyPath != "" {
return sys.SignaturePolicyPath return sys.SignaturePolicyPath
} }
if sys.RootForImplicitAbsolutePaths != "" { userPolicyFilePath := filepath.Join(homedir.Get(), userPolicyFile)
return filepath.Join(sys.RootForImplicitAbsolutePaths, systemDefaultPolicyPath) if _, err := os.Stat(userPolicyFilePath); err == nil {
return userPolicyFilePath
} }
systemDefaultPolicyPath := config.DefaultSignaturePolicyPath
if sys != nil && sys.RootForImplicitAbsolutePaths != "" {
return filepath.Join(sys.RootForImplicitAbsolutePaths, systemDefaultPolicyPath)
} }
return systemDefaultPolicyPath return systemDefaultPolicyPath
} }