Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mtglib/internal/doppel/conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@ func (c Conn) start() {
for c.p.writeStream.Len() == 0 && !c.p.done {
c.p.writtenCond.Wait()
}
n, _ := c.p.writeStream.Read(buf[:size])
n, _ := c.p.writeStream.Read(buf[tls.SizeHeader : tls.SizeHeader+size])
c.p.writtenCond.L.Unlock()

if n == 0 {
continue
}

if err := tls.WriteRecord(c.Conn, buf[:n]); err != nil {
if err := tls.WriteRecordInPlace(c.Conn, buf[:], n); err != nil {
c.p.ctxCancel(err)
return
}
Expand Down
3 changes: 2 additions & 1 deletion mtglib/internal/doppel/ganger.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ func (g *Ganger) run() {
g.durations = append(g.durations, durations...)

if len(g.durations) > DoppelGangerMaxDurations {
g.durations = g.durations[len(g.durations)-DoppelGangerMaxDurations:]
copy(g.durations, g.durations[len(g.durations)-DoppelGangerMaxDurations:])
g.durations = g.durations[:DoppelGangerMaxDurations]
}

if len(g.durations) < MinDurationsToCalculate {
Expand Down
2 changes: 0 additions & 2 deletions mtglib/internal/tls/conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ type Conn struct {

type connPayload struct {
readBuf bytes.Buffer
writeBuf bytes.Buffer
connBuffered *bufio.Reader
read bool
write bool
Expand Down Expand Up @@ -80,7 +79,6 @@ func New(conn essentials.Conn, read, write bool) Conn {
}

newConn.p.readBuf.Grow(DefaultBufferSize)
newConn.p.writeBuf.Grow(DefaultBufferSize)

return newConn
}
24 changes: 14 additions & 10 deletions mtglib/internal/tls/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,24 @@ func ReadRecord(r io.Reader, w io.Writer) (byte, int64, error) {

func WriteRecord(w io.Writer, payload []byte) error {
buf := [MaxRecordSize]byte{}
buf[0] = TypeApplicationData

bufV := buf[SizeRecordType:]
copy(bufV[:SizeVersion], TLSVersion[:])
copy(buf[SizeHeader:], payload)

bufS := bufV[SizeVersion:]
binary.BigEndian.PutUint16(bufS[:SizeSize], uint16(len(payload)))
return WriteRecordInPlace(w, buf[:], len(payload))
}

bufP := buf[SizeHeader:]
if n := copy(bufP, payload); n != len(payload) {
return fmt.Errorf("copied %d bytes of payload instead of %d", n, len(payload))
func WriteRecordInPlace(w io.Writer, buf []byte, payloadLen int) error {
if payloadLen > MaxRecordPayloadSize {
return fmt.Errorf("payload %d exceeds max %d", payloadLen, MaxRecordPayloadSize)
}

_, err := w.Write(buf[:SizeHeader+len(payload)])
buf[0] = TypeApplicationData
copy(buf[SizeRecordType:SizeRecordType+SizeVersion], TLSVersion[:])
binary.BigEndian.PutUint16(
buf[SizeRecordType+SizeVersion:SizeRecordType+SizeVersion+SizeSize],
uint16(payloadLen),
)

_, err := w.Write(buf[:SizeHeader+payloadLen])

return err
}
78 changes: 78 additions & 0 deletions mtglib/internal/tls/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,84 @@ func (suite *UtilsTestSuite) TestWriteRecordPayloadTooLarge() {
suite.Error(err)
}

func (suite *UtilsTestSuite) TestWriteRecordInPlace() {
payload := []byte("hello in-place")

var buf [MaxRecordSize]byte
copy(buf[SizeHeader:], payload)

err := WriteRecordInPlace(suite.dst, buf[:], len(payload))
suite.NoError(err)

written := suite.dst.Bytes()
suite.Equal(byte(TypeApplicationData), written[0])
suite.Equal(TLSVersion[:], written[SizeRecordType:SizeRecordType+SizeVersion])

length := binary.BigEndian.Uint16(written[SizeRecordType+SizeVersion:])
suite.Equal(uint16(len(payload)), length)
suite.Equal(payload, written[SizeHeader:])
}

func (suite *UtilsTestSuite) TestWriteRecordInPlaceRoundTrip() {
payload := []byte("round trip in-place")

var buf [MaxRecordSize]byte
copy(buf[SizeHeader:], payload)

var wire bytes.Buffer

err := WriteRecordInPlace(&wire, buf[:], len(payload))
suite.NoError(err)

var recovered bytes.Buffer

recordType, length, err := ReadRecord(&wire, &recovered)
suite.NoError(err)
suite.Equal(byte(TypeApplicationData), recordType)
suite.Equal(int64(len(payload)), length)
suite.Equal(payload, recovered.Bytes())
}

func (suite *UtilsTestSuite) TestWriteRecordInPlacePayloadTooLarge() {
var buf [MaxRecordSize]byte

err := WriteRecordInPlace(suite.dst, buf[:], MaxRecordPayloadSize+1)
suite.Error(err)
}

func (suite *UtilsTestSuite) TestWriteRecordInPlacePropagatesError() {
m := &WriterMock{}
m.
On("Write", mock.AnythingOfType("[]uint8")).
Once().
Return(0, errors.New("disk full"))

var buf [MaxRecordSize]byte
copy(buf[SizeHeader:], []byte("data"))

err := WriteRecordInPlace(m, buf[:], 4)
suite.Error(err)

m.AssertExpectations(suite.T())
}

func (suite *UtilsTestSuite) TestWriteRecordInPlaceMatchesWriteRecord() {
payload := []byte("equivalence check")

var legacy bytes.Buffer
err := WriteRecord(&legacy, payload)
suite.NoError(err)

var buf [MaxRecordSize]byte
copy(buf[SizeHeader:], payload)

var inPlace bytes.Buffer
err = WriteRecordInPlace(&inPlace, buf[:], len(payload))
suite.NoError(err)

suite.Equal(legacy.Bytes(), inPlace.Bytes())
}

func TestUtils(t *testing.T) {
t.Parallel()
suite.Run(t, &UtilsTestSuite{})
Expand Down
Loading