feat: 补充账号账单接口补充校验、权限 --story=121135031

cmd/account-server/service/account-set/root-account/add.go

@@ -33,8 +33,8 @@ import (
 	"hcm/pkg/rest"
 )
 
-// Add get root account with options
-func (s *service) Add(cts *rest.Contexts) (interface{}, error) {
+// AddRootAccount get root account with options
+func (s *service) AddRootAccount(cts *rest.Contexts) (interface{}, error) {
 	req := new(proto.RootAccountAddReq)
 	if err := cts.DecodeInto(req); err != nil {
 		return nil, errf.NewFromErr(errf.DecodeRequestFailed, err)
@@ -104,6 +104,15 @@ func (s *service) isDuplicateName(cts *rest.Contexts, name string) error {
 }
 
 func (s *service) addForAws(cts *rest.Contexts, req *proto.RootAccountAddReq) (string, error) {
+	extension := &dataproto.AwsRootAccountExtensionCreateReq{
+		CloudAccountID:   req.Extension["cloud_account_id"],
+		CloudIamUsername: req.Extension["cloud_iam_username"],
+		CloudSecretID:    req.Extension["cloud_secret_id"],
+		CloudSecretKey:   req.Extension["cloud_secret_key"],
+	}
+	if err := extension.Validate(); err != nil {
+		return "", err
+	}
 	result, err := s.client.DataService().Aws.RootAccount.Create(
 		cts.Kit,
 		&dataproto.RootAccountCreateReq[dataproto.AwsRootAccountExtensionCreateReq]{
@@ -115,12 +124,7 @@ func (s *service) addForAws(cts *rest.Contexts, req *proto.RootAccountAddReq) (s
 			Site:        req.Site,
 			DeptID:      req.DeptID,
 			Memo:        req.Memo,
-			Extension: &dataproto.AwsRootAccountExtensionCreateReq{
-				CloudAccountID:   req.Extension["cloud_account_id"],
-				CloudIamUsername: req.Extension["cloud_iam_username"],
-				CloudSecretID:    req.Extension["cloud_secret_id"],
-				CloudSecretKey:   req.Extension["cloud_secret_key"],
-			},
+			Extension:   extension,
 		},
 	)
 	if err != nil {
@@ -139,6 +143,19 @@ func (s *service) addForGcp(cts *rest.Contexts, req *proto.RootAccountAddReq) (s
 		return "", fmt.Errorf("request email [%s] and extension email [%s] should be same", req.Email, email)
 	}
 
+	extension := &dataproto.GcpRootAccountExtensionCreateReq{
+		Email:                   email,
+		CloudProjectID:          req.Extension["cloud_project_id"],
+		CloudProjectName:        req.Extension["cloud_project_name"],
+		CloudServiceAccountID:   req.Extension["cloud_service_account_id"],
+		CloudServiceAccountName: req.Extension["cloud_service_account_name"],
+		CloudServiceSecretID:    req.Extension["cloud_service_secret_id"],
+		CloudServiceSecretKey:   req.Extension["cloud_service_secret_key"],
+	}
+	if err := extension.Validate(); err != nil {
+		return "", err
+	}
+
 	result, err := s.client.DataService().Gcp.RootAccount.Create(
 		cts.Kit,
 		&dataproto.RootAccountCreateReq[dataproto.GcpRootAccountExtensionCreateReq]{
@@ -150,15 +167,7 @@ func (s *service) addForGcp(cts *rest.Contexts, req *proto.RootAccountAddReq) (s
 			Site:        req.Site,
 			DeptID:      req.DeptID,
 			Memo:        req.Memo,
-			Extension: &dataproto.GcpRootAccountExtensionCreateReq{
-				Email:                   email,
-				CloudProjectID:          req.Extension["cloud_project_id"],
-				CloudProjectName:        req.Extension["cloud_project_name"],
-				CloudServiceAccountID:   req.Extension["cloud_service_account_id"],
-				CloudServiceAccountName: req.Extension["cloud_service_account_name"],
-				CloudServiceSecretID:    req.Extension["cloud_service_secret_id"],
-				CloudServiceSecretKey:   req.Extension["cloud_service_secret_key"],
-			},
+			Extension:   extension,
 		},
 	)
 	if err != nil {
@@ -168,6 +177,19 @@ func (s *service) addForGcp(cts *rest.Contexts, req *proto.RootAccountAddReq) (s
 }
 
 func (s *service) addForAzure(cts *rest.Contexts, req *proto.RootAccountAddReq) (string, error) {
+
+	extension := &dataproto.AzureRootAccountExtensionCreateReq{
+		DisplayNameName:       req.Extension["display_name_name"],
+		CloudTenantID:         req.Extension["cloud_tenant_id"],
+		CloudSubscriptionID:   req.Extension["cloud_subscription_id"],
+		CloudSubscriptionName: req.Extension["cloud_subscription_name"],
+		CloudApplicationID:    req.Extension["cloud_application_id"],
+		CloudApplicationName:  req.Extension["cloud_application_name"],
+		CloudClientSecretKey:  req.Extension["cloud_client_secret_key"],
+	}
+	if err := extension.Validate(); err != nil {
+		return "", err
+	}
 	result, err := s.client.DataService().Azure.RootAccount.Create(
 		cts.Kit,
 		&dataproto.RootAccountCreateReq[dataproto.AzureRootAccountExtensionCreateReq]{
@@ -179,15 +201,7 @@ func (s *service) addForAzure(cts *rest.Contexts, req *proto.RootAccountAddReq)
 			Site:        req.Site,
 			DeptID:      req.DeptID,
 			Memo:        req.Memo,
-			Extension: &dataproto.AzureRootAccountExtensionCreateReq{
-				DisplayNameName:       req.Extension["display_name_name"],
-				CloudTenantID:         req.Extension["cloud_tenant_id"],
-				CloudSubscriptionID:   req.Extension["cloud_subscription_id"],
-				CloudSubscriptionName: req.Extension["cloud_subscription_name"],
-				CloudApplicationID:    req.Extension["cloud_application_id"],
-				CloudApplicationName:  req.Extension["cloud_application_name"],
-				CloudClientSecretKey:  req.Extension["cloud_client_secret_key"],
-			},
+			Extension:   extension,
 		},
 	)
 	if err != nil {
@@ -197,6 +211,18 @@ func (s *service) addForAzure(cts *rest.Contexts, req *proto.RootAccountAddReq)
 }
 
 func (s *service) addForHuaWei(cts *rest.Contexts, req *proto.RootAccountAddReq) (string, error) {
+	extension := &dataproto.HuaWeiRootAccountExtensionCreateReq{
+		CloudSubAccountID:   req.Extension["cloud_sub_account_id"],
+		CloudSubAccountName: req.Extension["cloud_sub_account_name"],
+		CloudSecretID:       req.Extension["cloud_secret_id"],
+		CloudSecretKey:      req.Extension["cloud_secret_key"],
+		CloudIamUserID:      req.Extension["cloud_iam_user_id"],
+		CloudIamUsername:    req.Extension["cloud_iam_username"],
+	}
+	if err := extension.Validate(); err != nil {
+		return "", err
+	}
+
 	result, err := s.client.DataService().HuaWei.RootAccount.Create(
 		cts.Kit,
 		&dataproto.RootAccountCreateReq[dataproto.HuaWeiRootAccountExtensionCreateReq]{
@@ -208,14 +234,7 @@ func (s *service) addForHuaWei(cts *rest.Contexts, req *proto.RootAccountAddReq)
 			Site:        req.Site,
 			DeptID:      req.DeptID,
 			Memo:        req.Memo,
-			Extension: &dataproto.HuaWeiRootAccountExtensionCreateReq{
-				CloudSubAccountID:   req.Extension["cloud_sub_account_id"],
-				CloudSubAccountName: req.Extension["cloud_sub_account_name"],
-				CloudSecretID:       req.Extension["cloud_secret_id"],
-				CloudSecretKey:      req.Extension["cloud_secret_key"],
-				CloudIamUserID:      req.Extension["cloud_iam_user_id"],
-				CloudIamUsername:    req.Extension["cloud_iam_username"],
-			},
+			Extension:   extension,
 		},
 	)
 	if err != nil {
@@ -225,6 +244,12 @@ func (s *service) addForHuaWei(cts *rest.Contexts, req *proto.RootAccountAddReq)
 }
 
 func (s *service) addForZenlayer(cts *rest.Contexts, req *proto.RootAccountAddReq) (string, error) {
+	extension := &dataproto.ZenlayerRootAccountExtensionCreateReq{
+		CloudAccountID: req.Extension["cloud_account_id"],
+	}
+	if err := extension.Validate(); err != nil {
+		return "", err
+	}
 	result, err := s.client.DataService().Zenlayer.RootAccount.Create(
 		cts.Kit,
 		&dataproto.RootAccountCreateReq[dataproto.ZenlayerRootAccountExtensionCreateReq]{
@@ -236,9 +261,7 @@ func (s *service) addForZenlayer(cts *rest.Contexts, req *proto.RootAccountAddRe
 			Site:        req.Site,
 			DeptID:      req.DeptID,
 			Memo:        req.Memo,
-			Extension: &dataproto.ZenlayerRootAccountExtensionCreateReq{
-				CloudAccountID: req.Extension["cloud_account_id"],
-			},
+			Extension:   extension,
 		},
 	)
 	if err != nil {
@@ -248,6 +271,12 @@ func (s *service) addForZenlayer(cts *rest.Contexts, req *proto.RootAccountAddRe
 }
 
 func (s *service) addForKaopu(cts *rest.Contexts, req *proto.RootAccountAddReq) (string, error) {
+	extension := &dataproto.KaopuRootAccountExtensionCreateReq{
+		CloudAccountID: req.Extension["cloud_account_id"],
+	}
+	if err := extension.Validate(); err != nil {
+		return "", err
+	}
 	result, err := s.client.DataService().Kaopu.RootAccount.Create(
 		cts.Kit,
 		&dataproto.RootAccountCreateReq[dataproto.KaopuRootAccountExtensionCreateReq]{
@@ -259,9 +288,7 @@ func (s *service) addForKaopu(cts *rest.Contexts, req *proto.RootAccountAddReq)
 			Site:        req.Site,
 			DeptID:      req.DeptID,
 			Memo:        req.Memo,
-			Extension: &dataproto.KaopuRootAccountExtensionCreateReq{
-				CloudAccountID: req.Extension["cloud_account_id"],
-			},
+			Extension:   extension,
 		},
 	)
 	if err != nil {

cmd/account-server/service/account-set/root-account/get.go

@@ -28,8 +28,8 @@ import (
 	"hcm/pkg/rest"
 )
 
-// Get get root account with options
-func (s *service) Get(cts *rest.Contexts) (interface{}, error) {
+// GetRootAccount get root account with options
+func (s *service) GetRootAccount(cts *rest.Contexts) (interface{}, error) {
 	accountID := cts.PathParameter("account_id").String()
 
 	// 校验用户有一级账号管理权限

cmd/account-server/service/account-set/root-account/list.go

@@ -26,8 +26,8 @@ import (
 	"hcm/pkg/rest"
 )
 
-// List list root account with options
-func (s *service) List(cts *rest.Contexts) (interface{}, error) {
+// ListRootAccount list root account with options
+func (s *service) ListRootAccount(cts *rest.Contexts) (interface{}, error) {
 	req := new(core.ListWithoutFieldReq)
 	if err := cts.DecodeInto(req); err != nil {
 		return nil, err

cmd/account-server/service/account-set/root-account/service.go

@@ -43,10 +43,10 @@ func InitService(c *capability.Capability) {
 	h := rest.NewHandler()
 
 	// register handler
-	h.Add("GetRootAccount", http.MethodGet, "/root_accounts/{account_id}", svc.Get)
-	h.Add("ListRootAccount", http.MethodPost, "/root_accounts/list", svc.List)
-	h.Add("UpdateRootAccount", http.MethodPatch, "/root_accounts/{account_id}", svc.Update)
-	h.Add("AddRootAccount", http.MethodPost, "/root_accounts/add", svc.Add)
+	h.Add("GetRootAccount", http.MethodGet, "/root_accounts/{account_id}", svc.GetRootAccount)
+	h.Add("ListRootAccount", http.MethodPost, "/root_accounts/list", svc.ListRootAccount)
+	h.Add("UpdateRootAccount", http.MethodPatch, "/root_accounts/{account_id}", svc.UpdateRootAccount)
+	h.Add("AddRootAccount", http.MethodPost, "/root_accounts/add", svc.AddRootAccount)
 
 	h.Load(c.WebService)
 }

cmd/account-server/service/account-set/root-account/update.go

@@ -32,8 +32,8 @@ import (
 	"hcm/pkg/rest"
 )
 
-// Update update root account with options
-func (s *service) Update(cts *rest.Contexts) (interface{}, error) {
+// UpdateRootAccount update root account with options
+func (s *service) UpdateRootAccount(cts *rest.Contexts) (interface{}, error) {
 	req := new(proto.RootAccountUpdateReq)
 	if err := cts.DecodeInto(req); err != nil {
 		return nil, errf.NewFromErr(errf.DecodeRequestFailed, err)

cmd/account-server/service/bill/billsummarymain/sum.go

@@ -27,6 +27,7 @@ import (
 	"hcm/pkg/criteria/enumor"
 	"hcm/pkg/criteria/errf"
 	"hcm/pkg/dal/dao/tools"
+	"hcm/pkg/iam/meta"
 	"hcm/pkg/rest"
 	"hcm/pkg/runtime/filter"
 
@@ -42,6 +43,12 @@ func (s *service) SumMainAccountSummary(cts *rest.Contexts) (interface{}, error)
 	if err := req.Validate(); err != nil {
 		return nil, errf.NewFromErr(errf.InvalidParameter, err)
 	}
+
+	authParam := meta.ResourceAttribute{Basic: &meta.Basic{Type: meta.AccountBill, Action: meta.Find}}
+	if err := s.authorizer.AuthorizeWithPerm(cts.Kit, authParam); err != nil {
+		return nil, err
+	}
+
 	expressions := []filter.RuleFactory{
 		tools.RuleEqual("bill_year", req.BillYear),
 		tools.RuleEqual("bill_month", req.BillMonth),

cmd/account-server/service/bill/billsummaryroot/confirm.go

@@ -25,6 +25,7 @@ import (
 	asbillapi "hcm/pkg/api/account-server/bill"
 	"hcm/pkg/api/data-service/bill"
 	"hcm/pkg/criteria/enumor"
+	"hcm/pkg/iam/meta"
 	"hcm/pkg/logs"
 	"hcm/pkg/rest"
 )
@@ -35,6 +36,13 @@ func (s *service) ConfirmRootAccountSummary(cts *rest.Contexts) (interface{}, er
 	if err := cts.DecodeInto(req); err != nil {
 		return nil, err
 	}
+
+	err := s.authorizer.AuthorizeWithPerm(cts.Kit,
+		meta.ResourceAttribute{Basic: &meta.Basic{Type: meta.AccountBill, Action: meta.Update}})
+	if err != nil {
+		return nil, err
+	}
+
 	rootSummary, err := getRootSummary(s.client, cts.Kit, req.RootAccountID, req.BillYear, req.BillMonth)
 	if err != nil {
 		return nil, err

cmd/account-server/service/bill/billsummaryroot/reaccount.go

@@ -29,6 +29,7 @@ import (
 	"hcm/pkg/client"
 	"hcm/pkg/criteria/enumor"
 	"hcm/pkg/dal/dao/tools"
+	"hcm/pkg/iam/meta"
 	"hcm/pkg/kit"
 	"hcm/pkg/logs"
 	"hcm/pkg/rest"
@@ -41,6 +42,13 @@ func (s *service) ReaccountRootAccountSummary(cts *rest.Contexts) (interface{},
 	if err := cts.DecodeInto(req); err != nil {
 		return nil, err
 	}
+
+	err := s.authorizer.AuthorizeWithPerm(cts.Kit,
+		meta.ResourceAttribute{Basic: &meta.Basic{Type: meta.AccountBill, Action: meta.Update}})
+	if err != nil {
+		return nil, err
+	}
+
 	rootSummary, err := getRootSummary(s.client, cts.Kit, req.RootAccountID, req.BillYear, req.BillMonth)
 	if err != nil {
 		return nil, err

cmd/account-server/service/bill/billsummaryroot/sum.go

@@ -27,6 +27,7 @@ import (
 	"hcm/pkg/criteria/enumor"
 	"hcm/pkg/criteria/errf"
 	"hcm/pkg/dal/dao/tools"
+	"hcm/pkg/iam/meta"
 	"hcm/pkg/rest"
 	"hcm/pkg/runtime/filter"
 
@@ -42,6 +43,12 @@ func (s *service) SumRootAccountSummary(cts *rest.Contexts) (interface{}, error)
 	if err := req.Validate(); err != nil {
 		return nil, errf.NewFromErr(errf.InvalidParameter, err)
 	}
+	err := s.authorizer.AuthorizeWithPerm(cts.Kit,
+		meta.ResourceAttribute{Basic: &meta.Basic{Type: meta.AccountBill, Action: meta.Find}})
+	if err != nil {
+		return nil, err
+	}
+
 	expressions := []filter.RuleFactory{
 		tools.RuleEqual("bill_year", req.BillYear),
 		tools.RuleEqual("bill_month", req.BillMonth),