Skip to content

Commit adcdb20

Browse files
andyzhangxandyzhangx
authored
Merge pull request #1047 from andyzhangx/CVE-2023-39325-1.23
[release-1.23] fix: CVE-2023-39325
2 parents aa60235 + 92c34e8 commit adcdb20

File tree

113 files changed

+1158
-2424
lines changed

Some content is hidden

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

113 files changed

+1158
-2424
lines changed

‎go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/pborman/uuid v1.2.1
1919
github.com/pelletier/go-toml v1.9.5
2020
github.com/stretchr/testify v1.8.4
21-
golang.org/x/net v0.13.0
21+
golang.org/x/net v0.17.0
2222
google.golang.org/grpc v1.54.0
2323
google.golang.org/protobuf v1.31.0
2424
k8s.io/api v0.28.1
@@ -125,13 +125,13 @@ require (
125125
go.uber.org/atomic v1.10.0 // indirect
126126
go.uber.org/multierr v1.11.0 // indirect
127127
go.uber.org/zap v1.19.0 // indirect
128-
golang.org/x/crypto v0.12.0 // indirect
128+
golang.org/x/crypto v0.14.0 // indirect
129129
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
130130
golang.org/x/oauth2 v0.8.0 // indirect
131131
golang.org/x/sync v0.3.0 // indirect
132-
golang.org/x/sys v0.11.0 // indirect
133-
golang.org/x/term v0.11.0 // indirect
134-
golang.org/x/text v0.12.0 // indirect
132+
golang.org/x/sys v0.13.0 // indirect
133+
golang.org/x/term v0.13.0 // indirect
134+
golang.org/x/text v0.13.0 // indirect
135135
golang.org/x/time v0.3.0 // indirect
136136
golang.org/x/tools v0.9.3 // indirect
137137
google.golang.org/appengine v1.6.7 // indirect

‎go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -413,8 +413,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
413413
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
414414
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
415415
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
416-
golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk=
417-
golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
416+
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
417+
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
418418
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
419419
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
420420
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -482,8 +482,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
482482
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
483483
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
484484
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
485-
golang.org/x/net v0.13.0 h1:Nvo8UFsZ8X3BhAC9699Z1j7XQ3rsZnUUm7jfBEk1ueY=
486-
golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
485+
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
486+
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
487487
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
488488
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
489489
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -542,13 +542,13 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
542542
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
543543
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
544544
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
545-
golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
546-
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
545+
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
546+
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
547547
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
548548
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
549549
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
550-
golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0=
551-
golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
550+
golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
551+
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
552552
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
553553
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
554554
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -558,8 +558,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
558558
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
559559
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
560560
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
561-
golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
562-
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
561+
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
562+
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
563563
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
564564
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
565565
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

‎hack/verify-examples.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ EXAMPLES=(\
4242
deploy/example/deployment.yaml \
4343
deploy/example/statefulset.yaml \
4444
deploy/example/statefulset-nonroot.yaml \
45-
deploy/example/deployment-nfs.yaml \
46-
deploy/example/statefulset-nfs.yaml \
47-
deploy/example/statefulset-nonroot-nfs.yaml \
4845
)
4946

5047
for EXAMPLE in "${EXAMPLES[@]}"; do

‎test/e2e/suite_test.go

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,11 @@ var blobDriver *blob.Driver
5555
var projectRoot string
5656

5757
type testCmd struct {
58-
command string
59-
args []string
60-
startLog string
61-
endLog string
58+
command string
59+
args []string
60+
startLog string
61+
endLog string
62+
ignoreError bool
6263
}
6364

6465
func TestMain(m *testing.M) {
@@ -160,10 +161,11 @@ var _ = ginkgo.SynchronizedBeforeSuite(func(ctx ginkgo.SpecContext) []byte {
160161
var _ = ginkgo.SynchronizedAfterSuite(func(ctx ginkgo.SpecContext) {},
161162
func(ctx ginkgo.SpecContext) {
162163
blobLog := testCmd{
163-
command: "bash",
164-
args: []string{"test/utils/blob_log.sh"},
165-
startLog: "==============start blob log(after suite)===================",
166-
endLog: "==============end blob log(after suite)===================",
164+
command: "bash",
165+
args: []string{"test/utils/blob_log.sh"},
166+
startLog: "==============start blob log(after suite)===================",
167+
endLog: "==============end blob log(after suite)===================",
168+
ignoreError: true,
167169
}
168170
e2eTeardown := testCmd{
169171
command: "make",
@@ -206,6 +208,9 @@ func execTestCmd(cmds []testCmd) {
206208
err := cmdSh.Run()
207209
if err != nil {
208210
log.Printf("Failed to run command: %s %s, Error: %s\n", cmd.command, strings.Join(cmd.args, " "), err.Error())
211+
if !cmd.ignoreError {
212+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
213+
}
209214
}
210215
gomega.Expect(err).NotTo(gomega.HaveOccurred())
211216
log.Println(cmd.endLog)

‎test/external-e2e/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
set -xe
1818

1919
PROJECT_ROOT=$(git rev-parse --show-toplevel)
20-
DRIVER="test"
20+
DRIVER="blob"
2121

2222
setup_e2e_binaries() {
2323
# download k8s external e2e binary

‎test/external-e2e/testdriver-blobfuse.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ShortName: blobfuse
55
StorageClass:
66
FromFile: /tmp/csi/storageclass.yaml
77
DriverInfo:
8-
Name: test.csi.azure.com
8+
Name: blob.csi.azure.com
99
Capabilities:
1010
persistence: true
1111
exec: true

‎test/external-e2e/testdriver-nfs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ShortName: blobfuse
55
StorageClass:
66
FromFile: /tmp/csi/storageclass.yaml
77
DriverInfo:
8-
Name: test.csi.azure.com
8+
Name: blob.csi.azure.com
99
Capabilities:
1010
persistence: true
1111
exec: true

‎test/utils/blob_log.sh

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
set -e
17+
# set -e
1818

1919
NS=kube-system
2020
CONTAINER=blob
@@ -49,11 +49,6 @@ kubectl get pods -n${NS} -l${LABEL} \
4949
| awk 'NR>1 {print $1}' \
5050
| xargs -I {} kubectl logs {} --prefix -c${CONTAINER} -n${NS}
5151

52-
echo "print out cloudprovider_azure metrics ..."
53-
echo "======================================================================================"
54-
ip=`kubectl get svc csi-$DRIVER-controller -n kube-system | awk '{print $4}'`
55-
curl http://$ip:29634/metrics
56-
5752
if [ -n "$ENABLE_BLOBFUSE_PROXY" ]; then
5853
echo "print out install-blobfuse-proxy logs ..."
5954
echo "======================================================================================"
@@ -64,4 +59,14 @@ if [ -n "$ENABLE_BLOBFUSE_PROXY" ]; then
6459
| xargs -I {} kubectl logs {} --prefix -c${PROXY} -n${NS}
6560
fi
6661

62+
echo "======================================================================================"
63+
ip=`kubectl get svc csi-$DRIVER-controller -n kube-system | awk '{print $4}'`
64+
if echo "$ip" | grep -q "\."; then
65+
echo "print out cloudprovider_azure metrics ..."
66+
curl http://$ip:29634/metrics
67+
else
68+
echo "csi-$DRIVER-controller service ip is empty"
69+
kubectl get svc csi-$DRIVER-controller -n kube-system
70+
fi
71+
6772

‎vendor/golang.org/x/crypto/chacha20/chacha_arm64.go

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

‎vendor/golang.org/x/crypto/chacha20/chacha_arm64.s

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

0 commit comments

Comments
 (0)