Merge pull request #285 from Thiht/improvements

fix: add mutex to avoid race conditions on time count + support body matcher for url encoded forms

Author: gwleclerc

server/handlers/mocks.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"math/rand"
 	"net/http"
+	"sync"
 	"time"
 
 	"github.com/Thiht/smocker/server/services"
@@ -16,15 +17,20 @@ import (
 
 type Mocks struct {
 	mocksServices services.Mocks
+	mu            sync.Mutex
 }
 
 func NewMocks(ms services.Mocks) *Mocks {
 	return &Mocks{
 		mocksServices: ms,
+		mu:            sync.Mutex{},
 	}
 }
 
 func (m *Mocks) GenericHandler(c echo.Context) error {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+
 	actualRequest := types.HTTPRequestToRequest(c.Request())
 	b, _ := yaml.Marshal(actualRequest)
 	log.Debugf("Received request:\n---\n%s\n", string(b))

server/types/history.go

@@ -3,7 +3,7 @@ package types
 import (
 	"bytes"
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"net/url"
@@ -55,12 +55,12 @@ func HTTPRequestToRequest(req *http.Request) Request {
 	bodyBytes := []byte{}
 	if req.Body != nil {
 		var err error
-		bodyBytes, err = ioutil.ReadAll(req.Body)
+		bodyBytes, err = io.ReadAll(req.Body)
 		if err != nil {
 			log.WithError(err).Error("Failed to read request body")
 		}
 	}
-	req.Body = ioutil.NopCloser(bytes.NewBuffer(bodyBytes))
+	req.Body = io.NopCloser(bytes.NewBuffer(bodyBytes))
 	var body interface{}
 	var tmp map[string]interface{}
 	if err := json.Unmarshal(bodyBytes, &tmp); err != nil {

server/types/matchers.go

@@ -3,6 +3,8 @@ package types
 import (
 	"encoding/json"
 	"fmt"
+	"net/http"
+	"net/url"
 	"regexp"
 
 	log "github.com/sirupsen/logrus"
@@ -252,11 +254,22 @@ type BodyMatcher struct {
 	bodyJson   map[string]StringMatcher
 }
 
-func (bm BodyMatcher) Match(value string) bool {
+func (bm BodyMatcher) Match(headers http.Header, value string) bool {
 	if bm.bodyString != nil {
 		return bm.bodyString.Match(value)
 	}
 
+	if headers.Get("Content-Type") == "application/x-www-form-urlencoded" {
+		m, err := url.ParseQuery(value)
+		if err != nil {
+			log.WithError(err).Error("Failed to read request body as encoded form")
+		} else if b, err := json.Marshal(m); err != nil {
+			log.WithError(err).Error("Failed to serialize form body as JSON")
+		} else {
+			value = string(b)
+		}
+	}
+
 	j, err := objx.FromJSON(value)
 	if err != nil {
 		return false

server/types/mock.go

@@ -126,7 +126,7 @@ func (mr MockRequest) Match(req Request) bool {
 		log.Trace("Query params did not match")
 		return false
 	}
-	matchBody := mr.Body == nil || mr.Body.Match(req.BodyString)
+	matchBody := mr.Body == nil || mr.Body.Match(req.Headers, req.BodyString)
 	if !matchBody {
 		log.Trace("Body did not match")
 		return false

tests/data/matcher_mock_list.yml

@@ -86,3 +86,12 @@
   response:
     body: >
       {"message": "test11"}
+- request:
+    path: /test12
+    headers:
+      Content-Type: application/x-www-form-urlencoded
+    body:
+      key1[0]: test
+  response:
+    body: >
+      {"message": "test13"}

tests/features/set_mocks.yml

@@ -105,19 +105,20 @@ testcases:
         url: http://localhost:8081/mocks
         assertions:
           - result.statuscode ShouldEqual 200
-          - result.bodyjson.__len__ ShouldEqual 8
-          - result.bodyjson.bodyjson7.request.path.matcher ShouldEqual "ShouldMatch"
-          - result.bodyjson.bodyjson7.request.path.value ShouldEqual "/.*"
-          - result.bodyjson.bodyjson6.request.method.matcher ShouldEqual "ShouldContainSubstring"
-          - result.bodyjson.bodyjson6.request.method.value ShouldEqual "PO"
-          - result.bodyjson.bodyjson5.request.body.matcher ShouldEqual "ShouldEqualJSON"
-          - result.bodyjson.bodyjson5.request.body.value ShouldContainSubstring id
-          - result.bodyjson.bodyjson4.request.headers.content-type.content-type0.matcher ShouldEqual "ShouldMatch"
-          - result.bodyjson.bodyjson4.request.headers.content-type.content-type0.value ShouldEqual application/.*
-          - result.bodyjson.bodyjson3.request.query_params.test.test0.value ShouldEqual true
-          - result.bodyjson.bodyjson2.request.body.matcher ShouldEqual "ShouldNotBeEmpty"
-          - result.bodyjson.bodyjson1.request.query_params.test.test0.value ShouldEqual true
-          - result.bodyjson.bodyjson0.request.body.key1.value ShouldEqual test
+          - result.bodyjson.__len__ ShouldEqual 9
+          - result.bodyjson.bodyjson8.request.path.matcher ShouldEqual "ShouldMatch"
+          - result.bodyjson.bodyjson8.request.path.value ShouldEqual "/.*"
+          - result.bodyjson.bodyjson7.request.method.matcher ShouldEqual "ShouldContainSubstring"
+          - result.bodyjson.bodyjson7.request.method.value ShouldEqual "PO"
+          - result.bodyjson.bodyjson6.request.body.matcher ShouldEqual "ShouldEqualJSON"
+          - result.bodyjson.bodyjson6.request.body.value ShouldContainSubstring id
+          - result.bodyjson.bodyjson5.request.headers.content-type.content-type0.matcher ShouldEqual "ShouldMatch"
+          - result.bodyjson.bodyjson5.request.headers.content-type.content-type0.value ShouldEqual application/.*
+          - result.bodyjson.bodyjson4.request.query_params.test.test0.value ShouldEqual true
+          - result.bodyjson.bodyjson3.request.body.matcher ShouldEqual "ShouldNotBeEmpty"
+          - result.bodyjson.bodyjson2.request.query_params.test.test0.value ShouldEqual true
+          - result.bodyjson.bodyjson1.request.body.key1.value ShouldEqual test
+          - result.bodyjson.bodyjson0.request.body.key1[0].value ShouldEqual test
 
   - name: Add dynamic mocks
     steps:

tests/features/use_mocks.yml

@@ -166,6 +166,25 @@ testcases:
         assertions:
           - result.statuscode ShouldEqual 666
 
+      - type: http
+        method: POST
+        url: http://localhost:8080/test12
+        headers:
+          Content-Type: application/x-www-form-urlencoded
+        body: key1=test
+        assertions:
+          - result.statuscode ShouldEqual 200
+          - result.bodyjson.message ShouldEqual test13
+
+      - type: http
+        method: POST
+        url: http://localhost:8080/test12
+        headers:
+          Content-Type: application/x-www-form-urlencoded
+        body: key1=test2
+        assertions:
+          - result.statuscode ShouldEqual 666
+
   - name: Use dynamic mock list
     steps:
       - type: http