fix: 解决eureka更新接口鉴权失败问题 (#952)

polarismesh · Feb 27, 2023 · 5f9cf3e · 5f9cf3e
1 parent 3130527
commit 5f9cf3e
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 6 deletions.
diff --git a/apiserver/eurekaserver/write.go b/apiserver/eurekaserver/write.go
@@ -217,8 +217,8 @@ func (h *EurekaServer) updateStatus(
 	}
 	ctx = context.WithValue(
 		ctx, model.CtxEventKeyMetadata, map[string]string{MetadataReplicate: strconv.FormatBool(replicated)})
-	resp := h.namingServer.UpdateInstances(ctx,
-		[]*apiservice.Instance{{Id: &wrappers.StringValue{Value: instanceId}, Isolate: &wrappers.BoolValue{Value: isolated}}})
+	resp := h.namingServer.UpdateInstance(ctx, &apiservice.Instance{
+		Id: &wrappers.StringValue{Value: instanceId}, Isolate: &wrappers.BoolValue{Value: isolated}})
 	return resp.GetCode().GetValue()
 }
 
@@ -237,7 +237,7 @@ func (h *EurekaServer) renew(ctx context.Context, appId string, instanceId strin
 }
 
 func (h *EurekaServer) updateMetadata(ctx context.Context, instanceId string, metadata map[string]string) uint32 {
-	resp := h.namingServer.UpdateInstances(ctx,
-		[]*apiservice.Instance{{Id: &wrappers.StringValue{Value: instanceId}, Metadata: metadata}})
+	resp := h.namingServer.UpdateInstance(ctx,
+		&apiservice.Instance{Id: &wrappers.StringValue{Value: instanceId}, Metadata: metadata})
 	return resp.GetCode().GetValue()
 }
diff --git a/service/api_v1.go b/service/api_v1.go
@@ -226,6 +226,9 @@ type ClientServer interface {
 	GetRouterConfigWithCache(ctx context.Context, req *apiservice.Service) *apiservice.DiscoverResponse
 
 	GetFaultDetectWithCache(ctx context.Context, req *apiservice.Service) *apiservice.DiscoverResponse
+
+	// UpdateInstance update one instance by client
+	UpdateInstance(ctx context.Context, req *apiservice.Instance) *apiservice.Response
 }
 
 // L5OperateServer L5 related operations

diff --git a/service/client_v1_authability.go b/service/client_v1_authability.go
@@ -108,3 +108,20 @@ func (svr *serverAuthAbility) GetRouterConfigWithCache(
 	ctx context.Context, req *apiservice.Service) *apiservice.DiscoverResponse {
 	return svr.targetServer.GetRouterConfigWithCache(ctx, req)
 }
+
+// UpdateInstance update single instance
+func (svr *serverAuthAbility) UpdateInstance(ctx context.Context, req *apiservice.Instance) *apiservice.Response {
+	authCtx := svr.collectClientInstanceAuthContext(
+		ctx, []*apiservice.Instance{req}, model.Modify, "UpdateInstance")
+
+	_, err := svr.authMgn.CheckClientPermission(authCtx)
+	if err != nil {
+		resp := api.NewResponseWithMsg(convertToErrCode(err), err.Error())
+		return resp
+	}
+
+	ctx = authCtx.GetRequestContext()
+	ctx = context.WithValue(ctx, utils.ContextAuthContextKey, authCtx)
+
+	return svr.targetServer.UpdateInstance(ctx, req)
+}
diff --git a/service/instance_test.go b/service/instance_test.go
@@ -1641,13 +1641,62 @@ func TestInstanceNoNeedUpdate(t *testing.T) {
 		oldHealthCheck := instanceReq.GetHealthCheck()
 		instanceReq.HealthCheck = nil
 		defer func() { instanceReq.HealthCheck = oldHealthCheck }()
-		So(discoverSuit.server.UpdateInstances(discoverSuit.defaultCtx, []*apiservice.Instance{instanceReq}).GetCode().GetValue(), ShouldEqual, api.NoNeedUpdate)
+		So(discoverSuit.server.UpdateInstances(discoverSuit.defaultCtx,
+			[]*apiservice.Instance{instanceReq}).GetCode().GetValue(), ShouldEqual, api.NoNeedUpdate)
 	})
 }
 
+func TestUpdateInstanceField(t *testing.T) {
+	discoverSuit := &DiscoverTestSuit{}
+	if err := discoverSuit.initialize(); err != nil {
+		t.Fatal(err)
+	}
+	defer discoverSuit.Destroy()
+
+	_, serviceResp := discoverSuit.createCommonService(t, 181)
+	defer discoverSuit.cleanServiceName(serviceResp.GetName().GetValue(), serviceResp.GetNamespace().GetValue())
+
+	_, instanceResp := discoverSuit.createCommonInstance(t, serviceResp, 181)
+	defer discoverSuit.cleanInstance(instanceResp.GetId().GetValue())
+	instId := instanceResp.GetId().GetValue()
+	Convey("metadata变更", t, func() {
+		request := &apiservice.Instance{Id: wrapperspb.String(instId)}
+		request.Metadata = map[string]string{}
+		So(discoverSuit.server.UpdateInstance(
+			discoverSuit.defaultCtx, request).GetCode().GetValue(), ShouldEqual, api.ExecuteSuccess)
+
+		request.Metadata = map[string]string{"123": "456", "789": "abc", "135": "246"}
+		So(discoverSuit.server.UpdateInstance(
+			discoverSuit.defaultCtx, request).GetCode().GetValue(), ShouldEqual, api.ExecuteSuccess)
+
+		instance, err := discoverSuit.storage.GetInstance(instId)
+		So(err, ShouldBeNil)
+		So(instance.Proto.Host.GetValue(), ShouldEqual, instanceResp.Host.GetValue())
+	})
+
+	Convey("isolate变更", t, func() {
+		request := &apiservice.Instance{Id: wrapperspb.String(instId)}
+		request.Isolate = wrapperspb.Bool(true)
+		So(discoverSuit.server.UpdateInstance(
+			discoverSuit.defaultCtx, request).GetCode().GetValue(), ShouldEqual, api.ExecuteSuccess)
+		instance, err := discoverSuit.storage.GetInstance(instId)
+		So(err, ShouldBeNil)
+		So(instance.Proto.Isolate.GetValue(), ShouldEqual, true)
+
+		request.Isolate = wrapperspb.Bool(false)
+		So(discoverSuit.server.UpdateInstance(
+			discoverSuit.defaultCtx, request).GetCode().GetValue(), ShouldEqual, api.ExecuteSuccess)
+
+		instance, err = discoverSuit.storage.GetInstance(instId)
+		So(err, ShouldBeNil)
+		So(instance.Proto.Isolate.GetValue(), ShouldEqual, false)
+	})
+
+}
+
 // 实例数据更新测试
 // 部分数据变更，触发更新
-func TestUpdateInstanceFiled(t *testing.T) {
+func TestUpdateInstancesFiled(t *testing.T) {
 
 	discoverSuit := &DiscoverTestSuit{}
 	if err := discoverSuit.initialize(); err != nil {