dump level

README.md

@@ -14,6 +14,6 @@
 - [x] websocket
 - [x] 插件机制
 - [x] 命令行参数控制 dump 至文件
-- [ ] dump level
+- [x] dump level
 - [ ] support get method with body
 - [ ] http2

addon/dumper.go

@@ -7,21 +7,28 @@ import (
 	"net/http"
 	"os"
 	"strings"
+	"unicode"
 
 	"github.com/lqqyt2423/go-mitmproxy/flow"
 )
 
 type Dumper struct {
 	Base
+	level int // 0: header 1: header + body
 	Out   io.Writer
 }
 
-func NewDumperWithFile(file string) *Dumper {
+func NewDumper(file string, level int) *Dumper {
 	out, err := os.OpenFile(file, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
 	if err != nil {
 		panic(err)
 	}
-	return &Dumper{Out: out}
+
+	if level != 0 && level != 1 {
+		level = 0
+	}
+
+	return &Dumper{Out: out, level: level}
 }
 
 func (d *Dumper) Requestheaders(f *flow.Flow) {
@@ -48,6 +55,11 @@ func (d *Dumper) Requestheaders(f *flow.Flow) {
 		}
 		buf.WriteString("\r\n")
 
+		if d.level == 1 && f.Request.Body != nil && len(f.Request.Body) > 0 && CanPrint(f.Request.Body) {
+			buf.Write(f.Request.Body)
+			buf.WriteString("\r\n\r\n")
+		}
+
 		if f.Response != nil {
 			fmt.Fprintf(buf, "%v %v %v\r\n", f.Request.Proto, f.Response.StatusCode, http.StatusText(f.Response.StatusCode))
 			err = f.Response.Header.WriteSubset(buf, nil)
@@ -55,7 +67,14 @@ func (d *Dumper) Requestheaders(f *flow.Flow) {
 				log.Error(err)
 			}
 			buf.WriteString("\r\n")
+
+			if d.level == 1 && f.Response.Body != nil && len(f.Response.Body) > 0 && CanPrint(f.Response.Body) {
+				buf.Write(f.Response.Body)
+				buf.WriteString("\r\n\r\n")
 			}
+		}
+
+		buf.WriteString("\r\n\r\n")
 
 		_, err = d.Out.Write(buf.Bytes())
 		if err != nil {
@@ -63,3 +82,12 @@ func (d *Dumper) Requestheaders(f *flow.Flow) {
 		}
 	}()
 }
+
+func CanPrint(content []byte) bool {
+	for _, c := range string(content) {
+		if !unicode.IsPrint(c) && !unicode.IsSpace(c) {
+			return false
+		}
+	}
+	return true
+}

cmd/mitmproxy/main.go

@@ -12,6 +12,7 @@ import (
 type Config struct {
 	addr      string
 	dump      string // dump filename
+	dumpLevel int    // dump level
 }
 
 func loadConfig() *Config {
@@ -19,6 +20,7 @@ func loadConfig() *Config {
 
 	flag.StringVar(&config.addr, "addr", ":9080", "proxy listen addr")
 	flag.StringVar(&config.dump, "dump", "", "dump filename")
+	flag.IntVar(&config.dumpLevel, "dump_level", 0, "dump level: 0 - header, 1 - header + body")
 	flag.Parse()
 
 	return config
@@ -45,7 +47,7 @@ func main() {
 	}
 
 	if config.dump != "" {
-		dumper := addon.NewDumperWithFile(config.dump)
+		dumper := addon.NewDumper(config.dump, config.dumpLevel)
 		p.AddAddon(dumper)
 	}