use fileutils.(Le|E)xists from containers/storage/pkg/fileutils

go.mod

@@ -11,7 +11,7 @@ require (
  github.com/containernetworking/plugins v1.4.0
  github.com/containers/image/v5 v5.30.0
  github.com/containers/ocicrypt v1.1.10
- github.com/containers/storage v1.53.0
+ github.com/containers/storage v1.53.1-0.20240410101114-dfdc6bf225fa
  github.com/coreos/go-systemd/v22 v22.5.0
  github.com/cyphar/filepath-securejoin v0.2.4
  github.com/davecgh/go-spew v1.1.1
@@ -97,7 +97,7 @@ require (
  github.com/hashicorp/errwrap v1.1.0 // indirect
  github.com/inconshreveable/mousetrap v1.1.0 // indirect
  github.com/josharian/intern v1.0.0 // indirect
- github.com/klauspost/compress v1.17.7 // indirect
+ github.com/klauspost/compress v1.17.8 // indirect
  github.com/klauspost/pgzip v1.2.6 // indirect
  github.com/kr/fs v0.1.0 // indirect
  github.com/letsencrypt/boulder v0.0.0-20230907030200-6d76a0f91e1e // indirect
@@ -127,7 +127,7 @@ require (
  github.com/sylabs/sif/v2 v2.15.1 // indirect
  github.com/tchap/go-patricia/v2 v2.3.1 // indirect
  github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
- github.com/ulikunitz/xz v0.5.11 // indirect
+ github.com/ulikunitz/xz v0.5.12 // indirect
  github.com/vbatts/tar-split v0.11.5 // indirect
  github.com/vbauerster/mpb/v8 v8.7.2 // indirect
  github.com/vishvananda/netns v0.0.4 // indirect

go.sum

@@ -63,8 +63,8 @@ github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYgle
 github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY=
 github.com/containers/ocicrypt v1.1.10 h1:r7UR6o8+lyhkEywetubUUgcKFjOWOaWz8cEBrCPX0ic=
 github.com/containers/ocicrypt v1.1.10/go.mod h1:YfzSSr06PTHQwSTUKqDSjish9BeW1E4HUmreluQcMd8=
-github.com/containers/storage v1.53.0 h1:VSES3C/u1pxjTJIXvLrSmyP7OBtDky04oGu07UvdTEA=
-github.com/containers/storage v1.53.0/go.mod h1:pujcoOSc+upx15Jirdkebhtd8uJiLwbSd/mYT6zDJK8=
+github.com/containers/storage v1.53.1-0.20240410101114-dfdc6bf225fa h1:5y8ekWadigsYCIcrhdPn3B5g2peBAo5O/ls3UDElsT4=
+github.com/containers/storage v1.53.1-0.20240410101114-dfdc6bf225fa/go.mod h1:P4tgJNR/o42wmg+9WZtoJtOJvmZKu2dwzFQggcH9aQw=
 github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
@@ -252,8 +252,8 @@ github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0Lh
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg=
-github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU=
+github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU=
 github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -409,8 +409,8 @@ github.com/tchap/go-patricia/v2 v2.3.1/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwD
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 h1:e/5i7d4oYZ+C1wj2THlRK+oAhjeS/TRQwMfkIuet3w0=
 github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399/go.mod h1:LdwHTNJT99C5fTAzDz0ud328OgXz+gierycbcIx2fRs=
-github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
-github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
+github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
+github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/vbatts/tar-split v0.11.5 h1:3bHCTIheBm1qFTcgh9oPu+nNBtX+XJIupG/vacinCts=
 github.com/vbatts/tar-split v0.11.5/go.mod h1:yZbwRsSeGjusneWgA781EKej9HF8vme8okylkAeNKLk=
 github.com/vbauerster/mpb/v8 v8.7.2 h1:SMJtxhNho1MV3OuFgS1DAzhANN1Ejc5Ct+0iSaIkB14=

libimage/load.go

@@ -6,7 +6,6 @@ import (
  "context"
  "errors"
  "fmt"
- "os"
  "time"
 
  dirTransport "github.com/containers/image/v5/directory"
@@ -15,6 +14,7 @@ import (
  ociTransport "github.com/containers/image/v5/oci/layout"
  "github.com/containers/image/v5/transports"
  "github.com/containers/image/v5/types"
+ "github.com/containers/storage/pkg/fileutils"
  "github.com/sirupsen/logrus"
 )
 
@@ -141,7 +141,7 @@ func (r *Runtime) loadMultiImageDockerArchive(ctx context.Context, ref types.Ima
  // syntax to reference an image within the archive was used, so we
  // should.
  path := ref.StringWithinTransport()
- if _, err := os.Stat(path); err != nil {
+ if err := fileutils.Exists(path); err != nil {
  return r.copyFromDockerArchive(ctx, ref, options)
  }
 

libimage/manifests/manifests.go

@@ -32,6 +32,7 @@ import (
  "github.com/containers/image/v5/transports/alltransports"
  "github.com/containers/image/v5/types"
  "github.com/containers/storage"
+ "github.com/containers/storage/pkg/fileutils"
  "github.com/containers/storage/pkg/ioutils"
  "github.com/containers/storage/pkg/lockfile"
  digest "github.com/opencontainers/go-digest"
@@ -330,7 +331,7 @@ func (l *list) Reference(store storage.Store, multiple cp.ImageListSelection, in
  return nil, fmt.Errorf(`internal error: no file or blob with artifact "config" or "layer" digest %q recorded`, referencedBlobDigest)
  }
  expectedLayerBlobPath := filepath.Join(blobsDir, referencedBlobDigest.Encoded())
- if _, err := os.Lstat(expectedLayerBlobPath); err == nil {
+ if err := fileutils.Lexists(expectedLayerBlobPath); err == nil {
  // did this one already
  continue
  } else if knownFile {

libnetwork/cni/cni_types.go

@@ -4,10 +4,10 @@ package cni
 
 import (
  "net"
- "os"
  "path/filepath"
 
  "github.com/containers/common/libnetwork/types"
+ "github.com/containers/storage/pkg/fileutils"
 )
 
 const (
@@ -250,7 +250,7 @@ func newDNSNamePlugin(domainName string) dnsNameConfig {
 // hasDNSNamePlugin looks to see if the dnsname cni plugin is present
 func hasDNSNamePlugin(paths []string) bool {
  for _, p := range paths {
- if _, err := os.Stat(filepath.Join(p, "dnsname")); err == nil {
+ if err := fileutils.Exists(filepath.Join(p, "dnsname")); err == nil {
  return true
  }
  }

libnetwork/cni/network.go

@@ -19,6 +19,7 @@ import (
  "github.com/containers/common/libnetwork/types"
  "github.com/containers/common/pkg/config"
  "github.com/containers/common/pkg/version"
+ "github.com/containers/storage/pkg/fileutils"
  "github.com/containers/storage/pkg/lockfile"
  "github.com/containers/storage/pkg/unshare"
  "github.com/sirupsen/logrus"
@@ -331,7 +332,7 @@ func (n *cniNetwork) NetworkInfo() types.NetworkInfo {
  if err != nil {
  logrus.Infof("Failed to get the dnsname plugin version: %v", err)
  }
- if _, err := os.Stat(dnsPath); err == nil {
+ if err := fileutils.Exists(dnsPath); err == nil {
  info.DNS = types.DNSNetworkInfo{
  Path: dnsPath,
  Package: dnsPackage,

libnetwork/internal/rootlessnetns/netns_linux.go

@@ -16,6 +16,7 @@ import (
  "github.com/containers/common/pkg/config"
  "github.com/containers/common/pkg/netns"
  "github.com/containers/common/pkg/systemd"
+ "github.com/containers/storage/pkg/fileutils"
  "github.com/containers/storage/pkg/homedir"
  "github.com/containers/storage/pkg/lockfile"
  "github.com/hashicorp/go-multierror"
@@ -154,7 +155,7 @@ func (n *Netns) getOrCreateNetns() (ns.NetNS, bool, error) {
 }
 
 func (n *Netns) cleanup() error {
- if _, err := os.Stat(n.dir); err != nil {
+ if err := fileutils.Exists(n.dir); err != nil {
  if errors.Is(err, fs.ErrNotExist) {
  // dir does not exists no need for cleanup
  return nil
@@ -337,7 +338,7 @@ func (n *Netns) setupMounts() error {
  // 2. Also keep /run/systemd if it exists.
  // Many files are symlinked into this dir, for example /dev/log.
  runSystemd := "/run/systemd"
- _, err = os.Stat(runSystemd)
+ err = fileutils.Exists(runSystemd)
  if err == nil {
  newRunSystemd := n.getPath(runSystemd)
  err = mountAndMkdirDest(runSystemd, newRunSystemd, none, unix.MS_BIND|unix.MS_REC)
@@ -476,7 +477,7 @@ func (n *Netns) mountCNIVarDir() error {
  // while we could always use /var there are cases where a user might store the cni
  // configs under /var/custom and this would break
  for {
- if _, err := os.Stat(varTarget); err == nil {
+ if err := fileutils.Exists(varTarget); err == nil {
  varDir = n.getPath(varTarget)
  break
  }

libnetwork/resolvconf/resolv.go

@@ -7,6 +7,7 @@ import (
  "path/filepath"
  "strings"
 
+ "github.com/containers/storage/pkg/fileutils"
  "github.com/opencontainers/runtime-spec/specs-go"
  "github.com/sirupsen/logrus"
  "golang.org/x/exp/slices"
@@ -61,7 +62,7 @@ func getDefaultResolvConf(params *Params) ([]byte, bool, error) {
  if ns.Path != "" && !strings.HasPrefix(ns.Path, "/proc/") {
  // check for netns created by "ip netns"
  path := filepath.Join("/etc/netns", filepath.Base(ns.Path), "resolv.conf")
- _, err := os.Stat(path)
+ err := fileutils.Exists(path)
  if err == nil {
  resolveConf = path
  }

pkg/apparmor/apparmor_linux.go

@@ -16,6 +16,7 @@ import (
  "text/template"
 
  "github.com/containers/common/pkg/apparmor/internal/supported"
+ "github.com/containers/storage/pkg/fileutils"
  "github.com/containers/storage/pkg/unshare"
  runcaa "github.com/opencontainers/runc/libcontainer/apparmor"
  "github.com/sirupsen/logrus"
@@ -75,7 +76,7 @@ func (p *profileData) generateDefault(apparmorParserPath string, out io.Writer)
 
 // macrosExists checks if the passed macro exists.
 func macroExists(m string) bool {
- _, err := os.Stat(path.Join(profileDirectory, m))
+ err := fileutils.Exists(path.Join(profileDirectory, m))
  return err == nil
 }
 

pkg/auth/auth.go

@@ -16,6 +16,7 @@ import (
  "github.com/containers/image/v5/pkg/docker/config"
  "github.com/containers/image/v5/pkg/sysregistriesv2"
  "github.com/containers/image/v5/types"
+ "github.com/containers/storage/pkg/fileutils"
  "github.com/containers/storage/pkg/homedir"
  "github.com/sirupsen/logrus"
 )
@@ -69,7 +70,7 @@ func CheckAuthFile(pathOption string) error {
  if pathOption == "" {
  return nil
  }
- if _, err := os.Stat(pathOption); err != nil {
+ if err := fileutils.Exists(pathOption); err != nil {
  return fmt.Errorf("credential file is not accessible: %w", err)
  }
  return nil

pkg/cgroups/cgroups_linux.go

@@ -17,6 +17,7 @@ import (
  "syscall"
  "time"
 
+ "github.com/containers/storage/pkg/fileutils"
  "github.com/containers/storage/pkg/unshare"
  systemdDbus "github.com/coreos/go-systemd/v22/dbus"
  "github.com/godbus/dbus/v5"
@@ -367,7 +368,7 @@ func Load(path string) (*CgroupControl, error) {
  // check that the cgroup exists at least under one controller
  for name := range handlers {
  p := control.getCgroupv1Path(name)
- if _, err := os.Stat(p); err == nil {
+ if err := fileutils.Exists(p); err == nil {
  oneExists = true
  break
  }
@@ -575,7 +576,7 @@ func readCgroup2MapFile(ctr *CgroupControl, name string) (map[string][]string, e
 
 func (c *CgroupControl) createCgroupDirectory(controller string) (bool, error) {
  cPath := c.getCgroupv1Path(controller)
- _, err := os.Stat(cPath)
+ err := fileutils.Exists(cPath)
  if err == nil {
  return false, nil
  }

pkg/cgroups/utils_linux.go

@@ -13,6 +13,7 @@ import (
  "strings"
  "sync"
 
+ "github.com/containers/storage/pkg/fileutils"
  "github.com/opencontainers/runc/libcontainer/cgroups"
  "github.com/opencontainers/runc/libcontainer/configs"
  "github.com/sirupsen/logrus"
@@ -235,7 +236,7 @@ func MoveUnderCgroup(cgroup, subtree string, processes []uint32) error {
  cgroupRoot = filepath.Join(cgroupRoot, "unified")
 
  // Ignore the unified mount if it doesn't exist
- if _, err := os.Stat(cgroupRoot); err != nil && os.IsNotExist(err) {
+ if err := fileutils.Exists(cgroupRoot); err != nil && os.IsNotExist(err) {
  continue
  }
  } else if parts[1] != "" {

pkg/config/config.go

@@ -12,6 +12,7 @@ import (
  "github.com/containers/common/internal/attributedstring"
  "github.com/containers/common/libnetwork/types"
  "github.com/containers/common/pkg/capabilities"
+ "github.com/containers/storage/pkg/fileutils"
  "github.com/containers/storage/pkg/unshare"
  units "github.com/docker/go-units"
  selinux "github.com/opencontainers/selinux/go-selinux"
@@ -715,7 +716,7 @@ func (c *Config) CheckCgroupsAndAdjustConfig() {
  if hasSession {
  for _, part := range strings.Split(session, ",") {
  if strings.HasPrefix(part, "unix:path=") {
- _, err := os.Stat(strings.TrimPrefix(part, "unix:path="))
+ err := fileutils.Exists(strings.TrimPrefix(part, "unix:path="))
  hasSession = err == nil
  break
  }
@@ -780,7 +781,7 @@ func (c *EngineConfig) findRuntime() string {
  // Search for crun first followed by runc, runj, kata, runsc, ocijail
  for _, name := range []string{"crun", "runc", "runj", "kata", "runsc", "ocijail"} {
  for _, v := range c.OCIRuntimes[name] {
- if _, err := os.Stat(v); err == nil {
+ if err := fileutils.Exists(v); err == nil {
  return name
  }
  }
@@ -1189,7 +1190,7 @@ func (c *Config) FindInitBinary() (string, error) {
  return c.Engine.InitPath, nil
  }
  // keep old default working to guarantee backwards compat
- if _, err := os.Stat(DefaultInitPath); err == nil {
+ if err := fileutils.Exists(DefaultInitPath); err == nil {
  return DefaultInitPath, nil
  }
  return c.FindHelperBinary(defaultInitName, true)

pkg/config/config_local.go

@@ -9,6 +9,7 @@ import (
  "regexp"
  "strings"
 
+ "github.com/containers/storage/pkg/fileutils"
  units "github.com/docker/go-units"
  "tags.cncf.io/container-device-interface/pkg/parser"
 )
@@ -83,7 +84,7 @@ func (c *ContainersConfig) validateTZ() error {
 
  for _, paths := range lookupPaths {
  zonePath := filepath.Join(paths, c.TZ)
- if _, err := os.Stat(zonePath); err == nil {
+ if err := fileutils.Exists(zonePath); err == nil {
  // found zone information
  return nil
  }

pkg/config/default.go

@@ -13,6 +13,7 @@ import (
  nettypes "github.com/containers/common/libnetwork/types"
  "github.com/containers/common/pkg/apparmor"
  "github.com/containers/common/pkg/cgroupv2"
+ "github.com/containers/storage/pkg/fileutils"
  "github.com/containers/storage/pkg/homedir"
  "github.com/containers/storage/pkg/unshare"
  "github.com/containers/storage/types"
@@ -206,8 +207,8 @@ func defaultConfig() (*Config, error) {
  }
  sigPath := filepath.Join(configHome, DefaultRootlessSignaturePolicyPath)
  defaultEngineConfig.SignaturePolicyPath = sigPath
- if _, err := os.Stat(sigPath); err != nil {
- if _, err := os.Stat(DefaultSignaturePolicyPath); err == nil {
+ if err := fileutils.Exists(sigPath); err != nil {
+ if err := fileutils.Exists(DefaultSignaturePolicyPath); err == nil {
  defaultEngineConfig.SignaturePolicyPath = DefaultSignaturePolicyPath
  }
  }

pkg/config/modules.go

@@ -2,9 +2,9 @@ package config
 
 import (
  "fmt"
- "os"
  "path/filepath"
 
+ "github.com/containers/storage/pkg/fileutils"
  "github.com/containers/storage/pkg/homedir"
  "github.com/containers/storage/pkg/unshare"
  "github.com/hashicorp/go-multierror"
@@ -76,7 +76,7 @@ func ModuleDirectories() ([]string, error) { // Public API for shell completions
 // Resolve the specified path to a module.
 func resolveModule(path string, dirs []string) (string, error) {
  if filepath.IsAbs(path) {
- _, err := os.Stat(path)
+ err := fileutils.Exists(path)
  return path, err
  }
 
@@ -85,7 +85,7 @@ func resolveModule(path string, dirs []string) (string, error) {
  var multiErr error
  for _, d := range dirs {
  candidate := filepath.Join(d, path)
- _, err := os.Stat(candidate)
+ err := fileutils.Exists(candidate)
  if err == nil {
  return candidate, nil
  }

pkg/config/new.go

@@ -11,6 +11,7 @@ import (
  "sync"
 
  "github.com/BurntSushi/toml"
+ "github.com/containers/storage/pkg/fileutils"
  "github.com/sirupsen/logrus"
 )
 
@@ -101,7 +102,7 @@ func newLocked(options *Options) (*Config, error) {
  // The _OVERRIDE variable _must_ always win. That's a contract we need
  // to honor (for the Podman CI).
  if path := os.Getenv(containersConfOverrideEnv); path != "" {
- if _, err := os.Stat(path); err != nil {
+ if err := fileutils.Exists(path); err != nil {
  return nil, fmt.Errorf("%s file: %w", containersConfOverrideEnv, err)
  }
  options.additionalConfigs = append(options.additionalConfigs, path)
@@ -152,7 +153,7 @@ func NewConfig(userConfigPath string) (*Config, error) {
 // file settings.
 func systemConfigs() (configs []string, finalErr error) {
  if path := os.Getenv(containersConfEnv); path != "" {
- if _, err := os.Stat(path); err != nil {
+ if err := fileutils.Exists(path); err != nil {
  return nil, fmt.Errorf("%s file: %w", containersConfEnv, err)
  }
  return append(configs, path), nil