Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

integrate github.com/opencontainers/runc/libcontainer/user #132

Closed
wants to merge 54 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
cd89770
Add licensing information
May 17, 2014
e0540b3
Update copyright year in NOTICE
thaJeztah Feb 22, 2015
bf18215
Move libcontainer into subdirectory
crosbymichael Jun 22, 2015
7f31940
Initial commit of runc binary
crosbymichael Jun 22, 2015
193105f
Move libcontainer documenation to root of repo
crosbymichael Jun 26, 2015
c642b1d
Merge pull request #44 from crosbymichael/move-docs
Jun 26, 2015
6fc9ccb
libcontainer: user: fix GetAdditionalGroupsPath to match API
cyphar Jun 28, 2015
2506f1f
libcontainer: user: update tests for GetAdditionalGroups
cyphar Jun 28, 2015
ce7057e
Allow numeric groups for containers without /etc/group
Oct 4, 2015
0741b3a
Export user and group lookup errors as variables.
Mar 17, 2016
8ea1421
libcontainer: user: always treat numeric ids numerically
cyphar Mar 30, 2016
1a8bef2
libcontainer: user: add tests for numeric user specifications
cyphar Mar 30, 2016
ac8e0fb
libcontainer: user: general cleanups
cyphar Mar 30, 2016
d10b5db
Merge pull request #708 from cyphar/treat-numric-ids-properly
cyphar Mar 30, 2016
1fa7be4
Fix TestGetAdditionalGroups on i686
hqhq Sep 27, 2016
a62fa44
Cleanup: remove redundant code
coolljt0725 Jan 9, 2017
e09540e
user: fix the parameter error
datawolf Jan 18, 2017
8b332d1
libcontainer/user: add supplementary groups only for non-numeric users
vrothberg May 16, 2017
ab207d2
Move libcontainer to x/sys/unix
clnperez May 9, 2017
f013111
Merge pull request #1450 from vrothberg/sgid-non-numeric
crosbymichael Jul 7, 2017
d301822
Move user pkg unix specific calls to unix file
mlaventure Aug 3, 2017
58203cc
Merge pull request #1545 from mlaventure/user-pkg-move-unix-call
dqminh Aug 3, 2017
fd4f1eb
Revert "Merge pull request #1450 from vrothberg/sgid-non-numeric"
mlaventure Aug 4, 2017
23a7aa4
remove placeholder for non-linux platforms
dqminh Nov 16, 2017
3ce86cc
libcontainer/user: platform dependent calls
vbatts Feb 28, 2018
9f47d84
Merge pull request #1749 from vbatts/platform.1
crosbymichael Mar 1, 2018
cb1a439
libcontainer: add parser for /etc/sub{u,g}id and /proc/PID/{u,g}id_map
AkihiroSuda Jan 16, 2018
49fa3ac
libcontainer: fix compilation on GOARCH=arm GOARM=6 (32 bits)
Jun 14, 2018
904db40
libcontainer: CurrentGroupSubGIDs -> CurrentUserSubGIDs
AkihiroSuda Aug 28, 2018
56325ec
Nit: fix use of bufio.Scanner.Err
kolyshkin Mar 27, 2020
0a4af57
make sure pty.Close() will be called and fix comment
tjucoder Jul 5, 2020
edaffe2
use string-concatenation instead of sprintf for simple cases
thaJeztah Sep 29, 2020
b9b4951
Fixing some lint issues
knabben Oct 3, 2020
5e586f7
Fix int overflow in test on 32 bit system
zhsj Jan 23, 2021
8f65c53
Move fuzzers upstream
AdamKorcz Mar 8, 2021
cd6c33a
libct/user: rm windows code
kolyshkin Nov 30, 2020
3e00b3a
libcontainer/user: fix windows compile error
thaJeztah Mar 14, 2021
9c05db5
libcontainer/user: remove outdated MAINTAINERS file
thaJeztah Mar 14, 2021
380d796
Use gofumpt to format code
kolyshkin Jun 1, 2021
265a448
libcontainer/user: remove unused ErrUnsupported
thaJeztah May 27, 2021
c29d7f3
libcontainer/user: fix capitalization (golint)
thaJeztah Jun 1, 2021
bd6f546
Replace fmt.Errorf w/o %-style to errors.New
kolyshkin Jun 8, 2021
7a0c59a
*: fmt.Errorf: use %w when appropriate
kolyshkin Jun 9, 2021
022d523
merge branch 'pr-3011'
cyphar Jun 24, 2021
d680357
libct/user: use []byte more, avoid allocations
kolyshkin Jul 2, 2021
0f3a879
libct/user: ParseGroupFilter: use TrimSpace
kolyshkin Jul 2, 2021
8c5b6d8
libct/user: fix parsing long /etc/group lines
kolyshkin Jul 2, 2021
dcd10a9
*: add go-1.17+ go:build tags
kolyshkin Aug 31, 2021
2be1976
libct: fixes for godoc 1.19
kolyshkin Aug 3, 2022
b849d11
ci/gha: add space-at-eol check, fix existing issues
kolyshkin May 31, 2023
5fc7791
ci: bump golangci-lint, remove fixed exception
kolyshkin Jun 28, 2023
eae4882
Merge pull request #3919 from kolyshkin/golint153
lifubang Jul 16, 2023
6fd7f26
integrate github.com/opencontainers/runc/libcontainer/user
thaJeztah Sep 16, 2023
863b987
user: add go.mod and integrate in CI
thaJeztah Sep 16, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
@@ -1,4 +1,4 @@
PACKAGES ?= mountinfo mount sequential signal symlink
PACKAGES ?= mountinfo mount sequential signal symlink user
BINDIR ?= _build/bin
CROSS ?= linux/arm linux/arm64 linux/ppc64le linux/s390x \
freebsd/amd64 openbsd/amd64 darwin/amd64 darwin/arm64 windows/amd64
Expand Down
191 changes: 191 additions & 0 deletions user/LICENSE
@@ -0,0 +1,191 @@

Apache License
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file may reside only in the root dir?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have a license at the root, and I was considering skipping this one; wasn't sure if the NOTICE could be in the subdirectory without the license next to it, but maybe that's fine

Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

Copyright 2014 Docker, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
17 changes: 17 additions & 0 deletions user/NOTICE
@@ -0,0 +1,17 @@
runc

Copyright 2012-2015 Docker, Inc.

This product includes software developed at Docker, Inc. (http://www.docker.com).

The following is courtesy of our legal counsel:


Use and transfer of Docker may be subject to certain restrictions by the
United States and other governments.
It is your responsibility to ensure that your use and/or transfer does not
violate applicable laws.

For more information, please see http://www.bis.doc.gov

See also http://www.apache.org/dev/crypto.html and/or seek legal counsel.
5 changes: 5 additions & 0 deletions user/go.mod
@@ -0,0 +1,5 @@
module github.com/moby/sys/user

go 1.17

require golang.org/x/sys v0.1.0
2 changes: 2 additions & 0 deletions user/go.sum
@@ -0,0 +1,2 @@
golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
157 changes: 157 additions & 0 deletions user/lookup_unix.go
@@ -0,0 +1,157 @@
//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
// +build darwin dragonfly freebsd linux netbsd openbsd solaris

package user

import (
"io"
"os"
"strconv"

"golang.org/x/sys/unix"
)

// Unix-specific path to the passwd and group formatted files.
const (
unixPasswdPath = "/etc/passwd"
unixGroupPath = "/etc/group"
)

// LookupUser looks up a user by their username in /etc/passwd. If the user
// cannot be found (or there is no /etc/passwd file on the filesystem), then
// LookupUser returns an error.
func LookupUser(username string) (User, error) {
return lookupUserFunc(func(u User) bool {
return u.Name == username
})
}

// LookupUid looks up a user by their user id in /etc/passwd. If the user cannot
// be found (or there is no /etc/passwd file on the filesystem), then LookupId
// returns an error.
func LookupUid(uid int) (User, error) {
return lookupUserFunc(func(u User) bool {
return u.Uid == uid
})
}

func lookupUserFunc(filter func(u User) bool) (User, error) {
// Get operating system-specific passwd reader-closer.
passwd, err := GetPasswd()
if err != nil {
return User{}, err
}
defer passwd.Close()

// Get the users.
users, err := ParsePasswdFilter(passwd, filter)
if err != nil {
return User{}, err
}

// No user entries found.
if len(users) == 0 {
return User{}, ErrNoPasswdEntries
}

// Assume the first entry is the "correct" one.
return users[0], nil
}

// LookupGroup looks up a group by its name in /etc/group. If the group cannot
// be found (or there is no /etc/group file on the filesystem), then LookupGroup
// returns an error.
func LookupGroup(groupname string) (Group, error) {
return lookupGroupFunc(func(g Group) bool {
return g.Name == groupname
})
}

// LookupGid looks up a group by its group id in /etc/group. If the group cannot
// be found (or there is no /etc/group file on the filesystem), then LookupGid
// returns an error.
func LookupGid(gid int) (Group, error) {
return lookupGroupFunc(func(g Group) bool {
return g.Gid == gid
})
}

func lookupGroupFunc(filter func(g Group) bool) (Group, error) {
// Get operating system-specific group reader-closer.
group, err := GetGroup()
if err != nil {
return Group{}, err
}
defer group.Close()

// Get the users.
groups, err := ParseGroupFilter(group, filter)
if err != nil {
return Group{}, err
}

// No user entries found.
if len(groups) == 0 {
return Group{}, ErrNoGroupEntries
}

// Assume the first entry is the "correct" one.
return groups[0], nil
}

func GetPasswdPath() (string, error) {
return unixPasswdPath, nil
}

func GetPasswd() (io.ReadCloser, error) {
return os.Open(unixPasswdPath)
}

func GetGroupPath() (string, error) {
return unixGroupPath, nil
}

func GetGroup() (io.ReadCloser, error) {
return os.Open(unixGroupPath)
}

// CurrentUser looks up the current user by their user id in /etc/passwd. If the
// user cannot be found (or there is no /etc/passwd file on the filesystem),
// then CurrentUser returns an error.
func CurrentUser() (User, error) {
return LookupUid(unix.Getuid())
}

// CurrentGroup looks up the current user's group by their primary group id's
// entry in /etc/passwd. If the group cannot be found (or there is no
// /etc/group file on the filesystem), then CurrentGroup returns an error.
func CurrentGroup() (Group, error) {
return LookupGid(unix.Getgid())
}

func currentUserSubIDs(fileName string) ([]SubID, error) {
u, err := CurrentUser()
if err != nil {
return nil, err
}
filter := func(entry SubID) bool {
return entry.Name == u.Name || entry.Name == strconv.Itoa(u.Uid)
}
return ParseSubIDFileFilter(fileName, filter)
}

func CurrentUserSubUIDs() ([]SubID, error) {
return currentUserSubIDs("/etc/subuid")
}

func CurrentUserSubGIDs() ([]SubID, error) {
return currentUserSubIDs("/etc/subgid")
}

func CurrentProcessUIDMap() ([]IDMap, error) {
return ParseIDMapFile("/proc/self/uid_map")
}

func CurrentProcessGIDMap() ([]IDMap, error) {
return ParseIDMapFile("/proc/self/gid_map")
}