Skip to content

Commit fe4306b

Browse files
bitokubitoku
committed
Pin github.com/cyphar/filepath-securejoin to v0.4.1
Signed-off-by: Ayato Tokubi <[email protected]>
1 parent ecc1c64 commit fe4306b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+925
-3250
lines changed

‎.golangci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ linters:
4141
- gocyclo
4242
- godot
4343
- goheader
44-
- gomoddirectives
4544
- gomodguard
4645
- goprintffuncname
4746
- gosmopolitan
@@ -100,6 +99,7 @@ linters:
10099
# - gocognit
101100
# - godoclint
102101
# - godox
102+
# - gomoddirectives
103103
# - gosec
104104
# - inamedparam
105105
# - interfacebloat

‎go.mod‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,3 +262,5 @@ require (
262262
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
263263
tags.cncf.io/container-device-interface/specs-go v1.0.0 // indirect
264264
)
265+
266+
replace github.com/cyphar/filepath-securejoin => github.com/cyphar/filepath-securejoin v0.4.1

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ github.com/cri-o/ocicni v0.4.3 h1:BfnrZrtr/F+o+b+yOguB1o6I4OzjieF3k3dN4MrsCJA=
127127
github.com/cri-o/ocicni v0.4.3/go.mod h1:RzIKSln5AT65hyyfGj3/gsfCpjiY1Y6rVK51Uc5YNzk=
128128
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 h1:uX1JmpONuD549D73r6cgnxyUu18Zb7yHAy5AYU0Pm4Q=
129129
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467/go.mod h1:uzvlm1mxhHkdfqitSA92i7Se+S9ksOn3a3qmv/kyOCw=
130-
github.com/cyphar/filepath-securejoin v0.5.0 h1:hIAhkRBMQ8nIeuVwcAoymp7MY4oherZdAxD+m0u9zaw=
131-
github.com/cyphar/filepath-securejoin v0.5.0/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
130+
github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
131+
github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
132132
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
133133
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
134134
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=

‎server/safemount_linux.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"os"
77
"path/filepath"
88

9-
"github.com/cyphar/filepath-securejoin/pathrs-lite"
9+
securejoin "github.com/cyphar/filepath-securejoin"
1010
"golang.org/x/sys/unix"
1111
)
1212

@@ -31,7 +31,7 @@ func (s *safeMountInfo) Close() {
3131
// The caller is responsible for closing the file descriptor and unmounting the subpath
3232
// when it's no longer needed.
3333
func safeMountSubPath(mountPoint, subpath, runDir string) (s *safeMountInfo, err error) {
34-
file, err := pathrs.OpenInRoot(mountPoint, subpath)
34+
file, err := securejoin.OpenInRoot(mountPoint, subpath)
3535
if err != nil {
3636
return nil, err
3737
}

‎vendor/github.com/cyphar/filepath-securejoin/.golangci.yml‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

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

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

0 commit comments

Comments
 (0)