Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove TODO comment for closed issue #2573

Merged
merged 10 commits into from
May 10, 2023
Merged

Remove TODO comment for closed issue #2573

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9861d72
verify message checksum
adetunjii May 1, 2023
a538e85
Merge branch 'main' of https://github.com/adetunjii/FerretDB
adetunjii May 4, 2023
6731573
Merge branch 'main' of https://github.com/FerretDB/FerretDB
adetunjii May 6, 2023
9b978c3
fix: removed todo tag for closed issue
adetunjii May 6, 2023
6cc8692
fix: removed todo tags for closed issues
adetunjii May 6, 2023
898adb9
fix: removed todo tags for closed issues
adetunjii May 6, 2023
e93b955
fix: linting error
adetunjii May 8, 2023
3dd46a6
Merge branch 'main' of https://github.com/FerretDB/FerretDB
adetunjii May 9, 2023
d43517d
Merge branch 'main' into main
AlekSi May 9, 2023
05d82b9
Merge branch 'FerretDB:main' into main
adetunjii May 9, 2023
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
Prev Previous commit
Next Next commit
fix: removed todo tags for closed issues
  • Loading branch information
@adetunjii
adetunjii committed May 6, 2023
commit 6cc869272631ea8962ed4e044de517fe6f592162
55 changes: 0 additions & 55 deletions internal/wire/msg_body.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@ package wire
import (
"bufio"
"encoding"
"encoding/binary"
"errors"
"fmt"
"hash/crc32"
"io"

"github.com/FerretDB/FerretDB/internal/util/lazyerrors"
Expand Down Expand Up @@ -49,9 +47,6 @@ var ErrZeroRead = errors.New("zero bytes read")
//
// Error is (possibly wrapped) ErrZeroRead if zero bytes was read.
func ReadMessage(r *bufio.Reader) (*MsgHeader, MsgBody, error) {
if err := verifyChecksum(r); err != nil {
return nil, nil, lazyerrors.Error(err)
}

adetunjii marked this conversation as resolved.
Show resolved Hide resolved
var header MsgHeader
if err := header.readFrom(r); err != nil {
Expand Down Expand Up @@ -132,53 +127,3 @@ func WriteMessage(w *bufio.Writer, header *MsgHeader, msg MsgBody) error {

return nil
}

// verifyChecksum verifies the checksum of the message it is attached
func verifyChecksum(r *bufio.Reader) error {
// n = MsgHeaderLen + flagbits length
n := MsgHeaderLen + 4
msgHeader, err := r.Peek(n)
if err != nil {
if err == io.EOF {
return ErrZeroRead
}

return lazyerrors.Error(err)
}

msgLen := int(binary.LittleEndian.Uint32(msgHeader[0:4]))

if msgLen < MsgHeaderLen || msgLen > MaxMsgLen {
return lazyerrors.Errorf("invalid message length %d", msgLen)
}

b, err := r.Peek(msgLen)
if err != nil {
return lazyerrors.Error(err)
}

flagbits := OpMsgFlags(binary.LittleEndian.Uint32(msgHeader[MsgHeaderLen:n]))
if flagbits.FlagSet(OpMsgChecksumPresent) {
// remove checksum from the message
actualMsg, checksum := detachChecksum(b)

if checksum != calculateChecksum(actualMsg) {
return lazyerrors.New("OP_MSG checksum does not match contents")
}
}

return nil
}

func detachChecksum(data []byte) ([]byte, uint32) {
msgLen := len(data)
msg := data[:msgLen-kCrc32Size]
checksum := binary.LittleEndian.Uint32(data[msgLen-kCrc32Size:])

return msg, checksum
}

func calculateChecksum(msg []byte) uint32 {
table := crc32.MakeTable(crc32.Castagnoli)
return crc32.Checksum(msg, table)
}