mirror of
https://github.com/labstack/echo.git
synced 2025-01-24 03:16:14 +02:00
6ef5f77bf2
WIP: make default logger implemented custom writer for jsonlike logs WIP: improve examples WIP: defaultErrorHandler use errors.As to unwrap errors. Update readme WIP: default logger logs json, restore e.Start method WIP: clean router.Match a bit WIP: func types/fields have echo.Context has first element WIP: remove yaml tags as functions etc can not be serialized anyway WIP: change BindPathParams,BindQueryParams,BindHeaders from methods to functions and reverse arguments to be like DefaultBinder.Bind is WIP: improved comments, logger now extracts status from error WIP: go mod tidy WIP: rebase with 4.5.0 WIP: * removed todos. * removed StartAutoTLS and StartH2CServer methods from `StartConfig` * KeyAuth middleware errorhandler can swallow the error and resume next middleware WIP: add RouterConfig.UseEscapedPathForMatching to use escaped path for matching request against routes WIP: FIXMEs WIP: upgrade golang-jwt/jwt to `v4` WIP: refactor http methods to return RouteInfo WIP: refactor static not creating multiple routes WIP: refactor route and middleware adding functions not to return error directly WIP: Use 401 for problematic/missing headers for key auth and JWT middleware (#1552, #1402). > In summary, a 401 Unauthorized response should be used for missing or bad authentication WIP: replace `HTTPError.SetInternal` with `HTTPError.WithInternal` so we could not mutate global error variables WIP: add RouteInfo and RouteMatchType into Context what we could know from in middleware what route was matched and/or type of that match (200/404/405) WIP: make notFoundHandler and methodNotAllowedHandler private. encourage that all errors be handled in Echo.HTTPErrorHandler WIP: server cleanup ideas WIP: routable.ForGroup WIP: note about logger middleware WIP: bind should not default values on second try. use crypto rand for better randomness WIP: router add route as interface and returns info as interface WIP: improve flaky test (remains still flaky) WIP: add notes about bind default values WIP: every route can have their own path params names WIP: routerCreator and different tests WIP: different things WIP: remove route implementation WIP: support custom method types WIP: extractor tests WIP: v5.0.x proposal over v4.4.0
166 lines
4.3 KiB
Go
166 lines
4.3 KiB
Go
package middleware
|
|
|
|
import (
|
|
"bytes"
|
|
"io/ioutil"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
"github.com/labstack/echo/v4"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestBodyLimitConfig_ToMiddleware(t *testing.T) {
|
|
e := echo.New()
|
|
hw := []byte("Hello, World!")
|
|
req := httptest.NewRequest(http.MethodPost, "/", bytes.NewReader(hw))
|
|
rec := httptest.NewRecorder()
|
|
c := e.NewContext(req, rec)
|
|
h := func(c echo.Context) error {
|
|
body, err := ioutil.ReadAll(c.Request().Body)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return c.String(http.StatusOK, string(body))
|
|
}
|
|
|
|
// Based on content length (within limit)
|
|
mw, err := BodyLimitConfig{LimitBytes: 2 * MB}.ToMiddleware()
|
|
assert.NoError(t, err)
|
|
|
|
err = mw(h)(c)
|
|
if assert.NoError(t, err) {
|
|
assert.Equal(t, http.StatusOK, rec.Code)
|
|
assert.Equal(t, hw, rec.Body.Bytes())
|
|
}
|
|
|
|
// Based on content read (overlimit)
|
|
mw, err = BodyLimitConfig{LimitBytes: 2}.ToMiddleware()
|
|
assert.NoError(t, err)
|
|
he := mw(h)(c).(*echo.HTTPError)
|
|
assert.Equal(t, http.StatusRequestEntityTooLarge, he.Code)
|
|
|
|
// Based on content read (within limit)
|
|
req = httptest.NewRequest(http.MethodPost, "/", bytes.NewReader(hw))
|
|
rec = httptest.NewRecorder()
|
|
c = e.NewContext(req, rec)
|
|
|
|
mw, err = BodyLimitConfig{LimitBytes: 2 * MB}.ToMiddleware()
|
|
assert.NoError(t, err)
|
|
err = mw(h)(c)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, http.StatusOK, rec.Code)
|
|
assert.Equal(t, "Hello, World!", rec.Body.String())
|
|
|
|
// Based on content read (overlimit)
|
|
req = httptest.NewRequest(http.MethodPost, "/", bytes.NewReader(hw))
|
|
rec = httptest.NewRecorder()
|
|
c = e.NewContext(req, rec)
|
|
mw, err = BodyLimitConfig{LimitBytes: 2}.ToMiddleware()
|
|
assert.NoError(t, err)
|
|
he = mw(h)(c).(*echo.HTTPError)
|
|
assert.Equal(t, http.StatusRequestEntityTooLarge, he.Code)
|
|
}
|
|
|
|
func TestBodyLimitReader(t *testing.T) {
|
|
hw := []byte("Hello, World!")
|
|
e := echo.New()
|
|
req := httptest.NewRequest(http.MethodPost, "/", bytes.NewReader(hw))
|
|
rec := httptest.NewRecorder()
|
|
|
|
config := BodyLimitConfig{
|
|
Skipper: DefaultSkipper,
|
|
LimitBytes: 2,
|
|
}
|
|
reader := &limitedReader{
|
|
BodyLimitConfig: config,
|
|
reader: ioutil.NopCloser(bytes.NewReader(hw)),
|
|
context: e.NewContext(req, rec),
|
|
}
|
|
|
|
// read all should return ErrStatusRequestEntityTooLarge
|
|
_, err := ioutil.ReadAll(reader)
|
|
he := err.(*echo.HTTPError)
|
|
assert.Equal(t, http.StatusRequestEntityTooLarge, he.Code)
|
|
|
|
// reset reader and read two bytes must succeed
|
|
bt := make([]byte, 2)
|
|
reader.Reset(e.NewContext(req, rec), ioutil.NopCloser(bytes.NewReader(hw)))
|
|
n, err := reader.Read(bt)
|
|
assert.Equal(t, 2, n)
|
|
assert.Equal(t, nil, err)
|
|
}
|
|
|
|
func TestBodyLimit_skipper(t *testing.T) {
|
|
e := echo.New()
|
|
h := func(c echo.Context) error {
|
|
body, err := ioutil.ReadAll(c.Request().Body)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return c.String(http.StatusOK, string(body))
|
|
}
|
|
mw, err := BodyLimitConfig{
|
|
Skipper: func(c echo.Context) bool {
|
|
return true
|
|
},
|
|
LimitBytes: 2,
|
|
}.ToMiddleware()
|
|
assert.NoError(t, err)
|
|
|
|
hw := []byte("Hello, World!")
|
|
req := httptest.NewRequest(http.MethodPost, "/", bytes.NewReader(hw))
|
|
rec := httptest.NewRecorder()
|
|
c := e.NewContext(req, rec)
|
|
|
|
err = mw(h)(c)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, http.StatusOK, rec.Code)
|
|
assert.Equal(t, hw, rec.Body.Bytes())
|
|
}
|
|
|
|
func TestBodyLimitWithConfig(t *testing.T) {
|
|
e := echo.New()
|
|
hw := []byte("Hello, World!")
|
|
req := httptest.NewRequest(http.MethodPost, "/", bytes.NewReader(hw))
|
|
rec := httptest.NewRecorder()
|
|
c := e.NewContext(req, rec)
|
|
h := func(c echo.Context) error {
|
|
body, err := ioutil.ReadAll(c.Request().Body)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return c.String(http.StatusOK, string(body))
|
|
}
|
|
|
|
mw := BodyLimitWithConfig(BodyLimitConfig{LimitBytes: 2 * MB})
|
|
|
|
err := mw(h)(c)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, http.StatusOK, rec.Code)
|
|
assert.Equal(t, hw, rec.Body.Bytes())
|
|
}
|
|
|
|
func TestBodyLimit(t *testing.T) {
|
|
e := echo.New()
|
|
hw := []byte("Hello, World!")
|
|
req := httptest.NewRequest(http.MethodPost, "/", bytes.NewReader(hw))
|
|
rec := httptest.NewRecorder()
|
|
c := e.NewContext(req, rec)
|
|
h := func(c echo.Context) error {
|
|
body, err := ioutil.ReadAll(c.Request().Body)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return c.String(http.StatusOK, string(body))
|
|
}
|
|
|
|
mw := BodyLimit(2 * MB)
|
|
|
|
err := mw(h)(c)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, http.StatusOK, rec.Code)
|
|
assert.Equal(t, hw, rec.Body.Bytes())
|
|
}
|