[proxy]修复缓存策略Header发送不正确的问题

Author: iwind

teacache/item.go

@@ -2,11 +2,17 @@ package teacache
 
 import "encoding/binary"
 
+// 缓存条目
 type Item struct {
 	Header []byte
 	Body   []byte
 }
 
+// 获取新对象
+func NewItem() *Item {
+	return &Item{}
+}
+
 func (this *Item) Encode() (data []byte) {
 	l := make([]byte, 8)
 	binary.BigEndian.PutUint32(l, uint32(len(this.Header)))
@@ -21,3 +27,4 @@ func (this *Item) Decode(data []byte) {
 	this.Header = data[8 : 8+headerLength]
 	this.Body = data[8+headerLength:]
 }
+

teacache/item_test.go

@@ -1,7 +1,10 @@
 package teacache
 
 import (
+	"bufio"
+	"bytes"
 	"github.com/iwind/TeaGo/assert"
+	"net/http"
 	"testing"
 )
 
@@ -19,3 +22,18 @@ func TestItem_Encode(t *testing.T) {
 	a.Equals(string(newItem.Header), "Hello")
 	a.Equals(string(newItem.Body), "World")
 }
+
+func TestItem_Response(t *testing.T) {
+	item := NewItem()
+	item.Header = []byte(`HTTP/1.1 200 OK
+Content-Type: image/png
+Etag: "et282346d6373bcae13d89ac46447a228c"
+Last-Modified: Fri, 19 Apr 2019 08:01:32 GMT
+
+`)
+	resp, err := http.ReadResponse(bufio.NewReader(bytes.NewReader(item.Header)), nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(resp.Header)
+}

teacache/process.go

@@ -78,19 +78,27 @@ func ProcessBeforeRequest(req *teaproxy.Request, writer *teaproxy.ResponseWriter
 		return true
 	}
 
+	if len(data) <= 8 {
+		return true
+	}
+
 	resp, err := http.ReadResponse(bufio.NewReader(bytes.NewReader(data[8:])), nil)
 	if err != nil {
 		logs.Error(err)
 		return true
 	}
 	defer resp.Body.Close()
 
-	writer.WriteHeader(resp.StatusCode)
 	for k, vs := range resp.Header {
+		if k == "Connection" {
+			continue
+		}
 		for _, v := range vs {
 			writer.Header().Add(k, v)
 		}
 	}
+	writer.WriteHeader(resp.StatusCode)
+
 	_, err = io.Copy(writer, resp.Body)
 	if err != nil {
 		logs.Error(err)

teaproxy/listener.go

@@ -209,13 +209,13 @@ func (this *Listener) Reload() error {
 				}
 				server, _ := this.findNamedServer(info.ServerName)
 				if server == nil || server.SSL == nil || !server.SSL.On {
-					return nil, errors.New("[listener]no server found for '" + this.Address + "'")
+					return nil, errors.New("[listener]no server found for '" + info.ServerName + "'")
 				}
 				cert := server.SSL.CertificateObject()
 				if cert != nil {
 					return cert, nil
 				}
-				return nil, errors.New("no certificate found")
+				return nil, errors.New("[listener]no certificate found for '" + info.ServerName + "'")
 			},
 		}
 		err = this.httpServer.ListenAndServeTLS("", "")

teaproxy/request_root.go

@@ -113,13 +113,17 @@ func (this *Request) callRoot(writer *ResponseWriter) error {
 		if len(ext) > 0 {
 			mimeType := mime.TypeByExtension(ext)
 			if len(mimeType) > 0 {
-				if len(this.charset) > 0 {
-					// 去掉里面的charset设置
-					index := strings.Index(mimeType, "charset=")
-					if index > 0 {
-						respHeader.Set("Content-Type", mimeType[:index+len("charset=")]+this.charset)
+				if _, found := textMimeMap[mimeType]; found {
+					if len(this.charset) > 0 {
+						// 去掉里面的charset设置
+						index := strings.Index(mimeType, "charset=")
+						if index > 0 {
+							respHeader.Set("Content-Type", mimeType[:index+len("charset=")]+this.charset)
+						} else {
+							respHeader.Set("Content-Type", mimeType+"; charset="+this.charset)
+						}
 					} else {
-						respHeader.Set("Content-Type", mimeType+"; charset="+this.charset)
+						respHeader.Set("Content-Type", mimeType)
 					}
 				} else {
 					respHeader.Set("Content-Type", mimeType)