3424a7c2e3
pkg/directory/directory.go:9:49: empty-lines: extra empty line at the start of a block (revive)
pkg/pubsub/publisher.go:8:48: empty-lines: extra empty line at the start of a block (revive)
pkg/loopback/attach_loopback.go:96:69: empty-lines: extra empty line at the start of a block (revive)
pkg/devicemapper/devmapper_wrapper.go:136:48: empty-lines: extra empty line at the start of a block (revive)
pkg/devicemapper/devmapper.go:391:35: empty-lines: extra empty line at the end of a block (revive)
pkg/devicemapper/devmapper.go:676:35: empty-lines: extra empty line at the end of a block (revive)
pkg/archive/changes_posix_test.go:15:38: empty-lines: extra empty line at the end of a block (revive)
pkg/devicemapper/devmapper.go:241:51: empty-lines: extra empty line at the start of a block (revive)
pkg/fileutils/fileutils_test.go:17:47: empty-lines: extra empty line at the end of a block (revive)
pkg/fileutils/fileutils_test.go:34:48: empty-lines: extra empty line at the end of a block (revive)
pkg/fileutils/fileutils_test.go:318:32: empty-lines: extra empty line at the end of a block (revive)
pkg/tailfile/tailfile.go:171:6: empty-lines: extra empty line at the end of a block (revive)
pkg/tarsum/fileinfosums_test.go:16:41: empty-lines: extra empty line at the end of a block (revive)
pkg/tarsum/tarsum_test.go:198:42: empty-lines: extra empty line at the start of a block (revive)
pkg/tarsum/tarsum_test.go:294:25: empty-lines: extra empty line at the start of a block (revive)
pkg/tarsum/tarsum_test.go:407:34: empty-lines: extra empty line at the end of a block (revive)
pkg/ioutils/fswriters_test.go:52:45: empty-lines: extra empty line at the end of a block (revive)
pkg/ioutils/writers_test.go:24:39: empty-lines: extra empty line at the end of a block (revive)
pkg/ioutils/bytespipe_test.go:78:26: empty-lines: extra empty line at the end of a block (revive)
pkg/sysinfo/sysinfo_linux_test.go:13:37: empty-lines: extra empty line at the end of a block (revive)
pkg/archive/archive_linux_test.go:57:64: empty-lines: extra empty line at the end of a block (revive)
pkg/archive/changes.go:248:72: empty-lines: extra empty line at the start of a block (revive)
pkg/archive/changes_posix_test.go:15:38: empty-lines: extra empty line at the end of a block (revive)
pkg/archive/copy.go:248:124: empty-lines: extra empty line at the end of a block (revive)
pkg/archive/diff_test.go:198:44: empty-lines: extra empty line at the end of a block (revive)
pkg/archive/archive.go:304:12: empty-lines: extra empty line at the end of a block (revive)
pkg/archive/archive.go:749:37: empty-lines: extra empty line at the end of a block (revive)
pkg/archive/archive.go:812:81: empty-lines: extra empty line at the start of a block (revive)
pkg/archive/copy_unix_test.go:347:34: empty-lines: extra empty line at the end of a block (revive)
pkg/system/path.go:11:39: empty-lines: extra empty line at the end of a block (revive)
pkg/system/meminfo_linux.go:29:21: empty-lines: extra empty line at the end of a block (revive)
pkg/plugins/plugins.go:135:32: empty-lines: extra empty line at the end of a block (revive)
pkg/authorization/response.go:71:48: empty-lines: extra empty line at the start of a block (revive)
pkg/authorization/api_test.go:18:51: empty-lines: extra empty line at the end of a block (revive)
pkg/authorization/middleware_test.go:23:44: empty-lines: extra empty line at the end of a block (revive)
pkg/authorization/middleware_unix_test.go:17:46: empty-lines: extra empty line at the end of a block (revive)
pkg/authorization/api_test.go:57:45: empty-lines: extra empty line at the end of a block (revive)
pkg/authorization/response.go:83:50: empty-lines: extra empty line at the start of a block (revive)
pkg/authorization/api_test.go:66:47: empty-lines: extra empty line at the end of a block (revive)
pkg/authorization/middleware_unix_test.go:45:48: empty-lines: extra empty line at the end of a block (revive)
pkg/authorization/response.go:145:75: empty-lines: extra empty line at the start of a block (revive)
pkg/authorization/middleware_unix_test.go:56:51: empty-lines: extra empty line at the end of a block (revive)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 412c650e05
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
163 lines
4.9 KiB
Go
163 lines
4.9 KiB
Go
package idtools // import "github.com/docker/docker/pkg/idtools"
|
|
|
|
import (
|
|
"fmt"
|
|
"regexp"
|
|
"sort"
|
|
"strconv"
|
|
"strings"
|
|
"sync"
|
|
)
|
|
|
|
// add a user and/or group to Linux /etc/passwd, /etc/group using standard
|
|
// Linux distribution commands:
|
|
// adduser --system --shell /bin/false --disabled-login --disabled-password --no-create-home --group <username>
|
|
// useradd -r -s /bin/false <username>
|
|
|
|
var (
|
|
once sync.Once
|
|
userCommand string
|
|
idOutRegexp = regexp.MustCompile(`uid=([0-9]+).*gid=([0-9]+)`)
|
|
)
|
|
|
|
const (
|
|
// default length for a UID/GID subordinate range
|
|
defaultRangeLen = 65536
|
|
defaultRangeStart = 100000
|
|
)
|
|
|
|
// AddNamespaceRangesUser takes a username and uses the standard system
|
|
// utility to create a system user/group pair used to hold the
|
|
// /etc/sub{uid,gid} ranges which will be used for user namespace
|
|
// mapping ranges in containers.
|
|
func AddNamespaceRangesUser(name string) (int, int, error) {
|
|
if err := addUser(name); err != nil {
|
|
return -1, -1, fmt.Errorf("Error adding user %q: %v", name, err)
|
|
}
|
|
|
|
// Query the system for the created uid and gid pair
|
|
out, err := execCmd("id", name)
|
|
if err != nil {
|
|
return -1, -1, fmt.Errorf("Error trying to find uid/gid for new user %q: %v", name, err)
|
|
}
|
|
matches := idOutRegexp.FindStringSubmatch(strings.TrimSpace(string(out)))
|
|
if len(matches) != 3 {
|
|
return -1, -1, fmt.Errorf("Can't find uid, gid from `id` output: %q", string(out))
|
|
}
|
|
uid, err := strconv.Atoi(matches[1])
|
|
if err != nil {
|
|
return -1, -1, fmt.Errorf("Can't convert found uid (%s) to int: %v", matches[1], err)
|
|
}
|
|
gid, err := strconv.Atoi(matches[2])
|
|
if err != nil {
|
|
return -1, -1, fmt.Errorf("Can't convert found gid (%s) to int: %v", matches[2], err)
|
|
}
|
|
|
|
// Now we need to create the subuid/subgid ranges for our new user/group (system users
|
|
// do not get auto-created ranges in subuid/subgid)
|
|
|
|
if err := createSubordinateRanges(name); err != nil {
|
|
return -1, -1, fmt.Errorf("Couldn't create subordinate ID ranges: %v", err)
|
|
}
|
|
return uid, gid, nil
|
|
}
|
|
|
|
func addUser(name string) error {
|
|
once.Do(func() {
|
|
// set up which commands are used for adding users/groups dependent on distro
|
|
if _, err := resolveBinary("adduser"); err == nil {
|
|
userCommand = "adduser"
|
|
} else if _, err := resolveBinary("useradd"); err == nil {
|
|
userCommand = "useradd"
|
|
}
|
|
})
|
|
var args []string
|
|
switch userCommand {
|
|
case "adduser":
|
|
args = []string{"--system", "--shell", "/bin/false", "--no-create-home", "--disabled-login", "--disabled-password", "--group", name}
|
|
case "useradd":
|
|
args = []string{"-r", "-s", "/bin/false", name}
|
|
default:
|
|
return fmt.Errorf("cannot add user; no useradd/adduser binary found")
|
|
}
|
|
|
|
if out, err := execCmd(userCommand, args...); err != nil {
|
|
return fmt.Errorf("failed to add user with error: %v; output: %q", err, string(out))
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func createSubordinateRanges(name string) error {
|
|
// first, we should verify that ranges weren't automatically created
|
|
// by the distro tooling
|
|
ranges, err := parseSubuid(name)
|
|
if err != nil {
|
|
return fmt.Errorf("Error while looking for subuid ranges for user %q: %v", name, err)
|
|
}
|
|
if len(ranges) == 0 {
|
|
// no UID ranges; let's create one
|
|
startID, err := findNextUIDRange()
|
|
if err != nil {
|
|
return fmt.Errorf("Can't find available subuid range: %v", err)
|
|
}
|
|
out, err := execCmd("usermod", "-v", fmt.Sprintf("%d-%d", startID, startID+defaultRangeLen-1), name)
|
|
if err != nil {
|
|
return fmt.Errorf("Unable to add subuid range to user: %q; output: %s, err: %v", name, out, err)
|
|
}
|
|
}
|
|
|
|
ranges, err = parseSubgid(name)
|
|
if err != nil {
|
|
return fmt.Errorf("Error while looking for subgid ranges for user %q: %v", name, err)
|
|
}
|
|
if len(ranges) == 0 {
|
|
// no GID ranges; let's create one
|
|
startID, err := findNextGIDRange()
|
|
if err != nil {
|
|
return fmt.Errorf("Can't find available subgid range: %v", err)
|
|
}
|
|
out, err := execCmd("usermod", "-w", fmt.Sprintf("%d-%d", startID, startID+defaultRangeLen-1), name)
|
|
if err != nil {
|
|
return fmt.Errorf("Unable to add subgid range to user: %q; output: %s, err: %v", name, out, err)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func findNextUIDRange() (int, error) {
|
|
ranges, err := parseSubuid("ALL")
|
|
if err != nil {
|
|
return -1, fmt.Errorf("Couldn't parse all ranges in /etc/subuid file: %v", err)
|
|
}
|
|
sort.Sort(ranges)
|
|
return findNextRangeStart(ranges)
|
|
}
|
|
|
|
func findNextGIDRange() (int, error) {
|
|
ranges, err := parseSubgid("ALL")
|
|
if err != nil {
|
|
return -1, fmt.Errorf("Couldn't parse all ranges in /etc/subgid file: %v", err)
|
|
}
|
|
sort.Sort(ranges)
|
|
return findNextRangeStart(ranges)
|
|
}
|
|
|
|
func findNextRangeStart(rangeList ranges) (int, error) {
|
|
startID := defaultRangeStart
|
|
for _, arange := range rangeList {
|
|
if wouldOverlap(arange, startID) {
|
|
startID = arange.Start + arange.Length
|
|
}
|
|
}
|
|
return startID, nil
|
|
}
|
|
|
|
func wouldOverlap(arange subIDRange, ID int) bool {
|
|
low := ID
|
|
high := ID + defaultRangeLen
|
|
if (low >= arange.Start && low <= arange.Start+arange.Length) ||
|
|
(high <= arange.Start+arange.Length && high >= arange.Start) {
|
|
return true
|
|
}
|
|
return false
|
|
}
|