content-encoding

README.md

@@ -57,6 +57,7 @@ Usage of mitmproxy:
 - [ ] http2
 - [ ] websocket 解析
 - [ ] web 界面
+- [ ] Content-Encoding 相关
 
 ## License
 

addon/dumper.go

@@ -68,9 +68,12 @@ func (d *Dumper) Requestheaders(f *flow.Flow) {
 			}
 			buf.WriteString("\r\n")
 
-			if d.level == 1 && f.Response.Body != nil && len(f.Response.Body) > 0 && CanPrint(f.Response.Body) {
+			if d.level == 1 && f.Response.Body != nil && len(f.Response.Body) > 0 {
-				buf.Write(f.Response.Body)
+				body, _ := f.Response.DecodedBody()
-				buf.WriteString("\r\n\r\n")
+				if len(body) > 0 && CanPrint(body) {
+					buf.Write(body)
+					buf.WriteString("\r\n\r\n")
+				}
 			}
 		}
 

flow/encoding.go

@@ -0,0 +1,73 @@
+package flow
+
+import (
+	"bytes"
+	"compress/gzip"
+	"errors"
+	"io"
+)
+
+// handle http header: content-encoding
+
+var EncodingNotSupport = errors.New("content-encoding not support")
+
+func (r *Response) DecodedBody() ([]byte, bool) {
+	if r.decodedBody != nil {
+		return r.decodedBody, r.decoded
+	}
+
+	if r.decodedErr != nil {
+		return nil, r.decoded
+	}
+
+	if r.Body == nil {
+		return nil, r.decoded
+	}
+
+	if len(r.Body) == 0 {
+		r.decodedBody = r.Body
+		return r.decodedBody, r.decoded
+	}
+
+	enc := r.Header.Get("Content-Encoding")
+	if enc == "" {
+		r.decodedBody = r.Body
+		return r.decodedBody, r.decoded
+	}
+
+	r.decodedBody, r.decodedErr = Decode(enc, r.Body)
+	if r.decodedErr != nil {
+		log.Error(r.decodedErr)
+	} else {
+		r.decoded = true
+	}
+
+	return r.decodedBody, r.decoded
+}
+
+// 当 Response.Body 替换为解压的内容时调用
+func (r *Response) RemoveEncodingHeader() {
+	r.Header.Del("Content-Encoding")
+	r.Header.Del("Content-Length")
+}
+
+func Decode(enc string, body []byte) ([]byte, error) {
+	if enc == "gzip" {
+		zr, err := gzip.NewReader(bytes.NewReader(body))
+		if err != nil {
+			return nil, err
+		}
+		buf := bytes.NewBuffer(make([]byte, 0))
+		_, err = io.Copy(buf, zr)
+		if err != nil {
+			return nil, err
+		}
+		err = zr.Close()
+		if err != nil {
+			return nil, err
+		}
+		return buf.Bytes(), nil
+	}
+
+	return nil, EncodingNotSupport
+}

flow/flow.go

@@ -3,8 +3,12 @@ package flow
 import (
 	"net/http"
 	"net/url"
+
+	_log "github.com/sirupsen/logrus"
 )
 
+var log = _log.WithField("at", "flow")
+
 type Request struct {
 	Method string
 	URL    *url.URL
@@ -33,6 +37,10 @@ type Response struct {
 	StatusCode int
 	Header     http.Header
 	Body       []byte
+
+	decodedBody []byte
+	decoded     bool // decoded reports whether the response was sent compressed but was decoded to decodedBody.
+	decodedErr  error
 }
 
 type Flow struct {

proxy/proxy.go

@@ -48,9 +48,8 @@ func NewProxy(opts *Options) (*Proxy, error) {
 			IdleConnTimeout:       90 * time.Second,
 			TLSHandshakeTimeout:   10 * time.Second,
 			ExpectContinueTimeout: 1 * time.Second,
-
+			ForceAttemptHTTP2:     false, // disable http2
-			ForceAttemptHTTP2:  false, // disable http2
+			DisableCompression:    true,  // To get the original response from the server, set Transport.DisableCompression to true.
-			DisableCompression: true,
 			TLSClientConfig: &tls.Config{
 				KeyLogWriter: GetTlsKeyLogWriter(),
 			},