Support requests with gzip and deflate content encodings.

Author: mdevan

params.go

@@ -17,6 +17,8 @@
 package rapidrows
 
 import (
+	"compress/flate"
+	"compress/gzip"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -401,16 +403,38 @@ func (a *APIServer) getParams(req *http.Request, ep *Endpoint,
 	)
 	if req.Method == "GET" {
 		urlData = req.URL.Query()
-	} else if ct := getCT(req); ct == "application/json" {
-		if err := getJSON(req, &jsonData); err != nil {
-			logger.Warn().Err(err).Msg("failed to decode json object in request body")
-			jsonData = nil
+	} else {
+		var wrapped bool
+		if ce := req.Header.Get("Content-Encoding"); ce == "gzip" {
+			if r, err := gzip.NewReader(req.Body); err != nil {
+				logger.Error().Err(err).Msg("failed to initialize gzip reader")
+				return nil, fmt.Errorf("failed to initialize gzip reader: %v", err)
+			} else {
+				wrapped = true
+				req.Body = r
+			}
+		} else if ce == "deflate" {
+			wrapped = true
+			req.Body = flate.NewReader(req.Body)
 		}
-	} else if ct == "application/x-www-form-urlencoded" {
-		if err := req.ParseForm(); err != nil {
-			logger.Warn().Err(err).Msg("failed to parse form data in request body")
-		} else {
-			formData = req.PostForm
+		if ct := getCT(req); ct == "application/json" {
+			if err := getJSON(req, &jsonData); err != nil {
+				logger.Warn().Err(err).Msg("failed to decode json object in request body")
+				jsonData = nil
+			}
+		} else if ct == "application/x-www-form-urlencoded" {
+			if err := req.ParseForm(); err != nil {
+				logger.Warn().Err(err).Msg("failed to parse form data in request body")
+			} else {
+				formData = req.PostForm
+			}
+		}
+		if wrapped {
+			if rc, ok := req.Body.(io.Closer); ok {
+				if err := rc.Close(); err != nil {
+					logger.Warn().Err(err).Msg("failed to close gzip/deflate reader")
+				}
+			}
 		}
 	}
 

params_test.go

@@ -18,10 +18,13 @@ package rapidrows_test
 
 import (
 	"bytes"
+	"compress/flate"
+	"compress/gzip"
 	"encoding/json"
 	"io"
 	"net/http"
 	"net/url"
+	"strings"
 	"testing"
 	"time"
 
@@ -1091,3 +1094,89 @@ func TestParamsInvalidPost(t *testing.T) {
 	r.Equal(400, resp.StatusCode)
 	s.Stop(time.Second * 5)
 }
+
+const cfgTestParamsCompr = `{
+	"version": "1",
+	"listen": "127.0.0.1:60000",
+	"endpoints": [
+		{
+			"uri": "/",
+			"implType": "static-text",
+			"params": [
+				{
+					"name": "p",
+					"in": "body",
+					"type": "string",
+					"pattern": "a+",
+					"required": true
+				}
+			],
+			"script": "success"
+		}
+	]
+}`
+
+func TestParamsComprGzip(t *testing.T) {
+	r := require.New(t)
+
+	cfg := loadCfg(r, cfgTestParamsCompr)
+	s := startServer(r, cfg)
+	time.Sleep(500 * time.Millisecond)
+
+	sbody := "p=" + strings.Repeat("a", 1000)
+	zbody := &bytes.Buffer{}
+	zw := gzip.NewWriter(zbody)
+	_, err := io.Copy(zw, strings.NewReader(sbody))
+	r.Nil(err)
+	r.Nil(zw.Close())
+
+	req, err := http.NewRequest("POST", "http://127.0.0.1:60000/",
+		bytes.NewReader(zbody.Bytes()))
+	r.Nil(err)
+	r.NotNil(req)
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	req.Header.Set("Content-Encoding", "gzip")
+
+	resp, err := http.DefaultClient.Do(req)
+	r.Nil(err, "error was %v", err)
+	r.NotNil(resp)
+	data, err := io.ReadAll(resp.Body)
+	r.Nil(err)
+	resp.Body.Close()
+	r.Equal(200, resp.StatusCode)
+	r.Equal([]byte("success"), data)
+	s.Stop(time.Second * 5)
+}
+
+func TestParamsComprDeflate(t *testing.T) {
+	r := require.New(t)
+
+	cfg := loadCfg(r, cfgTestParamsCompr)
+	s := startServer(r, cfg)
+	time.Sleep(500 * time.Millisecond)
+
+	sbody := "p=" + strings.Repeat("a", 1000)
+	zbody := &bytes.Buffer{}
+	zw, err := flate.NewWriter(zbody, -1)
+	r.Nil(err)
+	_, err = io.Copy(zw, strings.NewReader(sbody))
+	r.Nil(err)
+	r.Nil(zw.Close())
+
+	req, err := http.NewRequest("POST", "http://127.0.0.1:60000/",
+		bytes.NewReader(zbody.Bytes()))
+	r.Nil(err)
+	r.NotNil(req)
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	req.Header.Set("Content-Encoding", "deflate")
+
+	resp, err := http.DefaultClient.Do(req)
+	r.Nil(err, "error was %v", err)
+	r.NotNil(resp)
+	data, err := io.ReadAll(resp.Body)
+	r.Nil(err)
+	resp.Body.Close()
+	r.Equal(200, resp.StatusCode)
+	r.Equal([]byte("success"), data)
+	s.Stop(time.Second * 5)
+}

validate_test.go

@@ -71,9 +71,9 @@ func TestValidateConfigWarn(t *testing.T) {
 		}
 		count := 0
 		for _, vr := range cfg.Validate() {
-			r.True(vr.Warn, vr.Msg)
-			r.Greater(len(vr.Msg), 0)
-			t.Logf("warning (expected): %s", vr.Msg)
+			r.True(vr.Warn, vr.Message)
+			r.Greater(len(vr.Message), 0)
+			t.Logf("warning (expected): %s", vr.Message)
 			count++
 		}
 		r.Greater(count, 0, "at least 1 warning was expected")