feat(log):log files can be saved by default

404tk · 404tk · commit 8451c4759150 · 2023-07-04T01:22:59.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .DS_Store
 .vscode/
 go.sum
-temp/
+temp/
+logs/
diff --git a/pkg/providers/alibaba/alibaba.go b/pkg/providers/alibaba/alibaba.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 	"strings"
+	"time"
 
 	_dns "github.com/404tk/cloudtoolkit/pkg/providers/alibaba/dns"
 	_ecs "github.com/404tk/cloudtoolkit/pkg/providers/alibaba/ecs"
@@ -220,4 +221,10 @@ func (p *Provider) EventDump(sourceIp string) {
 		events = append(events, _event)
 	}
 	table.Output(events)
+	if utils.DoSave {
+		filename := time.Now().Format("20060102150405.log")
+		path := fmt.Sprintf("%s/%s_eventdump_%s", utils.LogDir, p.Name(), filename)
+		table.FileOutput(path, events)
+		log.Printf("[+] Output written to [%s]\n", path)
+	}
 }
diff --git a/runner/console/completer.go b/runner/console/completer.go
@@ -44,6 +44,7 @@ var optionsDesc = map[string]string{
 	utils.AzureSubscriptionId:   "Subscription ID (Optional)",
 	utils.GCPserviceAccountJSON: "GCP Credential encoded through Base64",
 	utils.Metadata:              "Set the payload with additional arguments (Optional)",
+	utils.Save:                  "Save log file",
 }
 
 var opt = []prompt.Suggest{
diff --git a/runner/console/executor.go b/runner/console/executor.go
@@ -98,7 +98,7 @@ func set(args []string) {
 			fmt.Printf("%s => %s\n", args[0], args[1])
 		}
 	}
-	if args[0] == "payload" {
+	if args[0] == utils.Payload {
 		switch args[1] {
 		case "backdoor-user":
 			config[utils.Metadata] = utils.BackdoorUser
@@ -108,6 +108,14 @@ func set(args []string) {
 			config[utils.Metadata] = utils.EventDump
 		}
 	}
+	if args[0] == utils.Save {
+		if args[1] == "true" {
+			utils.DoSave = true
+			utils.CheckLogDir()
+		} else {
+			utils.DoSave = false
+		}
+	}
 }
 
 func run(ctx context.Context) {
diff --git a/runner/console/sessions.go b/runner/console/sessions.go
@@ -79,6 +79,16 @@ func internation(uuid string) {
 	}
 	if provider, ok := m[utils.Provider]; ok {
 		config = m
+		if v, ok := config["save"]; ok {
+			if v == "true" {
+				utils.DoSave = true
+				utils.CheckLogDir()
+			} else {
+				utils.DoSave = false
+			}
+		} else {
+			set([]string{"save", "true"})
+		}
 		p := prompt.New(
 			Executor,
 			actionCompleter,
diff --git a/runner/console/use.go b/runner/console/use.go
@@ -16,6 +16,12 @@ func Use(args []string) {
 	for _, m := range modules {
 		if m.Text == args[0] {
 			loadModule(args[0])
+			if config["save"] == "true" {
+				utils.DoSave = true
+				utils.CheckLogDir()
+			} else {
+				utils.DoSave = false
+			}
 			return
 		}
 	}
@@ -34,6 +40,7 @@ func loadModule(m string) {
 
 	config[utils.Provider] = m
 	config[utils.Payload] = "cloudlist" // Default use cloudlist
+	config[utils.Save] = "true"         // Default save log file
 
 	p := prompt.New(
 		Executor,
diff --git a/runner/payloads/cloudlist.go b/runner/payloads/cloudlist.go
@@ -4,8 +4,10 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"time"
 
 	"github.com/404tk/cloudtoolkit/pkg/inventory"
+	"github.com/404tk/cloudtoolkit/utils"
 	"github.com/404tk/cloudtoolkit/utils/table"
 )
 
@@ -27,10 +29,15 @@ func (p CloudList) Run(ctx context.Context, config map[string]string) {
 	case <-ctx.Done():
 		return
 	default:
+		filename := time.Now().Format("20060102150405.log")
+		path := fmt.Sprintf("%s/%s_cloudlist_%s", utils.LogDir, i.Providers.Name(), filename)
 		pprint := func(len int, tag string, res interface{}) {
 			if len > 0 {
 				fmt.Println(tag, "results:")
 				table.Output(res)
+				if utils.DoSave {
+					table.FileOutput(path, res)
+				}
 			}
 		}
 
@@ -46,8 +53,11 @@ func (p CloudList) Run(ctx context.Context, config map[string]string) {
 		if resources.Sms.DailySize > 0 {
 			fmt.Printf("[*] The total number of SMS messages sent today is %v.\n", resources.Sms.DailySize)
 		}
-
-		log.Println("[+] Done.")
+		if utils.DoSave {
+			log.Printf("[+] Output written to [%s]\n", path)
+		} else {
+			log.Println("[+] Done.")
+		}
 	}
 }
 
diff --git a/runner/payloads/event_dump.go b/runner/payloads/event_dump.go
@@ -25,7 +25,7 @@ func (p EventDump) Run(ctx context.Context, config map[string]string) {
 		}
 	}
 	i.Providers.EventDump(sourceIp)
-	log.Println("[+] Done.")
+	// log.Println("[+] Done.")
 }
 
 func (p EventDump) Desc() string {
diff --git a/utils/const.go b/utils/const.go
@@ -8,6 +8,7 @@ const (
 	SecurityToken = "token"
 	Region        = "region"
 	Version       = "version"
+	Save          = "save"
 )
 
 const (
@@ -28,6 +29,8 @@ const (
 	EventDump    = "dump all"
 )
 
-const (
+var (
+	DoSave bool
+	LogDir = "logs"
 	IpInfo = "https://ipinfo.io/ip"
 )
diff --git a/utils/table/table.go b/utils/table/table.go
@@ -15,7 +15,7 @@ import (
 func Output(slice interface{}) {
 	coln, rows, err := parse(slice)
 	if err != nil {
-		log.Println("[-] ", err)
+		log.Println("[-]", err)
 	}
 	table := tablewriter.NewWriter(os.Stdout)
 	table.SetHeader(coln)
@@ -26,6 +26,25 @@ func Output(slice interface{}) {
 	table.Render()
 }
 
+func FileOutput(filename string, slice interface{}) {
+	coln, rows, err := parse(slice)
+	if err != nil {
+		log.Println("[-]", err)
+	}
+	file, err := os.OpenFile(filename, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0644)
+	if err != nil {
+		log.Println("[-]", err)
+	}
+	defer file.Close()
+	table := tablewriter.NewWriter(file)
+	table.SetHeader(coln)
+
+	for _, v := range rows {
+		table.Append(v)
+	}
+	table.Render()
+}
+
 func parse(slice interface{}) (
 	coln []string, // name of columns
 	rows [][]string, // rows of content
diff --git a/utils/utils.go b/utils/utils.go
@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
+	"os"
+	"path/filepath"
 	"strings"
 )
 
@@ -39,3 +41,9 @@ func HttpGet(url string) ([]byte, error) {
 	}
 	return body, nil
 }
+
+func CheckLogDir() {
+	if v, _ := filepath.Glob(LogDir); len(v) == 0 {
+		os.Mkdir(LogDir, os.ModePerm)
+	}
+}

-Original file line number
+Diff line change
@@ @@ -1,4 +1,5 @@ @@
 .DS_Store
 .vscode/
 go.sum
 -temp/
 +temp/
 +logs/
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ var optionsDesc = map[string]string{`
`44`	`44`	`utils.AzureSubscriptionId: "Subscription ID (Optional)",`
`45`	`45`	`utils.GCPserviceAccountJSON: "GCP Credential encoded through Base64",`
`46`	`46`	`utils.Metadata: "Set the payload with additional arguments (Optional)",`
	`47`	`+ utils.Save: "Save log file",`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`var opt = []prompt.Suggest{`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ func set(args []string) {`
`98`	`98`	`fmt.Printf("%s => %s\n", args[0], args[1])`
`99`	`99`	`}`
`100`	`100`	`}`
`101`		`- if args[0] == "payload" {`
	`101`	`+ if args[0] == utils.Payload {`
`102`	`102`	`switch args[1] {`
`103`	`103`	`case "backdoor-user":`
`104`	`104`	`config[utils.Metadata] = utils.BackdoorUser`
`@@ -108,6 +108,14 @@ func set(args []string) {`
`108`	`108`	`config[utils.Metadata] = utils.EventDump`
`109`	`109`	`}`
`110`	`110`	`}`
	`111`	`+ if args[0] == utils.Save {`
	`112`	`+ if args[1] == "true" {`
	`113`	`+ utils.DoSave = true`
	`114`	`+ utils.CheckLogDir()`
	`115`	`+ } else {`
	`116`	`+ utils.DoSave = false`
	`117`	`+ }`
	`118`	`+ }`
`111`	`119`	`}`
`112`	`120`
`113`	`121`	`func run(ctx context.Context) {`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ func (p EventDump) Run(ctx context.Context, config map[string]string) {`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`	`i.Providers.EventDump(sourceIp)`
`28`		`- log.Println("[+] Done.")`
	`28`	`+ // log.Println("[+] Done.")`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`func (p EventDump) Desc() string {`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ const (`
`8`	`8`	`SecurityToken = "token"`
`9`	`9`	`Region = "region"`
`10`	`10`	`Version = "version"`
	`11`	`+ Save = "save"`
`11`	`12`	`)`
`12`	`13`
`13`	`14`	`const (`
`@@ -28,6 +29,8 @@ const (`
`28`	`29`	`EventDump = "dump all"`
`29`	`30`	`)`
`30`	`31`
`31`		`-const (`
	`32`	`+var (`
	`33`	`+ DoSave bool`
	`34`	`+ LogDir = "logs"`
`32`	`35`	`IpInfo = "https://ipinfo.io/ip"`
`33`	`36`	`)`