Skip to content

Commit e08b4a4

Browse files
giuseppegiuseppe
committed
types: use functionalities from pkg/homedir
Signed-off-by: Giuseppe Scrivano <[email protected]>
1 parent 0e6a96b commit e08b4a4

File tree

4 files changed

+11
-414
lines changed

4 files changed

+11
-414
lines changed

‎types/options.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ import (
1111

1212
"github.com/BurntSushi/toml"
1313
cfg "github.com/containers/storage/pkg/config"
14+
"github.com/containers/storage/pkg/homedir"
1415
"github.com/containers/storage/pkg/idtools"
16+
"github.com/containers/storage/pkg/unshare"
1517
"github.com/sirupsen/logrus"
1618
)
1719

@@ -273,11 +275,17 @@ func isRootlessDriver(driver string) bool {
273275
func getRootlessStorageOpts(rootlessUID int, systemOpts StoreOptions) (StoreOptions, error) {
274276
var opts StoreOptions
275277

276-
dataDir, rootlessRuntime, err := getRootlessDirInfo(rootlessUID)
278+
dataDir, err := homedir.GetDataHome()
277279
if err != nil {
278280
return opts, err
279281
}
280-
opts.RunRoot = rootlessRuntime
282+
283+
rootlessRuntime, err := homedir.GetRuntimeDir()
284+
if err != nil {
285+
return opts, err
286+
}
287+
288+
opts.RunRoot = filepath.Join(rootlessRuntime, "containers")
281289
opts.PullOptions = systemOpts.PullOptions
282290
if systemOpts.RootlessStoragePath != "" {
283291
opts.GraphRoot, err = expandEnvPath(systemOpts.RootlessStoragePath, rootlessUID)
@@ -345,7 +353,7 @@ func getRootlessStorageOpts(rootlessUID int, systemOpts StoreOptions) (StoreOpti
345353

346354
// DefaultStoreOptionsAutoDetectUID returns the default storage ops for containers
347355
func DefaultStoreOptionsAutoDetectUID() (StoreOptions, error) {
348-
uid := getRootlessUID()
356+
uid := unshare.GetRootlessUID()
349357
return DefaultStoreOptions(uid != 0, uid)
350358
}
351359

‎types/utils.go

Lines changed: 0 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -2,162 +2,15 @@ package types
22

33
import (
44
"errors"
5-
"fmt"
65
"os"
76
"path/filepath"
87
"strconv"
98
"strings"
109

1110
"github.com/containers/storage/pkg/homedir"
12-
"github.com/containers/storage/pkg/system"
1311
"github.com/sirupsen/logrus"
1412
)
1513

16-
// GetRootlessRuntimeDir returns the runtime directory when running as non root
17-
func GetRootlessRuntimeDir(rootlessUID int) (string, error) {
18-
path, err := getRootlessRuntimeDir(rootlessUID)
19-
if err != nil {
20-
return "", err
21-
}
22-
path = filepath.Join(path, "containers")
23-
if err := os.MkdirAll(path, 0o700); err != nil {
24-
return "", fmt.Errorf("unable to make rootless runtime: %w", err)
25-
}
26-
return path, nil
27-
}
28-
29-
type rootlessRuntimeDirEnvironment interface {
30-
getProcCommandFile() string
31-
getRunUserDir() string
32-
getTmpPerUserDir() string
33-
34-
homeDirGetRuntimeDir() (string, error)
35-
systemLstat(string) (*system.StatT, error)
36-
homedirGet() string
37-
}
38-
39-
type rootlessRuntimeDirEnvironmentImplementation struct {
40-
procCommandFile string
41-
runUserDir string
42-
tmpPerUserDir string
43-
}
44-
45-
func (env rootlessRuntimeDirEnvironmentImplementation) getProcCommandFile() string {
46-
return env.procCommandFile
47-
}
48-
49-
func (env rootlessRuntimeDirEnvironmentImplementation) getRunUserDir() string {
50-
return env.runUserDir
51-
}
52-
53-
func (env rootlessRuntimeDirEnvironmentImplementation) getTmpPerUserDir() string {
54-
return env.tmpPerUserDir
55-
}
56-
57-
func (rootlessRuntimeDirEnvironmentImplementation) homeDirGetRuntimeDir() (string, error) {
58-
return homedir.GetRuntimeDir()
59-
}
60-
61-
func (rootlessRuntimeDirEnvironmentImplementation) systemLstat(path string) (*system.StatT, error) {
62-
return system.Lstat(path)
63-
}
64-
65-
func (rootlessRuntimeDirEnvironmentImplementation) homedirGet() string {
66-
return homedir.Get()
67-
}
68-
69-
func isRootlessRuntimeDirOwner(dir string, env rootlessRuntimeDirEnvironment) bool {
70-
st, err := env.systemLstat(dir)
71-
return err == nil && int(st.UID()) == os.Getuid() && st.Mode()&0o700 == 0o700 && st.Mode()&0o066 == 0o000
72-
}
73-
74-
// getRootlessRuntimeDirIsolated is an internal implementation detail of getRootlessRuntimeDir to allow testing.
75-
// Everyone but the tests this is intended for should only call getRootlessRuntimeDir, never this function.
76-
func getRootlessRuntimeDirIsolated(env rootlessRuntimeDirEnvironment) (string, error) {
77-
runtimeDir, err := env.homeDirGetRuntimeDir()
78-
if err == nil {
79-
return runtimeDir, nil
80-
}
81-
82-
initCommand, err := os.ReadFile(env.getProcCommandFile())
83-
if err != nil || string(initCommand) == "systemd" {
84-
runUserDir := env.getRunUserDir()
85-
if isRootlessRuntimeDirOwner(runUserDir, env) {
86-
return runUserDir, nil
87-
}
88-
}
89-
90-
tmpPerUserDir := env.getTmpPerUserDir()
91-
if tmpPerUserDir != "" {
92-
if _, err := env.systemLstat(tmpPerUserDir); os.IsNotExist(err) {
93-
if err := os.Mkdir(tmpPerUserDir, 0o700); err != nil {
94-
logrus.Errorf("Failed to create temp directory for user: %v", err)
95-
} else {
96-
return tmpPerUserDir, nil
97-
}
98-
} else if isRootlessRuntimeDirOwner(tmpPerUserDir, env) {
99-
return tmpPerUserDir, nil
100-
}
101-
}
102-
103-
homeDir := env.homedirGet()
104-
if homeDir == "" {
105-
return "", errors.New("neither XDG_RUNTIME_DIR nor temp dir nor HOME was set non-empty")
106-
}
107-
resolvedHomeDir, err := filepath.EvalSymlinks(homeDir)
108-
if err != nil {
109-
return "", err
110-
}
111-
return filepath.Join(resolvedHomeDir, "rundir"), nil
112-
}
113-
114-
func getRootlessRuntimeDir(rootlessUID int) (string, error) {
115-
return getRootlessRuntimeDirIsolated(
116-
rootlessRuntimeDirEnvironmentImplementation{
117-
"/proc/1/comm",
118-
fmt.Sprintf("/run/user/%d", rootlessUID),
119-
fmt.Sprintf("%s/containers-user-%d", os.TempDir(), rootlessUID),
120-
},
121-
)
122-
}
123-
124-
// getRootlessDirInfo returns the parent path of where the storage for containers and
125-
// volumes will be in rootless mode
126-
func getRootlessDirInfo(rootlessUID int) (string, string, error) {
127-
rootlessRuntime, err := GetRootlessRuntimeDir(rootlessUID)
128-
if err != nil {
129-
return "", "", err
130-
}
131-
132-
dataDir, err := homedir.GetDataHome()
133-
if err == nil {
134-
return dataDir, rootlessRuntime, nil
135-
}
136-
137-
home := homedir.Get()
138-
if home == "" {
139-
return "", "", fmt.Errorf("neither XDG_DATA_HOME nor HOME was set non-empty: %w", err)
140-
}
141-
// runc doesn't like symlinks in the rootfs path, and at least
142-
// on CoreOS /home is a symlink to /var/home, so resolve any symlink.
143-
resolvedHome, err := filepath.EvalSymlinks(home)
144-
if err != nil {
145-
return "", "", err
146-
}
147-
dataDir = filepath.Join(resolvedHome, ".local", "share")
148-
149-
return dataDir, rootlessRuntime, nil
150-
}
151-
152-
func getRootlessUID() int {
153-
uidEnv := os.Getenv("_CONTAINERS_ROOTLESS_UID")
154-
if uidEnv != "" {
155-
u, _ := strconv.Atoi(uidEnv)
156-
return u
157-
}
158-
return os.Geteuid()
159-
}
160-
16114
func expandEnvPath(path string, rootlessUID int) (string, error) {
16215
var err error
16316
path = strings.Replace(path, "$UID", strconv.Itoa(rootlessUID), -1)

0 commit comments

Comments
 (0)