mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-05 05:07:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

use the CRYPTO_BUFFER_EXCEEDED error for crypto stream overflows

Browse source
This commit is contained in:
Marten Seemann 2019-11-23 11:48:11 +07:00
parent 92b898e811
commit 50e7d69865
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crypto_stream.go
View file

@ -6,6 +6,7 @@ import (
"io" "io"
"github.com/lucas-clemente/quic-go/internal/protocol" "github.com/lucas-clemente/quic-go/internal/protocol"
"github.com/lucas-clemente/quic-go/internal/qerr"
"github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/internal/utils"
"github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/internal/wire"
) )
@ -68,7 +69,7 @@ func newCryptoStream() cryptoStream {
func (s *cryptoStreamImpl) HandleCryptoFrame(f *wire.CryptoFrame) error { func (s *cryptoStreamImpl) HandleCryptoFrame(f *wire.CryptoFrame) error {
highestOffset := f.Offset + protocol.ByteCount(len(f.Data)) highestOffset := f.Offset + protocol.ByteCount(len(f.Data))
if maxOffset := highestOffset; maxOffset > protocol.MaxCryptoStreamOffset { if maxOffset := highestOffset; maxOffset > protocol.MaxCryptoStreamOffset {
return fmt.Errorf("received invalid offset %d on crypto stream, maximum allowed %d", maxOffset, protocol.MaxCryptoStreamOffset) return qerr.Error(qerr.CryptoBufferExceeded, fmt.Sprintf("received invalid offset %d on crypto stream, maximum allowed %d", maxOffset, protocol.MaxCryptoStreamOffset))
} }
if s.finished { if s.finished {
if highestOffset > s.highestOffset { if highestOffset > s.highestOffset {

2
crypto_stream_test.go
View file

@ -55,7 +55,7 @@ var _ = Describe("Crypto Stream", func() {
Offset: protocol.MaxCryptoStreamOffset - 5, Offset: protocol.MaxCryptoStreamOffset - 5,
Data: []byte("foobar"), Data: []byte("foobar"),
}) })
Expect(err).To(MatchError(fmt.Sprintf("received invalid offset %d on crypto stream, maximum allowed %d", protocol.MaxCryptoStreamOffset+1, protocol.MaxCryptoStreamOffset))) Expect(err).To(MatchError(fmt.Sprintf("CRYPTO_BUFFER_EXCEEDED: received invalid offset %d on crypto stream, maximum allowed %d", protocol.MaxCryptoStreamOffset+1, protocol.MaxCryptoStreamOffset)))
}) })
It("handles messages split over multiple CRYPTO frames", func() { It("handles messages split over multiple CRYPTO frames", func() {

3
internal/qerr/error_codes.go
View file

@ -23,6 +23,7 @@ const (
VersionNegotiationError ErrorCode = 0x9 VersionNegotiationError ErrorCode = 0x9
ProtocolViolation ErrorCode = 0xa ProtocolViolation ErrorCode = 0xa
InvalidMigration ErrorCode = 0xc InvalidMigration ErrorCode = 0xc
CryptoBufferExceeded ErrorCode = 0xd
) )
func (e ErrorCode) isCryptoError() bool { func (e ErrorCode) isCryptoError() bool {
@ -71,6 +72,8 @@ func (e ErrorCode) String() string {
return "PROTOCOL_VIOLATION" return "PROTOCOL_VIOLATION"
case InvalidMigration: case InvalidMigration:
return "INVALID_MIGRATION" return "INVALID_MIGRATION"
case CryptoBufferExceeded:
return "CRYPTO_BUFFER_EXCEEDED"
default: default:
if e.isCryptoError() { if e.isCryptoError() {
return "CRYPTO_ERROR" return "CRYPTO_ERROR"