Fix post length bug

coyove · Apr 4, 2018 · d1d4778 · d1d4778
1 parent 12f87cb
commit d1d4778
Show file tree

Hide file tree

Showing 4 changed files with 95 additions and 50 deletions.
diff --git a/cmd/goflyway/lib/curl.go b/cmd/goflyway/lib/curl.go
@@ -99,13 +99,17 @@ func ParseHeadersAndPostBody(headers, post string, multipartPOST bool, req *http
 		}
 
 		buf := bufio.NewReader(f)
-		line, _ := buf.Peek(256)
 
 		if multipartPOST {
-			req.Header.Set("Content-Type", mw.FormDataContentType())
-
+			line, _ := buf.Peek(256)
+			if idx := bytes.IndexByte(line, '\n'); idx > -1 {
+				ct := strings.Replace(string(line[:idx]), "\r", "", -1)
+				req.Header.Set("Content-Type", ct)
+			}
+			req.Header.Set("Content-Length", "0")
 		} else if req.Method == "POST" {
 			req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+			req.Header.Set("Content-Length", "0")
 		}
 
 		req.Body = ioutil.NopCloser(buf)
@@ -143,15 +147,19 @@ func ParseHeadersAndPostBody(headers, post string, multipartPOST bool, req *http
 
 		mw.Close()
 		req.Header.Set("Content-Type", mw.FormDataContentType())
+		req.Header.Set("Content-Length", "0")
 		req.Body = ioutil.NopCloser(buf)
 	} else {
 		if req.Method == "POST" {
 			form := _url.Values{}
 			for _, kv := range ppost {
 				form.Add(kv[0], kv[1])
 			}
+
+			x := form.Encode()
 			req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-			req.Body = ioutil.NopCloser(strings.NewReader(form.Encode()))
+			req.Header.Set("Content-Length", strconv.Itoa(len(x)))
+			req.Body = ioutil.NopCloser(strings.NewReader(x))
 		} else {
 			form := req.URL.Query()
 			for _, kv := range ppost {
@@ -162,12 +170,12 @@ func ParseHeadersAndPostBody(headers, post string, multipartPOST bool, req *http
 		}
 	}
 
-	pform, err := parse(headers)
+	pheader, err := parse(headers)
 	if err != nil {
 		return err
 	}
 
-	for _, kv := range pform {
+	for _, kv := range pheader {
 		req.Header.Add(kv[0], kv[1])
 	}
 
@@ -191,6 +199,12 @@ func IOCopy(w io.Writer, r *ResponseRecorder, reformatJSON bool) {
 	}
 }
 
+type NullReader struct{}
+
+func (r *NullReader) Read(p []byte) (int, error) { return 0, io.EOF }
+
+func (r *NullReader) Close() error { return nil }
+
 type readerProgress struct {
 	r        io.ReadCloser
 	callback func(bytes int64)

diff --git a/cmd/goflyway/lib/print.go b/cmd/goflyway/lib/print.go
@@ -3,14 +3,35 @@ package lib
 import (
 	"fmt"
 	"os"
+	"strings"
 )
 
 var Slient = false
 
+var Prefix = "*"
+
 func Println(args ...interface{}) {
-	if !Slient {
-		fmt.Println(args...)
+	if Slient {
+		return
+	}
+
+	fmt.Print(Prefix + " ")
+
+	for _, arg := range args {
+		s := fmt.Sprintf("%v", arg)
+		p := strings.Split(s, "\n")
+
+		fmt.Print(p[0])
+
+		for i := 1; i < len(p); i++ {
+			fmt.Println()
+			fmt.Print(Prefix + " ")
+			fmt.Print(p[i])
+		}
+
+		fmt.Print(" ")
 	}
+	fmt.Println()
 }
 
 func PrintInErr(args ...interface{}) {