Skip to content

Commit 70e500e

Browse files
cypharcyphar
committed
deps: update to github.com/cyphar/[email protected]
This release includes a minor breaking API change that requires us to rework the types of our wrappers, but there is no practical behaviour change. Signed-off-by: Aleksa Sarai <[email protected]>
1 parent 8702864 commit 70e500e

8 files changed

Lines changed: 136 additions & 30 deletions

File tree

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/cilium/ebpf v0.17.1
1313
github.com/containerd/console v1.0.4
1414
github.com/coreos/go-systemd/v22 v22.5.0
15-
github.com/cyphar/filepath-securejoin v0.3.6
15+
github.com/cyphar/filepath-securejoin v0.4.1
1616
github.com/docker/go-units v0.5.0
1717
github.com/godbus/dbus/v5 v5.1.0
1818
github.com/moby/sys/capability v0.4.0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV
1010
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
1111
github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
1212
github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
13-
github.com/cyphar/filepath-securejoin v0.3.6 h1:4d9N5ykBnSp5Xn2JkhocYDkOpURL/18CYMpo6xB9uWM=
14-
github.com/cyphar/filepath-securejoin v0.3.6/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
13+
github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
14+
github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
1515
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1616
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
1717
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

‎libcontainer/utils/utils_unix.go‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -287,9 +287,6 @@ func IsLexicallyInRoot(root, path string) bool {
287287
// try to detect any symlink components in the path while we are doing the
288288
// MkdirAll.
289289
//
290-
// NOTE: Unlike os.MkdirAll, mode is not Go's os.FileMode, it is the unix mode
291-
// (the suid/sgid/sticky bits are not the same as for os.FileMode).
292-
//
293290
// NOTE: If unsafePath is a subpath of root, we assume that you have already
294291
// called SecureJoin and so we use the provided path verbatim without resolving
295292
// any symlinks (this is done in a way that avoids symlink-exchange races).
@@ -300,7 +297,7 @@ func IsLexicallyInRoot(root, path string) bool {
300297
// handling if unsafePath has already been scoped within the rootfs (this is
301298
// needed for a lot of runc callers and fixing this would require reworking a
302299
// lot of path logic).
303-
func MkdirAllInRootOpen(root, unsafePath string, mode uint32) (_ *os.File, Err error) {
300+
func MkdirAllInRootOpen(root, unsafePath string, mode os.FileMode) (_ *os.File, Err error) {
304301
// If the path is already "within" the root, get the path relative to the
305302
// root and use that as the unsafe path. This is necessary because a lot of
306303
// MkdirAllInRootOpen callers have already done SecureJoin, and refactoring
@@ -334,12 +331,12 @@ func MkdirAllInRootOpen(root, unsafePath string, mode uint32) (_ *os.File, Err e
334331
}
335332
defer rootDir.Close()
336333

337-
return securejoin.MkdirAllHandle(rootDir, unsafePath, int(mode))
334+
return securejoin.MkdirAllHandle(rootDir, unsafePath, mode)
338335
}
339336

340337
// MkdirAllInRoot is a wrapper around MkdirAllInRootOpen which closes the
341338
// returned handle, for callers that don't need to use it.
342-
func MkdirAllInRoot(root, unsafePath string, mode uint32) error {
339+
func MkdirAllInRoot(root, unsafePath string, mode os.FileMode) error {
343340
f, err := MkdirAllInRootOpen(root, unsafePath, mode)
344341
if err == nil {
345342
_ = f.Close()

‎vendor/github.com/cyphar/filepath-securejoin/CHANGELOG.md‎

Lines changed: 48 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/cyphar/filepath-securejoin/VERSION‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/cyphar/filepath-securejoin/join.go‎

Lines changed: 45 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/cyphar/filepath-securejoin/mkdir_linux.go‎

Lines changed: 35 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ github.com/coreos/go-systemd/v22/dbus
2727
# github.com/cpuguy83/go-md2man/v2 v2.0.5
2828
## explicit; go 1.11
2929
github.com/cpuguy83/go-md2man/v2/md2man
30-
# github.com/cyphar/filepath-securejoin v0.3.6
30+
# github.com/cyphar/filepath-securejoin v0.4.1
3131
## explicit; go 1.18
3232
github.com/cyphar/filepath-securejoin
3333
# github.com/docker/go-units v0.5.0

0 commit comments

Comments
 (0)