Merge branch 'dev' into dev

Author: ehsandeep

.github/workflows/build-test.yml

@@ -16,12 +16,12 @@ jobs:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: 1.21.x
 
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Build
         run: go build .

.github/workflows/lint-test.yml

@@ -14,15 +14,15 @@ jobs:
     steps:
 
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: 1.21.x
 
       - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@v3.6.0
+        uses: golangci/golangci-lint-action@v6
         with:
           version: latest
           args: --timeout 5m

.github/workflows/release-binary.yml

@@ -11,17 +11,17 @@ jobs:
     runs-on: ubuntu-latest-16-cores
     steps:
       - name: "Check out code"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with: 
           fetch-depth: 0
 
       - name: "Set up Go"
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with: 
           go-version: 1.21.x
 
       - name: "Create release on GitHub"
-        uses: goreleaser/goreleaser-action@v4
+        uses: goreleaser/goreleaser-action@v6
         with: 
           args: "release --rm-dist"
           version: latest

.github/workflows/release-test.yml

@@ -12,17 +12,17 @@ jobs:
     runs-on: ubuntu-latest-16-cores
     steps:
       - name: "Check out code"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with: 
           fetch-depth: 0
 
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: 1.21.x
 
       - name: release test
-        uses: goreleaser/goreleaser-action@v4
+        uses: goreleaser/goreleaser-action@v6
         with:
           args: "release --clean --snapshot"
           version: latest

internal/runner/runner.go

@@ -138,5 +138,5 @@ func (r *Runner) Close() {
 func printDslCompileError(err error) {
 	gologger.Error().Msgf("error compiling DSL: %s", err)
 	gologger.Info().Msgf("The available custom DSL functions are:")
-	gologger.Info().Label("").Msgf(dsl.GetPrintableDslFunctionSignatures(false))
+	gologger.Info().Label("").Msg(dsl.GetPrintableDslFunctionSignatures(false))
 }

pkg/logger/logger.go

@@ -101,8 +101,15 @@ func NewLogger(options *OptionsLogger) *Logger {
 
 // LogRequest and user data
 func (l *Logger) LogRequest(req *http.Request, userdata types.UserData) error {
-	// No-op for now , since proxify isn't intended to fail instead return 502
-	// and request can be accessed via response.Request
+	if req == nil {
+		return nil
+	}
+
+	// send to writer channel
+	l.asyncqueue <- types.HTTPTransaction{
+		Userdata: userdata,
+		Request:  req,
+	}
 	return nil
 }
 
@@ -168,10 +175,12 @@ func (l *Logger) AsyncWrite() {
 					URL:       httpData.Request.URL.String(),
 				}
 				defer func() {
-					// write to structured writer with whatever data we have
-					err := l.sWriter.Write(sData)
-					if err != nil {
-						gologger.Warning().Msgf("Error while logging: %s", err)
+					if sData.Response != nil {
+						// write to structured writer with whatever data we have
+						err := l.sWriter.Write(sData)
+						if err != nil {
+							gologger.Warning().Msgf("Error while logging: %s", err)
+						}
 					}
 				}()
 				sRequest, err := types.NewHttpRequestData(httpData.Request)

pkg/types/userdata.go

@@ -76,7 +76,7 @@ func NewHttpRequestData(req *http.Request) (*HTTPRequest, error) {
 	httpRequest.Body = string(reqBody)
 
 	// Extract raw request
-	reqdumpNoBody, err := httputil.DumpRequest(req, false)
+	reqdumpNoBody, err := httputil.DumpRequest(req, true)
 	if err != nil {
 		return nil, err
 	}

proxy.go

@@ -199,6 +199,9 @@ func NewProxy(options *Options) (*Proxy, error) {
 
 // ModifyRequest
 func (p *Proxy) ModifyRequest(req *http.Request) error {
+	// // Set Content-Length to zero to allow automatic calculation
+	req.ContentLength = -1
+
 	ctx := martian.NewContext(req)
 	// disable upgrading http connections to https by default
 	ctx.Session().MarkInsecure()