perf(code):detail optimization

404tk · 404tk · commit 869c8e771b21 · 2025-02-21T14:58:04.000+08:00
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022-2023 404tk
+Copyright (c) 2022-2025 404tk
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
@@ -8,13 +8,14 @@ Reference [Wiki](https://github.com/404tk/cloudtoolkit/wiki)
 
 |          Provider          |                   Payload                   |                          Supported                           |
 | :-------------------------: | :-----------------------------------------: | :----------------------------------------------------------: |
-|        Alibaba Cloud        | cloudlist<br/>backdoor-user<br/>bucket-dump<br/>event-dump<br/>exec-command<br/>database-account | ECS (Elastic Compute Service)<br/>OSS (Object Storage Service)<br/>RAM (Resource Access Management)<br/>RDS (Relational Database Service)<br/>SMS (Short Message Service)<br/>AliDNS<br/>SLS (Simple Log Service) |
-|        Tencent Cloud        |         cloudlist<br/>backdoor-user<br/>exec-command         | CVM (Cloud Virtual Machine)<br/>Lighthouse<br/>COS (Cloud Object Storage)<br/>CAM (Cloud Access Management)<br/>CDB (Cloud DataBase)<br/>DNSPod |
-|        Huawei Cloud         |         cloudlist<br/>backdoor-user         | ECS (Elastic Cloud Server)<br/>OBS (Object Storage Service)<br/>IAM (Identity and Access Management)<br/>RDS (Relational Database Service) |
+|        Alibaba Cloud        | cloudlist<br/>backdoor-user<br/>bucket-dump<br/>event-dump<br/>exec-command<br/>database-account | ECS <br/>OSS<br/>RAM <br/>RDS <br/>SMS <br/>AliDNS<br/>SLS |
+|        Tencent Cloud        |         cloudlist<br/>backdoor-user<br/>exec-command         | CVM <br/>Lighthouse<br/>COS<br/>CAM <br/>CDB <br/>DNSPod |
+|        Huawei Cloud         |         cloudlist<br/>backdoor-user         | ECS <br/>OBS <br/>IAM <br/>RDS |
 |       Microsoft Azure       |                  cloudlist                  |              Virtual Machines<br/>Blob Storage               |
-|  AWS (Amazon web services)  | cloudlist<br/>backdoor-user<br/>bucket-dump | EC2 (Elastic Compute Cloud)<br/>S3 (Simple Storage Service)<br/>IAM (Identity and Access Management) |
-| GCP (Google Cloud Platform) |                  cloudlist                  |                 Compute Engine<br/>Cloud DNS<br/>Identity and Access Management                 |
+|  AWS  | cloudlist<br/>backdoor-user<br/>bucket-dump | EC2<br/>S3 <br/>IAM |
+| GCP |                  cloudlist                  |                 Compute Engine<br/>Cloud DNS<br/>IAM                 |
 |         Volcengine          |                          cloudlist                           |                         ECS<br/>IAM                          |
+| JDCloud | cloudlist | VM<br/>IAM<br/>OSS |
 
 ## Thanks
 - [c-bata/go-prompt](https://github.com/c-bata/go-prompt)
diff --git a/pkg/providers/alibaba/sls/signature.go b/pkg/providers/alibaba/sls/signature.go
@@ -42,7 +42,7 @@ func (client *Client) signRequest(req *request, payload []byte) {
 func canonicalizeResource(req *request) string {
 	canonicalizedResource := req.path
 	var paramNames []string
-	if req.params != nil && len(req.params) > 0 {
+	if len(req.params) > 0 {
 		for k := range req.params {
 			paramNames = append(paramNames, k)
 		}
diff --git a/pkg/providers/alibaba/sms/list.go b/pkg/providers/alibaba/sms/list.go
@@ -36,8 +36,8 @@ func (d *Driver) GetResource(ctx context.Context) (schema.Sms, error) {
 		logger.Error("List SMS failed.")
 		return res, err
 	}
-	res.Templates, err = listSmsTemplate(client)
-	res.DailySize, err = querySendStatistics(client)
+	res.Templates, _ = listSmsTemplate(client)
+	res.DailySize, _ = querySendStatistics(client)
 
 	return res, err
 }
@@ -76,7 +76,10 @@ func listSmsTemplate(client *dysmsapi.Client) ([]schema.SmsTemplate, error) {
 		return temps, err
 	}
 	for _, temp := range response.SmsTemplateList {
-		s, _ := status[temp.AuditStatus]
+		s, ok := status[temp.AuditStatus]
+		if !ok {
+			continue
+		}
 		temps = append(temps, schema.SmsTemplate{
 			Name:    temp.TemplateName,
 			Status:  s,
diff --git a/pkg/providers/alibaba/sms/query.go b/pkg/providers/alibaba/sms/query.go
@@ -1,10 +1,8 @@
 package sms
 
 import (
-	"fmt"
 	"time"
 
-	"github.com/404tk/cloudtoolkit/utils/logger"
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/dysmsapi"
 )
@@ -25,6 +23,7 @@ func querySendStatistics(client *dysmsapi.Client) (int64, error) {
 	return response.Data.TotalSize, nil
 }
 
+/*
 func querySendDetails(client *dysmsapi.Client, phone string) {
 	request := dysmsapi.CreateQuerySendDetailsRequest()
 	request.Scheme = "https"
@@ -43,3 +42,4 @@ func querySendDetails(client *dysmsapi.Client, phone string) {
 		fmt.Printf("%-10s\t%-90s\n\n", detail.SendDate, detail.Content)
 	}
 }
+*/
diff --git a/pkg/providers/jdcloud/jdcloud.go b/pkg/providers/jdcloud/jdcloud.go
@@ -37,7 +37,7 @@ func New(options schema.Options) (*Provider, error) {
 	if payload == "cloudlist" {
 		d := &iam.Driver{Cred: cred, Token: token}
 		if !d.Validator(accessKey) {
-			return nil, fmt.Errorf("Invalid Accesskey")
+			return nil, fmt.Errorf("invalid accesskey")
 		}
 		cache.Cfg.CredInsert("default", options)
 	}
diff --git a/pkg/providers/tencent/cam/roleadd.go b/pkg/providers/tencent/cam/roleadd.go
@@ -17,7 +17,7 @@ func (d *Driver) AddRole() {
 		logger.Error("Create role failed:", err.Error())
 		return
 	}
-	err = attachPolicyToRole(client, d.RoleName)
+	_ = attachPolicyToRole(client, d.RoleName)
 	OwnerID := getOwnerUin(client)
 	logger.Warning(fmt.Sprintf(
 		"Switch URL: https://cloud.tencent.com/cam/switchrole?ownerUin=%s&roleName=%s\n",
diff --git a/pkg/providers/tencent/cam/useradd.go b/pkg/providers/tencent/cam/useradd.go
@@ -17,7 +17,7 @@ func (d *Driver) AddUser() {
 		logger.Error("Create user failed:", err.Error())
 		return
 	}
-	err = attachPolicyToUser(client, d.UserName)
+	_ = attachPolicyToUser(client, d.UserName)
 	OwnerID := getOwnerUin(client)
 	fmt.Printf("\n%-10s\t%-10s\t%-60s\n", "Username", "Password", "Login URL")
 	fmt.Printf("%-10s\t%-10s\t%-60s\n", "--------", "--------", "---------")
diff --git a/runner/banner.go b/runner/banner.go
@@ -16,5 +16,5 @@ const Version = `0.1.6`
 
 // showBanner is used to show the banner to the user
 func ShowBanner() {
-	fmt.Print(fmt.Sprintf(banner, Version))
+	fmt.Printf(banner, Version)
 }
diff --git a/runner/init.go b/runner/init.go
@@ -14,7 +14,7 @@ var filename = "config.yaml"
 func InitConfig() {
 	_, err := os.Stat(filename)
 	if os.IsNotExist(err) || err != nil {
-		err = os.WriteFile(filename, []byte(defaultConfigFile), os.ModePerm)
+		_ = os.WriteFile(filename, []byte(defaultConfigFile), os.ModePerm)
 	}
 	viper.AddConfigPath(".")
 	viper.SetConfigFile(filename)
diff --git a/utils/cache/config.go b/utils/cache/config.go
@@ -52,8 +52,8 @@ func getCreds(path string) (creds []Credential) {
 }
 
 func SaveFile() {
-	data, err := json.MarshalIndent(Cfg.Creds, "", "\t")
-	err = os.WriteFile(Cfg.Path, data, 0644)
+	data, _ := json.MarshalIndent(Cfg.Creds, "", "\t")
+	err := os.WriteFile(Cfg.Path, data, 0644)
 	if err != nil {
 		logger.Error("Failed to write the config file:", err.Error())
 	}
diff --git a/utils/cache/credential.go b/utils/cache/credential.go
@@ -18,11 +18,11 @@ type Credential struct {
 }
 
 func (cfg *InitCfg) CredInsert(user string, data map[string]string) {
-	provider, _ := data[utils.Provider]
-	accessKey, _ := data[utils.AccessKey]
+	provider := data[utils.Provider]
+	accessKey := data[utils.AccessKey]
 	switch provider {
 	case "azure":
-		accessKey, _ = data[utils.AzureClientId]
+		accessKey = data[utils.AzureClientId]
 	case "gcp":
 		tojson, _ := base64.StdEncoding.DecodeString(data[utils.GCPserviceAccountJSON])
 		accessKey = utils.Md5Encode(string(tojson))
diff --git a/utils/processbar/screen.go b/utils/processbar/screen.go
@@ -9,7 +9,7 @@ func RegionPrint(region string, count, prev int, flag bool) (int, bool) {
 	progress := fmt.Sprintf("[%s] %d found.", region, count)
 	if count == 0 {
 		if flag {
-			fmt.Printf(progress)
+			fmt.Print(progress)
 		} else {
 			progress += getBlock(prev, len(progress))
 			fmt.Printf("\r%s", progress)

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ func (client Client) signRequest(req request, payload []byte) {`
`42`	`42`	`func canonicalizeResource(req *request) string {`
`43`	`43`	`canonicalizedResource := req.path`
`44`	`44`	`var paramNames []string`
`45`		`- if req.params != nil && len(req.params) > 0 {`
	`45`	`+ if len(req.params) > 0 {`
`46`	`46`	`for k := range req.params {`
`47`	`47`	`paramNames = append(paramNames, k)`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,8 @@`
`1`	`1`	`package sms`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "fmt"`
`5`	`4`	`"time"`
`6`	`5`
`7`		`- "github.com/404tk/cloudtoolkit/utils/logger"`
`8`	`6`	`"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"`
`9`	`7`	`"github.com/aliyun/alibaba-cloud-sdk-go/services/dysmsapi"`
`10`	`8`	`)`
`@@ -25,6 +23,7 @@ func querySendStatistics(client *dysmsapi.Client) (int64, error) {`
`25`	`23`	`return response.Data.TotalSize, nil`
`26`	`24`	`}`
`27`	`25`
	`26`	`+/*`
`28`	`27`	`func querySendDetails(client *dysmsapi.Client, phone string) {`
`29`	`28`	`request := dysmsapi.CreateQuerySendDetailsRequest()`
`30`	`29`	`request.Scheme = "https"`
`@@ -43,3 +42,4 @@ func querySendDetails(client *dysmsapi.Client, phone string) {`
`43`	`42`	`fmt.Printf("%-10s\t%-90s\n\n", detail.SendDate, detail.Content)`
`44`	`43`	`}`
`45`	`44`	`}`
	`45`	`+*/`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func New(options schema.Options) (*Provider, error) {`
`37`	`37`	`if payload == "cloudlist" {`
`38`	`38`	`d := &iam.Driver{Cred: cred, Token: token}`
`39`	`39`	`if !d.Validator(accessKey) {`
`40`		`- return nil, fmt.Errorf("Invalid Accesskey")`
	`40`	`+ return nil, fmt.Errorf("invalid accesskey")`
`41`	`41`	`}`
`42`	`42`	`cache.Cfg.CredInsert("default", options)`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ func (d *Driver) AddRole() {`
`17`	`17`	`logger.Error("Create role failed:", err.Error())`
`18`	`18`	`return`
`19`	`19`	`}`
`20`		`- err = attachPolicyToRole(client, d.RoleName)`
	`20`	`+ _ = attachPolicyToRole(client, d.RoleName)`
`21`	`21`	`OwnerID := getOwnerUin(client)`
`22`	`22`	`logger.Warning(fmt.Sprintf(`
`23`	`23`	`"Switch URL: https://cloud.tencent.com/cam/switchrole?ownerUin=%s&roleName=%s\n",`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ func (d *Driver) AddUser() {`
`17`	`17`	`logger.Error("Create user failed:", err.Error())`
`18`	`18`	`return`
`19`	`19`	`}`
`20`		`- err = attachPolicyToUser(client, d.UserName)`
	`20`	`+ _ = attachPolicyToUser(client, d.UserName)`
`21`	`21`	`OwnerID := getOwnerUin(client)`
`22`	`22`	`fmt.Printf("\n%-10s\t%-10s\t%-60s\n", "Username", "Password", "Login URL")`
`23`	`23`	`fmt.Printf("%-10s\t%-10s\t%-60s\n", "--------", "--------", "---------")`
Original file line number	Diff line number	Diff line change
@@ -16,5 +16,5 @@ const Version = `0.1.6`
`16`	`16`
`17`	`17`	`// showBanner is used to show the banner to the user`
`18`	`18`	`func ShowBanner() {`
`19`		`- fmt.Print(fmt.Sprintf(banner, Version))`
	`19`	`+ fmt.Printf(banner, Version)`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ var filename = "config.yaml"`
`14`	`14`	`func InitConfig() {`
`15`	`15`	`_, err := os.Stat(filename)`
`16`	`16`	`if os.IsNotExist(err) \|\| err != nil {`
`17`		`- err = os.WriteFile(filename, []byte(defaultConfigFile), os.ModePerm)`
	`17`	`+ _ = os.WriteFile(filename, []byte(defaultConfigFile), os.ModePerm)`
`18`	`18`	`}`
`19`	`19`	`viper.AddConfigPath(".")`
`20`	`20`	`viper.SetConfigFile(filename)`