opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-22 12:14:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

rootless: add argument to GetConfiguredMappings

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2022-10-27 11:28:22 +02:00
parent 26e5661c27
commit 5dad34212f
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/rootless/rootless_linux.go
View File

@ -193,7 +193,7 @@ func joinUserAndMountNS(pid uint, pausePid string) (bool, int, error) {
} }
// GetConfiguredMappings returns the additional IDs configured for the current user. // GetConfiguredMappings returns the additional IDs configured for the current user.
func GetConfiguredMappings() ([]idtools.IDMap, []idtools.IDMap, error) { func GetConfiguredMappings(quiet bool) ([]idtools.IDMap, []idtools.IDMap, error) {
var uids, gids []idtools.IDMap var uids, gids []idtools.IDMap
username := os.Getenv("USER") username := os.Getenv("USER")
if username == "" { if username == "" {
@ -211,7 +211,7 @@ func GetConfiguredMappings() ([]idtools.IDMap, []idtools.IDMap, error) {
mappings, err := idtools.NewIDMappings(username, username) mappings, err := idtools.NewIDMappings(username, username)
if err != nil { if err != nil {
logLevel := logrus.ErrorLevel logLevel := logrus.ErrorLevel
if os.Geteuid() == 0 && GetRootlessUID() == 0 { if quiet || (os.Geteuid() == 0 && GetRootlessUID() == 0) {
logLevel = logrus.DebugLevel logLevel = logrus.DebugLevel
} }
logrus.StandardLogger().Logf(logLevel, "cannot find UID/GID for user %s: %v - check rootless mode in man pages.", username, err) logrus.StandardLogger().Logf(logLevel, "cannot find UID/GID for user %s: %v - check rootless mode in man pages.", username, err)
@ -317,7 +317,7 @@ func becomeRootInUserNS(pausePid, fileToRead string, fileOutput *os.File) (_ boo
return false, -1, fmt.Errorf("cannot re-exec process") return false, -1, fmt.Errorf("cannot re-exec process")
} }
uids, gids, err := GetConfiguredMappings() uids, gids, err := GetConfiguredMappings(false)
if err != nil { if err != nil {
return false, -1, err return false, -1, err
} }
@ -592,7 +592,7 @@ func ConfigurationMatches() (bool, error) {
return true, nil return true, nil
} }
uids, gids, err := GetConfiguredMappings() uids, gids, err := GetConfiguredMappings(false)
if err != nil { if err != nil {
return false, err return false, err
} }

2
pkg/rootless/rootless_unsupported.go
View File

@ -57,7 +57,7 @@ func ConfigurationMatches() (bool, error) {
} }
// GetConfiguredMappings returns the additional IDs configured for the current user. // GetConfiguredMappings returns the additional IDs configured for the current user.
func GetConfiguredMappings() ([]idtools.IDMap, []idtools.IDMap, error) { func GetConfiguredMappings(quiet bool) ([]idtools.IDMap, []idtools.IDMap, error) {
return nil, nil, errors.New("this function is not supported on this os") return nil, nil, errors.New("this function is not supported on this os")
} }

4
pkg/util/utils.go
View File

@ -366,7 +366,7 @@ func GetKeepIDMapping(opts *namespaces.KeepIDUserNsOptions) (*stypes.IDMappingOp
gid = int(*opts.GID) gid = int(*opts.GID)
} }
uids, gids, err := rootless.GetConfiguredMappings() uids, gids, err := rootless.GetConfiguredMappings(false)
if err != nil { if err != nil {
return nil, -1, -1, fmt.Errorf("cannot read mappings: %w", err) return nil, -1, -1, fmt.Errorf("cannot read mappings: %w", err)
} }
@ -407,7 +407,7 @@ func GetNoMapMapping() (*stypes.IDMappingOptions, int, int, error) {
HostUIDMapping: false, HostUIDMapping: false,
HostGIDMapping: false, HostGIDMapping: false,
} }
uids, gids, err := rootless.GetConfiguredMappings() uids, gids, err := rootless.GetConfiguredMappings(false)
if err != nil { if err != nil {
return nil, -1, -1, fmt.Errorf("cannot read mappings: %w", err) return nil, -1, -1, fmt.Errorf("cannot read mappings: %w", err)
} }