STRLCPY/CVE-2023-22480_KubeOperator

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

■ ■ ■ ■ ■ ■

pkg/constant/message.go

		skipped 20 lines
21	21		const (
22	22		ClusterInstall = "CLUSTER_INSTALL"
23	23		ClusterImport = "CLUSTER_IMPORT"
24		-	ClusterUnInstall = "CLUSTER_UN_INSTALL"
25	24		ClusterUpgrade = "CLUSTER_UPGRADE"
26	25		ClusterDelete = "CLUSTER_DELETE"
27	26		ClusterScale = "CLUSTER_SCALE"
		skipped 30 lines
58	57		ClusterInstall: "集群安装",
59	58		ClusterImport: "集群导入",
60	59		ClusterDelete: "集群删除",
61		-	ClusterUnInstall: "集群卸载",
62	60		ClusterUpgrade: "集群升级",
63	61		ClusterScale: "集群伸缩",
64	62		ClusterAddWorker: "集群扩容",
		skipped 25 lines
90	88		DingTalk: "pkg/templates/cluster_op.md",
91	89		WorkWeiXin: "pkg/templates/cluster_op.md",
92	90		},
93		-	ClusterUnInstall: {
	91	+	ClusterDelete: {
94	92		Email: "pkg/templates/cluster_op.html",
95	93		DingTalk: "pkg/templates/cluster_op.md",
96	94		WorkWeiXin: "pkg/templates/cluster_op.md",
		skipped 53 lines

■ ■ ■ ■ ■ ■

pkg/service/cluster.go

		skipped 367 lines
368	368		_ = c.clusterRepo.Save(cluster)
369	369		_ = c.tasklogService.End(&cluster.TaskLog, false, errStr.Error())
370	370
371		-	_ = c.msgService.SendMsg(constant.ClusterUnInstall, constant.System, cluster, false, map[string]string{"errMsg": errStr.Error(), "detailName": cluster.Name})
	371	+	_ = c.msgService.SendMsg(constant.ClusterDelete, constant.System, cluster, false, map[string]string{"errMsg": errStr.Error(), "detailName": cluster.Name})
372	372		}
373	373
374	374		const terminalPlaybookName = "99-reset-cluster.yml"
		skipped 32 lines
407	407		}
408	408		return
409	409		}
410		-	_ = c.msgService.SendMsg(constant.ClusterUnInstall, constant.System, cluster, true, map[string]string{"detailName": cluster.Name})
	410	+	_ = c.msgService.SendMsg(constant.ClusterDelete, constant.System, cluster, true, map[string]string{"detailName": cluster.Name})
411	411		if err := c.tasklogService.End(&cluster.TaskLog, true, ""); err != nil {
412	412		logger.Log.Errorf("update tasklog error %s", err.Error())
413	413		}
		skipped 25 lines
439	439		}
440	440		return
441	441		}
442		-	_ = c.msgService.SendMsg(constant.ClusterUnInstall, constant.System, cluster, true, map[string]string{"detailName": cluster.Name})
	442	+	_ = c.msgService.SendMsg(constant.ClusterDelete, constant.System, cluster, true, map[string]string{"detailName": cluster.Name})
443	443		logger.Log.Infof("start clearing cluster data %s", cluster.Name)
444	444		if err := db.DB.Delete(&cluster).Error; err != nil {
445	445		c.errClusterDelete(cluster, err)
		skipped 132 lines

1	+	DELETE FROM `ko`.`ko_msg_subscribe` WHERE `name`='CLUSTER_UN_INSTALL';
2	+
3	+	UPDATE `ko`.`ko_msg` SET `name`='CLUSTER_DELETE' WHERE `name`='CLUSTER_UN_INSTALL';