STRLCPY/CVE-2023-22480_KubeOperator

Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)

■ ■ ■ ■ ■ ■

Dockerfile

		skipped 54 lines
55	55		&& cp ./kubernetes/client/bin/* /usr/local/bin \
56	56		&& chmod +x /usr/local/bin/kubectl
57	57
58		-	RUN wget https://kubeoperator.oss-cn-beijing.aliyuncs.com/velero/v1.7.1/velero-v1.7.1-linux-$GOARCH.tar.gz && tar -zxvf velero-v1.7.1-linux-$GOARCH.tar.gz \
59		-	&& cp ./velero-v1.7.1-linux-$GOARCH/velero /usr/local/bin \
	58	+	RUN wget https://kubeoperator.oss-cn-beijing.aliyuncs.com/velero/v1.9.1/velero-v1.9.1-linux-$GOARCH.tar.gz && tar -zxvf velero-v1.9.1-linux-$GOARCH.tar.gz \
	59	+	&& cp ./velero-v1.9.1-linux-$GOARCH/velero /usr/local/bin \
60	60		&& chmod +x /usr/local/bin/velero
61	61
62	62		WORKDIR /
		skipped 12 lines

■ ■ ■ ■ ■ ■

pkg/service/velero_backup.go

		skipped 241 lines
242	242
243	243		if backupAccount.Type == "OSS" {
244	244		args = append(args, "--provider", "alibabacloud")
245		-	args = append(args, "--image", url+"velero/velero:v1.7.1")
	245	+	args = append(args, "--image", url+"velero/velero:v1.9.1")
246	246		args = append(args, "--bucket", backupAccount.Bucket)
247	247		args = append(args, "--plugins", url+"kubeoperator/velero-plugin-alibabacloud:v1.0.0-2d33b89")
248	248		args = append(args, "--use-volume-snapshots", "false")
		skipped 7 lines
256	256		}
257	257		if backupAccount.Type == "MINIO" \|\| backupAccount.Type == "S3" {
258	258		args = append(args, "--provider", "aws")
259		-	args = append(args, "--image", url+"velero/velero:v1.7.1")
	259	+	args = append(args, "--image", url+"velero/velero:v1.9.1")
260	260		args = append(args, "--plugins", url+"velero/velero-plugin-for-aws:v1.2.1")
261	261		args = append(args, "--bucket", backupAccount.Bucket)
262		-	config := "region=minio,s3ForcePathStyle=true,s3Url=http://" + vars["endpoint"].(string)
	262	+	ssl := "http"
	263	+	if vars["ssl"] != nil {
	264	+	ssl = vars["ssl"].(string)
	265	+	}
	266	+	config := "region=minio,s3ForcePathStyle=true,s3Url=" + ssl + "://" + vars["endpoint"].(string)
263	267		args = append(args, "--backup-location-config", config)
	268	+	if ssl == "https" {
	269	+	args = append(args, "--insecure-skip-tls-verify", "true")
	270	+	}
264	271		}
265	272		if veleroInstall.Requests.Cpu > 0 {
266	273		args = append(args, "--velero-pod-cpu-request", strconv.Itoa(veleroInstall.Requests.Cpu)+"m")
		skipped 227 lines