Chore(deps-dev): Bump axios from 0.21.4 to 0.30.0 in /frontend

.aci.yml

@@ -69,19 +69,22 @@ jobs:
       script: |
         #!/bin/bash
         if [[ `uname -m` == aarch64 ]]; then
-          wget https://studygolang.com/dl/golang/go1.20.6.linux-arm64.tar.gz --no-check-certificate
+          wget https://studygolang.com/dl/golang/go1.23.6.linux-arm64.tar.gz --no-check-certificate
           rm -rf /usr/local/go 
-          tar -C /usr/local -xzf go1.20.6.linux-arm64.tar.gz
+          tar -C /usr/local -xzf go1.23.6.linux-arm64.tar.gz
           cp /usr/local/go/bin/go /usr/local/bin/
         else
-          wget https://studygolang.com/dl/golang/go1.20.6.linux-amd64.tar.gz --no-check-certificate
+          wget https://studygolang.com/dl/golang/go1.23.6.linux-amd64.tar.gz --no-check-certificate
           rm -rf /usr/local/go 
-          tar -C /usr/local -xzf go1.20.6.linux-amd64.tar.gz
+          tar -C /usr/local -xzf go1.23.6.linux-amd64.tar.gz
           cp /usr/local/go/bin/go /usr/local/bin/
         fi
+        export PATH=/usr/local/go/bin:$PATH
         go env -w GOPROXY=https://goproxy.cn GOPATH="/usr/local"
         go install github.com/go-bindata/go-bindata/[email protected]+incompatible
         cd "${BASE_WORKSPACE}/codeWorkspace"
+        mkdir -p frontend/dist
+        touch frontend/dist/index.html
         make pre-build build-with-swagger
 
   规范检查:

.gitignore

@@ -15,8 +15,47 @@ vendor
 # macOS files
 .DS_Store
 
+# frontend
+/frontend/pids
+/frontend/logs
+/frontend/node_modules
+/frontend/npm-debug.log
+/frontend/coverage/
+/frontend/build/
+/frontend/run
+/frontend/.basement
+/frontend/src/.umi
+/frontend/src/.umi-production
+/frontend/speed-measure.json
+/frontend/dist
+/frontend/unuseful-locale-key.txt
+/frontend/docs.zip
+/frontend/config.local.ts
+
+
 
 .idea/*
 *.iml
 .vscode/*
 .OWNERS
+.meta
+etc/
+log_obshell/
+run/
+
+# frontend
+/frontend/pids
+/frontend/logs
+/frontend/node_modules
+/frontend/npm-debug.log
+/frontend/coverage/
+/frontend/build/
+/frontend/run
+/frontend/.basement
+/frontend/src/.umi
+/frontend/src/.umi-production
+/frontend/speed-measure.json
+/frontend/dist
+/frontend/unuseful-locale-key.txt
+/frontend/docs.zip
+/frontend/config.local.ts

Makefile

@@ -20,9 +20,24 @@ build-release: set-release-flags obshell buildsucc
 
 build-with-swagger: enable-swagger build-release
 
+build-for-test: pre-build enable-swagger set-disable-encryption-flags build-debug
+
+frontend-dep:
+	npm i -g pnpm@7
+
+frontend-build:
+	cd frontend && pnpm i && pnpm build && cd ../
+
+frontend-build-tester:
+	cd frontend && pnpm i && pnpm build:tester && cd ../
+
 rpm:
 	cd ./rpm && VERSION=$(VERSION) RELEASE=$(RELEASE) NAME=$(NAME) OBSHELL_RELEASE=$(OBSHELL_RELEASE) rpmbuild -bb obshell.spec
 
+set-disable-encryption-flags:
+	@echo Build with encryption disabled flags
+	$(eval LDFLAGS += $(LDFLAGS_DISABLE_ENCRYPTION))
+
 set-debug-flags:
 	@echo Build with debug flags
 	$(eval LDFLAGS += $(LDFLAGS_DEBUG))

Makefile.common

@@ -1,5 +1,5 @@
 PROCESSOR=2
-VERSION=4.2.5.0
+VERSION=4.2.6.0
 NAME=obshell
 RELEASE=0
 DIST=0
@@ -27,6 +27,7 @@ LDFLAGS += -X "github.com/oceanbase/obshell/agent/config.GitCommitTime=$(shell g
 LDFLAGS += -X "github.com/oceanbase/obshell/agent/config.BuildFlags=${BUILD_FLAG}"
 LDFLAGS_DEBUG = -X "github.com/oceanbase/obshell/agent/config.Mode=debug"
 LDFLAGS_RELEASE = -X "github.com/oceanbase/obshell/agent/config.Mode=release"
+LDFLAGS_DISABLE_ENCRYPTION = -X "github.com/oceanbase/obshell/agent/config.EncryptionDisabled=true"
 OBSHELL_LDFLAGS = $(LDFLAGS) -X "github.com/oceanbase/obshell/agent/config.CurProcess=obshell"
 
 GOFILES ?= $(shell git ls-files '*.go')

agent/api/agent_handler.go

@@ -35,26 +35,26 @@ var (
 	agentService = agentservice.AgentService{}
 )
 
-// @Summary		join the specified agent
-// @Description	join the specified agent
-// @Tags			agent
-// @Accept			application/json
-// @Produce		application/json
-// @Param			X-OCS-Header	header	string				true	"Authorization"
-// @Param			body			body	param.JoinApiParam	true	"agent info with zone name"
-// @Success		200				object	http.OcsAgentResponse{data=task.DagDetailDTO}
-// @Failure		400				object	http.OcsAgentResponse
-// @Failure		500				object	http.OcsAgentResponse
-// @Router			/api/v1/agent [post]
-// @Router			/api/v1/agent/join [post]
+// @Summary join the specified agent
+// @Description join the specified agent
+// @Tags agent
+// @Accept application/json
+// @Produce application/json
+// @Param X-OCS-Header header string true "Authorization"
+// @Param body body param.JoinApiParam true "agent info with zone name"
+// @Success 200 object http.OcsAgentResponse{data=task.DagDetailDTO}
+// @Failure 400 object http.OcsAgentResponse
+// @Failure 500 object http.OcsAgentResponse
+// @Router /api/v1/agent [post]
+// @Router /api/v1/agent/join [post]
 func agentJoinHandler(c *gin.Context) {
 	var param param.JoinApiParam
 	if err := c.BindJSON(&param); err != nil {
 		common.SendResponse(c, nil, err)
 		return
 	}
 	if !meta.OCS_AGENT.IsSingleAgent() {
-		common.SendResponse(c, nil, errors.Occurf(errors.ErrBadRequest, "%s:%d is not single agent", meta.OCS_AGENT.GetIp(), meta.OCS_AGENT.GetPort()))
+		common.SendResponse(c, nil, errors.Occurf(errors.ErrBadRequest, "%s is not single agent", meta.OCS_AGENT.String()))
 		return
 	}
 
@@ -78,15 +78,21 @@ func agentJoinHandler(c *gin.Context) {
 				param.AgentInfo.String(), agentStatus.Version, meta.OCS_AGENT.String(), constant.VERSION_RELEASE))
 			return
 		}
-		if obVersion, err := binary.GetMyOBVersion(); err != nil {
+		if obVersion, _, err := binary.GetMyOBVersion(); err != nil {
 			common.SendResponse(c, nil, errors.Occurf(errors.ErrUnexpected, "get ob version failed: %s", err.Error()))
 			return
 		} else if obVersion != agentStatus.OBVersion {
 			common.SendResponse(c, nil, errors.Occurf(errors.ErrBadRequest, "ob version is not consistent between %s(%s) and %s(%s)",
 				param.AgentInfo.String(), agentStatus.OBVersion, meta.OCS_AGENT.String(), obVersion))
 			return
 		}
-		dag, err = agent.CreateJoinMasterDag(param.AgentInfo, param.ZoneName)
+		// send token to master early.
+		if err = agent.SendTokenToMaster(param.AgentInfo, param.MasterPassword); err != nil {
+			common.SendResponse(c, nil, errors.Occur(errors.ErrTaskCreateFailed, err))
+			return
+		}
+
+		dag, err = agent.CreateJoinMasterDag(param.AgentInfo, param.ZoneName, param.MasterPassword)
 	}
 
 	if err != nil {
@@ -96,18 +102,18 @@ func agentJoinHandler(c *gin.Context) {
 	common.SendResponse(c, task.NewDagDetailDTO(dag), nil)
 }
 
-// @Summary		remove the specified agent
-// @Description	remove the specified agent
-// @Tags			agent
-// @Accept			application/json
-// @Produce		application/json
-// @Param			X-OCS-Header	header	string			true	"Authorization"
-// @Param			body			body	meta.AgentInfo	true	"agent info"
-// @Success		200				object	http.OcsAgentResponse{data=task.DagDetailDTO}
-// @Failure		400				object	http.OcsAgentResponse
-// @Failure		500				object	http.OcsAgentResponse
-// @Router			/api/v1/agent [delete]
-// @Router			/api/v1/agent/remove [post]
+// @Summary remove the specified agent
+// @Description remove the specified agent
+// @Tags agent
+// @Accept application/json
+// @Produce application/json
+// @Param X-OCS-Header header string true "Authorization"
+// @Param body body meta.AgentInfo true "agent info"
+// @Success 200 object http.OcsAgentResponse{data=task.DagDetailDTO}
+// @Failure 400 object http.OcsAgentResponse
+// @Failure 500 object http.OcsAgentResponse
+// @Router /api/v1/agent [delete]
+// @Router /api/v1/agent/remove [post]
 func agentRemoveHandler(c *gin.Context) {
 	var param meta.AgentInfo
 	if err := c.BindJSON(&param); err != nil {
@@ -178,3 +184,13 @@ func agentRemoveHandler(c *gin.Context) {
 	}
 	common.SendResponse(c, task.NewDagDetailDTO(dag), nil)
 }
+
+func agentSetPasswordHandler(c *gin.Context) {
+	var param param.SetAgentPasswordParam
+	if err := c.BindJSON(&param); err != nil {
+		common.SendResponse(c, nil, err)
+		return
+	}
+
+	common.SendResponse(c, nil, agentService.SetAgentPassword(param.Password))
+}

agent/api/agent_route.go

@@ -41,20 +41,49 @@ func InitOcsAgentRoutes(s *http2.State, r *gin.Engine, isLocalRoute bool) {
 	}
 	r.Use(
 		gin.CustomRecovery(common.Recovery), // gin's crash-free middleware
-		common.PostHandlers("/debug/pprof", "/swagger"),
-		common.BodyDecrypt(), // decrypt request body
+		common.PostHandlers("/debug/pprof", "/swagger",
+			// get all obcluster parameters
+			constant.URI_API_V1+constant.URI_OBCLUSTER_GROUP+constant.URI_PARAMETERS,
+		),
+		common.HeaderDecrypt(),
+		common.BodyDecrypt(constant.URI_API_V1+constant.URI_PACKAGE), // decrypt request body
 		common.PaddingBody(), // if the response body is empty, the response body is padded with "{}"
-
 		common.PreHandlers(
 			constant.URI_API_V1+constant.URI_UPGRADE+constant.URI_PACKAGE,
 			constant.URI_API_V1+constant.URI_OBCLUSTER_GROUP+constant.URI_CONFIG,
 			constant.URI_API_V1+constant.URI_OBCLUSTER_GROUP+constant.URI_BACKUP+constant.URI_CONFIG,
 			constant.URI_API_V1+constant.URI_TENANT_GROUP+constant.URI_PATH_PARAM_NAME+constant.URI_BACKUP+constant.URI_CONFIG,
 			constant.URI_API_V1+constant.URI_TENANT_GROUP+constant.URI_RESTORE,
 			constant.URI_API_V1+constant.URI_RESTORE+constant.URI_WINDOWS,
+			// init cluster
+			constant.URI_OB_API_PREFIX+constant.URI_INIT,
 			constant.URI_TASK_RPC_PREFIX+constant.URI_SUB_TASK,
+			// create tenant
 			constant.URI_API_V1+constant.URI_TENANT_GROUP,
+			// set tenant password
 			constant.URI_TENANT_API_PREFIX+constant.URI_PATH_PARAM_NAME+constant.URI_ROOTPASSWORD,
+			// create user
+			constant.URI_TENANT_API_PREFIX+constant.URI_PATH_PARAM_NAME+constant.URI_USER,
+			// delete user
+			constant.URI_TENANT_API_PREFIX+constant.URI_PATH_PARAM_NAME+constant.URI_USER+constant.URI_PATH_PARAM_USER,
+			// add obproxy
+			constant.URI_OBPROXY_API_PREFIX,
+			// set tenant variable
+			constant.URI_TENANT_API_PREFIX+constant.URI_PATH_PARAM_NAME+constant.URI_VARIABLES,
+			// set agent password
+			constant.URI_AGENT_API_PREFIX+constant.URI_PASSWORD,
+			// join master
+			constant.URI_AGENT_API_PREFIX+constant.URI_JOIN,
+			constant.URI_AGENT_API_PREFIX,
+			// scale out
+			constant.URI_API_V1+constant.URI_OB_GROUP+constant.URI_SCALE_OUT,
+			// send token
+			constant.URI_AGENT_RPC_PREFIX+constant.URI_TOKEN,
+			// upload obproxy package
+			constant.URI_OBPROXY_API_PREFIX+constant.URI_PACKAGE,
+			constant.URI_API_V1+constant.URI_PACKAGE,
+			// persist tenant root password
+			constant.URI_PATH_PARAM_NAME+constant.URI_ROOTPASSWORD+constant.URI_PERSIST,
 		),
 		common.SetContentType,
 	)
@@ -63,6 +92,7 @@ func InitOcsAgentRoutes(s *http2.State, r *gin.Engine, isLocalRoute bool) {
 		r.Use(common.SetLocalRouteFlag)
 	} else {
 		initSwagger(r)
+		initFrontendRouter(r)
 	}
 
 	// groups
@@ -81,6 +111,7 @@ func InitOcsAgentRoutes(s *http2.State, r *gin.Engine, isLocalRoute bool) {
 	pool := v1.Group(constant.URI_POOL_GROUP)
 	recyclebin := v1.Group(constant.URI_RECYCLEBIN_GROUP)
 	zone := v1.Group(constant.URI_ZONE_GROUP)
+	pkg := v1.Group(constant.URI_PACKAGE)
 
 	if !isLocalRoute {
 		ob.Use(common.Verify())
@@ -107,6 +138,7 @@ func InitOcsAgentRoutes(s *http2.State, r *gin.Engine, isLocalRoute bool) {
 	InitTenantRoutes(v1, isLocalRoute)
 	InitBackupRoutes(v1, isLocalRoute)
 	InitRestoreRoutes(v1, isLocalRoute)
+	InitObproxyRoutes(v1, isLocalRoute)
 
 	// ob routes
 	ob.POST(constant.URI_INIT, obInitHandler)
@@ -116,6 +148,7 @@ func InitOcsAgentRoutes(s *http2.State, r *gin.Engine, isLocalRoute bool) {
 	ob.POST(constant.URI_SCALE_OUT, obClusterScaleOutHandler)
 	ob.POST(constant.URI_SCALE_IN, obClusterScaleInHandler)
 	ob.POST(constant.URI_UPGRADE, obUpgradeHandler)
+	ob.GET(constant.URI_UPGRADE+constant.URI_ROUTE, obPkgUpgradeRouteHandler)
 	ob.POST(constant.URI_UPGRADE+constant.URI_CHECK, obUpgradeCheckHandler)
 	ob.GET(constant.URI_AGENTS, obAgentsHandler)
 
@@ -126,13 +159,19 @@ func InitOcsAgentRoutes(s *http2.State, r *gin.Engine, isLocalRoute bool) {
 	agent.POST(constant.URI_REMOVE, agentRemoveHandler)
 	agent.POST(constant.URI_UPGRADE, agentUpgradeHandler)
 	agent.POST(constant.URI_UPGRADE+constant.URI_CHECK, agentUpgradeCheckHandler)
+	agent.POST(constant.URI_PASSWORD, agentSetPasswordHandler)
 
 	// agents routes
 	agents.GET(constant.URI_STATUS, GetAllAgentStatus(s))
 
 	// obcluster routes
 	obcluster.PUT(constant.URI_CONFIG, obclusterConfigHandler(true))
 	obcluster.POST(constant.URI_CONFIG, obclusterConfigHandler(true))
+	obcluster.GET(constant.URI_INFO, obclusterInfoHandler)
+	obcluster.GET(constant.URI_PARAMETERS, obclusterParametersHandler)
+	obcluster.PATCH(constant.URI_PARAMETERS, obclusterSetParametersHandler)
+	obcluster.GET(constant.URI_CHARSETS, getObclusterCharsets)
+	obcluster.GET(constant.URI_UNIT_CONFIG_LIMIT, checkClusterAgentWrapper(getUnitConfigLimitHandler))
 
 	// observer routes
 	observer.PUT(constant.URI_CONFIG, obServerConfigHandler(true))
@@ -144,9 +183,12 @@ func InitOcsAgentRoutes(s *http2.State, r *gin.Engine, isLocalRoute bool) {
 
 	// upgrade routes
 	upgrade.POST(constant.URI_PACKAGE, pkgUploadHandler)
+	upgrade.GET(constant.URI_PACKAGE+constant.URI_INFO, pkgInfoHandler)
 	upgrade.POST(constant.URI_PARAMS+constant.URI_BACKUP, paramsBackupHandler)
 	upgrade.POST(constant.URI_PARAMS+constant.URI_RESTORE, paramsRestoreHandler)
 
+	pkg.POST("", common.VerifyFile(), newPkgUploadHandler)
+
 	// unit routes
 	unit.POST("", unitConfigCreateHandler)
 	unit.DELETE(constant.URI_PATH_PARAM_NAME, unitConfigDropHandler)
@@ -161,9 +203,8 @@ func InitOcsAgentRoutes(s *http2.State, r *gin.Engine, isLocalRoute bool) {
 	recyclebin.GET(constant.URI_TENANTS, recyclebinListTenantHandler)
 	recyclebin.DELETE(constant.URI_TENANT_GROUP+constant.URI_PATH_PARAM_NAME, recyclebinPurgeTenantHandler)
 	recyclebin.POST(constant.URI_TENANT_GROUP+constant.URI_PATH_PARAM_NAME, recyclebinFlashbackTenantHandler)
-
 	r.NoRoute(func(c *gin.Context) {
-		err := errors.Occur(errors.ErrBadRequest, "404 not found")
-		common.SendResponse(c, nil, err)
+		common.SendResponse(c, nil, errors.Occur(errors.ErrBadRequest, "404 not found"))
+		return
 	})
 }