github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

fix auth reader buffer overrun

pull/330/merge
Darien Raymond 2017-01-27 13:42:31 +01:00
parent 32abea1397
commit 0cf5087852
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/crypto/auth.go
View File

@ -15,6 +15,7 @@ var (
errInsufficientBuffer = errors.New("Insufficient buffer.") errInsufficientBuffer = errors.New("Insufficient buffer.")
errInvalidNonce = errors.New("Invalid nonce.") errInvalidNonce = errors.New("Invalid nonce.")
errInvalidLength = errors.New("Invalid buffer size.")
) )
type BytesGenerator interface { type BytesGenerator interface {
@ -79,10 +80,14 @@ type AuthenticationReader struct {
aggressive bool aggressive bool
} }
const (
readerBufferSize = 32 * 1024
)
func NewAuthenticationReader(auth Authenticator, reader io.Reader, aggressive bool) *AuthenticationReader { func NewAuthenticationReader(auth Authenticator, reader io.Reader, aggressive bool) *AuthenticationReader {
return &AuthenticationReader{ return &AuthenticationReader{
auth: auth, auth: auth,
buffer: buf.NewLocal(32 * 1024), buffer: buf.NewLocal(readerBufferSize),
reader: reader, reader: reader,
aggressive: aggressive, aggressive: aggressive,
} }
@ -96,6 +101,9 @@ func (v *AuthenticationReader) NextChunk() error {
if size > v.buffer.Len()-2 { if size > v.buffer.Len()-2 {
return errInsufficientBuffer return errInsufficientBuffer
} }
if size > readerBufferSize-2 {
return errInvalidLength
}
if size == v.auth.Overhead() { if size == v.auth.Overhead() {
return io.EOF return io.EOF
} }