dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-09 09:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #53009 from thaJeztah/cleanup_setupRemappedRoot

Browse Source 
daemon: setupRemappedRoot: use early return and minor fixes
This commit is contained in:
Paweł Gronowski
2026-07-27 20:17:42 +02:00
committed by GitHub
parent 96396d290f 759df84c6b
commit 43b10febf6
1 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
daemon/daemon_unix.go
View File

@@ -1349,35 +1349,30 @@ func parseRemappedRoot(usergrp string) (string, string, error) {
return username, groupname, nil
}
func setupRemappedRoot(config *config.Config) (user.IdentityMapping, error) {
if runtime.GOOS != "linux" && config.RemappedRoot != "" {
return user.IdentityMapping{}, errors.New("User namespaces are only supported on Linux")
func setupRemappedRoot(cfg *config.Config) (user.IdentityMapping, error) {
if cfg.RemappedRoot == "" {
return user.IdentityMapping{}, nil
}
// if the daemon was started with remapped root option, parse
// the config option to the int uid,gid values
if config.RemappedRoot != "" {
username, groupname, err := parseRemappedRoot(config.RemappedRoot)
if err != nil {
return user.IdentityMapping{}, err
}
if username == "root" {
// Cannot setup user namespaces with a 1-to-1 mapping; "--root=0:0" is a no-op
// effectively
log.G(context.TODO()).Warn("User namespaces: root cannot be remapped with itself; user namespaces are OFF")
return user.IdentityMapping{}, nil
}
log.G(context.TODO()).Infof("User namespaces: ID ranges will be mapped to subuid/subgid ranges of: %s", username)
// update remapped root setting now that we have resolved them to actual names
config.RemappedRoot = fmt.Sprintf("%s:%s", username, groupname)
mappings, err := usergroup.LoadIdentityMapping(username)
if err != nil {
return user.IdentityMapping{}, errors.Wrap(err, "Can't create ID mappings")
}
return mappings, nil
// parse the config option to the int uid,gid values
username, groupname, err := parseRemappedRoot(cfg.RemappedRoot)
if err != nil {
return user.IdentityMapping{}, err
}
return user.IdentityMapping{}, nil
if username == "root" {
// Cannot set up user namespaces with a 1-to-1 mapping; "--root=0:0" is a no-op effectively
log.G(context.TODO()).Warn("User namespaces: root cannot be remapped with itself; user namespaces are OFF")
return user.IdentityMapping{}, nil
}
log.G(context.TODO()).Infof("User namespaces: ID ranges will be mapped to subuid/subgid ranges of: %s", username)
// update remapped root setting now that we have resolved them to actual names
cfg.RemappedRoot = fmt.Sprintf("%s:%s", username, groupname)
mappings, err := usergroup.LoadIdentityMapping(username)
if err != nil {
return user.IdentityMapping{}, fmt.Errorf("error creating ID mappings: %w", err)
}
return mappings, nil
}
func setupDaemonRoot(config *config.Config, rootDir string, uid, gid int) error {