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

Use pkg/homedir to get the home config directory 

Also, log a warning if there is an error when reading
the local policy.json file, if the error is other than ENOEXIST

[NO NEW TESTS NEEDED]

Signed-off-by: Ismael Arias <ismaelariasmn@gmail.com>
This commit is contained in:
Ismael Arias 2023-07-17 14:12:01 +02:00
parent a3bbc3a2ca
commit ca9874ab7d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/trust/policy.go
View File

@ -18,9 +18,6 @@ import (
"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"`
@ -61,10 +58,17 @@ func DefaultPolicyPath(sys *types.SystemContext) string {
if sys != nil && sys.SignaturePolicyPath != "" { if sys != nil && sys.SignaturePolicyPath != "" {
return sys.SignaturePolicyPath return sys.SignaturePolicyPath
} }
userPolicyFilePath := filepath.Join(homedir.Get(), userPolicyFile)
if _, err := os.Stat(userPolicyFilePath); err == nil { confDir, _ := homedir.GetConfigHome()
userPolicyFilePath := filepath.Join(confDir, filepath.FromSlash("containers/policy.json"))
_, err := os.Stat(userPolicyFilePath)
if err == nil {
return userPolicyFilePath return userPolicyFilePath
} }
if !os.IsNotExist(err) {
logrus.Warnf("Error trying to read local config file: %s", err.Error())
}
systemDefaultPolicyPath := config.DefaultSignaturePolicyPath systemDefaultPolicyPath := config.DefaultSignaturePolicyPath
if sys != nil && sys.RootForImplicitAbsolutePaths != "" { if sys != nil && sys.RootForImplicitAbsolutePaths != "" {
return filepath.Join(sys.RootForImplicitAbsolutePaths, systemDefaultPolicyPath) return filepath.Join(sys.RootForImplicitAbsolutePaths, systemDefaultPolicyPath)