Skip to content

--story=133503342 add BasePayload to TaskPayload for tenant and biz validation #562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ambition9186 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

--story=133503342 add BasePayload to TaskPayload for tenant and biz validation #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions cmd/config-server/service/task_batch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@ package service

import (
"context"
"errors"

"github.com/TencentBlueKing/bk-bscp/internal/criteria/constant"
"github.com/TencentBlueKing/bk-bscp/pkg/i18n"
"github.com/TencentBlueKing/bk-bscp/pkg/iam/meta"
"github.com/TencentBlueKing/bk-bscp/pkg/kit"
pbcs "github.com/TencentBlueKing/bk-bscp/pkg/protocol/config-server"
Expand Down Expand Up @@ -109,6 +107,9 @@ func (s *Service) RetryTasks(ctx context.Context, req *pbcs.RetryTasksReq) (*pbc

res := []*meta.ResourceAttribute{
{Basic: meta.Basic{Type: meta.Biz, Action: meta.FindBusinessResource}, BizID: req.BizId},
{Basic: meta.Basic{Type: meta.ProcConfigMgmt, Action: meta.ProcessOperate}, BizID: req.BizId},
{Basic: meta.Basic{Type: meta.ProcConfigMgmt, Action: meta.GenerateConfig}, BizID: req.BizId},
{Basic: meta.Basic{Type: meta.ProcConfigMgmt, Action: meta.ReleaseConfig}, BizID: req.BizId},
}

switch req.GetTaskAction() {
Expand Down Expand Up @@ -136,8 +137,6 @@ func (s *Service) RetryTasks(ctx context.Context, req *pbcs.RetryTasksReq) (*pbc
},
BizID: req.BizId,
})
default:
return nil, errors.New(i18n.T(grpcKit, "undefined task action"))
}
Comment thread
Ambition9186 marked this conversation as resolved.

if err := s.authorizer.Authorize(grpcKit, res...); err != nil {
Expand Down
33 changes: 26 additions & 7 deletions cmd/data-service/service/config_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
"github.com/TencentBlueKing/bk-bscp/internal/task/builder/common"
"github.com/TencentBlueKing/bk-bscp/internal/task/builder/config"
executorCommon "github.com/TencentBlueKing/bk-bscp/internal/task/executor/common"
"github.com/TencentBlueKing/bk-bscp/pkg/criteria/constant"
"github.com/TencentBlueKing/bk-bscp/pkg/criteria/errf"
"github.com/TencentBlueKing/bk-bscp/pkg/dal/table"
"github.com/TencentBlueKing/bk-bscp/pkg/i18n"
Expand Down Expand Up @@ -865,6 +866,10 @@ func (s *Service) ConfigGenerateStatus(ctx context.Context, req *pbds.ConfigGene
func (s *Service) GetConfigGenerateResult(ctx context.Context, req *pbds.GetConfigGenerateResultReq) (*pbds.GetConfigGenerateResultResp, error) {
kt := kit.FromGrpcContext(ctx)

if kt.TenantID == "" {
kt.TenantID = constant.DefaultTenantID
}

// 获取 task storage
taskStorage := taskpkg.GetGlobalStorage()
if taskStorage == nil {
Expand Down Expand Up @@ -896,12 +901,18 @@ func (s *Service) GetConfigGenerateResult(ctx context.Context, req *pbds.GetConf
}

// 检查 ConfigPayload 是否存在
if taskPayload.ConfigPayload == nil {
if taskPayload.BasePayload == nil || taskPayload.ConfigPayload == nil {
logs.Errorf("config payload is nil, taskID: %s, rid: %s", req.TaskId, kt.Rid)
return nil, errf.Errorf(errf.RecordNotFound, "%s",
i18n.T(kt, "config payload not found in task"))
}

if taskPayload.BasePayload.BizID != req.GetBizId() || taskPayload.BasePayload.TenantID != kt.TenantID {
logs.Errorf("biz_id or tenant_id mismatch, taskID: %s, rid: %s", req.TaskId, kt.Rid)
return nil, errf.Errorf(errf.InvalidParameter, "%s",
i18n.T(kt, "biz_id or tenant_id mismatch"))
}

// 返回配置内容
return &pbds.GetConfigGenerateResultResp{
ConfigTemplateId: taskPayload.ConfigPayload.ConfigTemplateID,
Expand Down Expand Up @@ -1817,7 +1828,9 @@ func (s *Service) buildOperateRange(processes []*table.Process, pluginMode bool)
// GetConfigDiff implements [pbds.DataServer].
func (s *Service) GetConfigDiff(ctx context.Context, req *pbds.GetConfigDiffReq) (*pbds.GetConfigDiffResp, error) {
kt := kit.FromGrpcContext(ctx)

if kt.TenantID == "" {
kt.TenantID = constant.DefaultTenantID
}
// 获取 task storage
taskStorage := taskpkg.GetGlobalStorage()
if taskStorage == nil {
Expand All @@ -1841,12 +1854,18 @@ func (s *Service) GetConfigDiff(ctx context.Context, req *pbds.GetConfigDiffReq)
}

// 检查 ConfigPayload 是否存在
if taskPayload.ConfigPayload == nil || taskPayload.ProcessPayload == nil {
if taskPayload.BasePayload == nil || taskPayload.ConfigPayload == nil || taskPayload.ProcessPayload == nil {
logs.Errorf("payload is nil, taskID: %s, rid: %s", req.TaskId, kt.Rid)
return nil, errf.Errorf(errf.RecordNotFound, "%s",
i18n.T(kt, "payload not found in task"))
}

if taskPayload.BasePayload.BizID != req.GetBizId() || taskPayload.BasePayload.TenantID != kt.TenantID {
logs.Errorf("biz_id or tenant_id mismatch, taskID: %s, rid: %s", req.TaskId, kt.Rid)
return nil, errf.Errorf(errf.InvalidParameter, "%s",
i18n.T(kt, "biz_id or tenant_id mismatch"))
}

currentOnline := &pbcin.ConfigVersion{
Data: &pbcin.ConfigContent{
Content: taskPayload.ConfigPayload.ConfigContent,
Expand Down Expand Up @@ -1932,10 +1951,10 @@ func (s *Service) GetConfigView(ctx context.Context, req *pbds.GetConfigViewReq)
return nil, errT
}

if tr != nil && tr.Attachment.TemplateID != req.GetConfigTemplateId() {
if tr != nil && tr.Attachment.TemplateID != ct.Attachment.TemplateID {
return nil, errf.Errorf(errf.InvalidParameter, "%s",
i18n.T(kt, "template not match template revision, template_id=%d, template_revision_id=%d",
req.GetConfigTemplateId(), tr.Attachment.TemplateID))
ct.Attachment.TemplateID, tr.Attachment.TemplateID))
}

return buildConfigViewResp(ct, tr, lastDispatched, nil), nil
Expand All @@ -1948,10 +1967,10 @@ func (s *Service) GetConfigView(ctx context.Context, req *pbds.GetConfigViewReq)
return nil, err
}

if tr != nil && tr.Attachment.TemplateID != req.GetConfigTemplateId() {
if tr != nil && tr.Attachment.TemplateID != ct.Attachment.TemplateID {
return nil, errf.Errorf(errf.InvalidParameter, "%s",
i18n.T(kt, "template not match template revision, template_id=%d, template_revision_id=%d",
req.GetConfigTemplateId(), tr.Attachment.TemplateID))
ct.Attachment.TemplateID, tr.Attachment.TemplateID))
}

previewConfig, err := s.buildPreviewConfig(kt, tr, req)
Expand Down
3 changes: 2 additions & 1 deletion cmd/data-service/service/process.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ func dispatchProcessTasks(kt *kit.Kit, dao dao.Set, taskManager *task.TaskManage
// 构建任务（finalOpType 已确定，不再是 Delete）
taskObj, err := buildProcessTask(
dao,
kt.TenantID,
item.proc.Attachment.TenantID,
bizID,
batchID,
item.instance.Attachment.ProcessID,
Expand All @@ -575,6 +575,7 @@ func dispatchProcessTasks(kt *kit.Kit, dao dao.Set, taskManager *task.TaskManage
item.originalStatus,
enableProcessRestart,
)

if err != nil {
logs.Errorf("create process operate task failed, err: %v, rid: %s", err, kt.Rid)
return dispatchedCount, errf.Errorf(errf.Internal, "%s",
Expand Down
Loading
Loading