c129361e55
Merge in DNS/adguard-home from 2305-limit-message-size to master Closes #2305. Squashed commit of the following: commit 6edd1e0521277a680f0053308efcf3d9cacc8e62 Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Nov 23 14:03:36 2020 +0300 aghio: fix final inaccuracies commit 4dd382aaf25132b31eb269749a2cd36daf0cb792 Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Nov 23 13:59:10 2020 +0300 all: improve code quality commit 060f923f6023d0e6f26441559b7023d5e5f96843 Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Nov 23 13:10:57 2020 +0300 aghio: add validation to constructor commit f57a2f596f5dc578548241c315c68dce7fc93905 Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Nov 20 19:19:26 2020 +0300 all: fix minor inaccuracies commit 93462c71725d3d00655a4bd565b77e64451fff60 Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Nov 20 19:13:23 2020 +0300 home: make test name follow convention commit 4922986ad84481b054479c43b4133a1b97bee86b Merge: 1f5472abc046ec13fd
Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Nov 20 19:09:01 2020 +0300 Merge branch 'master' into 2305-limit-message-size commit 1f5472abcfa7427f389825fc59eb4253e1e2bfb7 Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Nov 20 19:08:21 2020 +0300 aghio: improve readability commit 60dc706b093fa22bbf62f13b2341934364ddc4df Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Nov 20 18:44:08 2020 +0300 home: cover middleware with test commit bedf436b947ca1fa4493af2fc94f1f40beec7c35 Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Nov 20 17:10:23 2020 +0300 aghio: improved error informativeness commit 682c5da9f21fa330fb3536bb1c112129c91b9990 Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Nov 20 13:37:51 2020 +0300 all: limit readers for ReadAll dealing with miscellanious data. commit 78c6dd8d90a0a43fe6ee3f9ed4d5fc637b15ba74 Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Nov 19 20:07:43 2020 +0300 all: handle ReadAll calls dealing with request's bodies. commit bfe1a6faf6468eb44515e2b0ecffa8c51f90b7e8 Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Nov 19 17:25:34 2020 +0300 home: add middlewares commit bbd1d491b318e6ba07f8af23ad546183383783a8 Merge: 7b77c2cad62a8fe0b7
Author: Eugene Burkov <e.burkov@adguard.com> Date: Thu Nov 19 16:44:04 2020 +0300 Merge branch 'master' into 2305-limit-message-size commit 7b77c2cad03154177392460982e1d73ee2a30177 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Nov 17 15:33:33 2020 +0300 aghio: create package
109 lines
1.8 KiB
Go
109 lines
1.8 KiB
Go
package aghio
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"io/ioutil"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestLimitReadCloser(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
n int64
|
|
want error
|
|
}{{
|
|
name: "positive",
|
|
n: 1,
|
|
want: nil,
|
|
}, {
|
|
name: "zero",
|
|
n: 0,
|
|
want: nil,
|
|
}, {
|
|
name: "negative",
|
|
n: -1,
|
|
want: fmt.Errorf("aghio: invalid n in LimitReadCloser: -1"),
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
_, err := LimitReadCloser(nil, tc.n)
|
|
assert.Equal(t, tc.want, err)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestLimitedReadCloser_Read(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
limit int64
|
|
rStr string
|
|
want int
|
|
err error
|
|
}{{
|
|
name: "perfectly_match",
|
|
limit: 3,
|
|
rStr: "abc",
|
|
want: 3,
|
|
err: nil,
|
|
}, {
|
|
name: "eof",
|
|
limit: 3,
|
|
rStr: "",
|
|
want: 0,
|
|
err: io.EOF,
|
|
}, {
|
|
name: "limit_reached",
|
|
limit: 0,
|
|
rStr: "abc",
|
|
want: 0,
|
|
err: &LimitReachedError{
|
|
Limit: 0,
|
|
},
|
|
}, {
|
|
name: "truncated",
|
|
limit: 2,
|
|
rStr: "abc",
|
|
want: 2,
|
|
err: nil,
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
readCloser := ioutil.NopCloser(strings.NewReader(tc.rStr))
|
|
buf := make([]byte, tc.limit+1)
|
|
|
|
lreader, err := LimitReadCloser(readCloser, tc.limit)
|
|
assert.Nil(t, err)
|
|
|
|
n, err := lreader.Read(buf)
|
|
assert.Equal(t, n, tc.want)
|
|
assert.Equal(t, tc.err, err)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestLimitedReadCloser_LimitReachedError(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
want string
|
|
err error
|
|
}{{
|
|
name: "simplest",
|
|
want: "attempted to read more than 0 bytes",
|
|
err: &LimitReachedError{
|
|
Limit: 0,
|
|
},
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
assert.Equal(t, tc.want, tc.err.Error())
|
|
})
|
|
}
|
|
}
|