ScuroNeko/mtg
1
0
Fork 0
mirror of https://github.com/ScuroNeko/mtg.git synced 2026-09-02 00:11:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix framerwc

Browse Source
This commit is contained in:
9seconds
2018-07-03 14:08:01 +03:00
parent daddf50390
commit 4c4671ad3b
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mtproto/wrappers/frame.go
+18 -9
View File
@@ -6,6 +6,7 @@ import (
"encoding/binary" "encoding/binary"
"hash/crc32" "hash/crc32"
"io" "io"
"io/ioutil"
"net" "net"
"github.com/juju/errors" "github.com/juju/errors"
@@ -56,9 +57,13 @@ func (f *FrameRWC) Write(buf []byte) (int, error) {
func (f *FrameRWC) Read(p []byte) (int, error) { func (f *FrameRWC) Read(p []byte) (int, error) {
return f.BufferedRead(p, func() error { return f.BufferedRead(p, func() error {
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
sum := crc32.NewIEEE()
writer := io.MultiWriter(buf, sum)
for { for {
buf.Reset() buf.Reset()
if _, err := io.CopyN(buf, f.conn, 4); err != nil { sum.Reset()
if _, err := io.CopyN(writer, f.conn, 4); err != nil {
return errors.Annotate(err, "Cannot read frame padding") return errors.Annotate(err, "Cannot read frame padding")
} }
if !bytes.Equal(buf.Bytes(), frameRWCPadding[:]) { if !bytes.Equal(buf.Bytes(), frameRWCPadding[:]) {
@@ -70,25 +75,29 @@ func (f *FrameRWC) Read(p []byte) (int, error) {
if messageLength%4 != 0 || messageLength < frameRWCMinMessageLength || messageLength > frameRWCMaxMessageLength { if messageLength%4 != 0 || messageLength < frameRWCMinMessageLength || messageLength > frameRWCMaxMessageLength {
return errors.Errorf("Incorrect frame message length %d", messageLength) return errors.Errorf("Incorrect frame message length %d", messageLength)
} }
sum := crc32.NewIEEE()
sum.Write(buf.Bytes())
buf.Reset() buf.Reset()
buf.Grow(int(messageLength) - 4) // -4 because we already read the first number buf.Grow(int(messageLength) - 4 - 4)
if _, err := io.CopyN(buf, f.conn, int64(messageLength)-4); err != nil { if _, err := io.CopyN(writer, f.conn, int64(messageLength)-4-4); err != nil {
return errors.Annotate(err, "Cannot read the message frame") return errors.Annotate(err, "Cannot read the message frame")
} }
sum.Write(buf.Bytes())
var seqNo int32 var seqNo int32
binary.Read(buf, binary.LittleEndian, seqNo) binary.Read(buf, binary.LittleEndian, &seqNo)
if seqNo != f.readSeqNo { if seqNo != f.readSeqNo {
return errors.Errorf("Unexpected sequence number %d (wait for %d)", seqNo, f.readSeqNo) return errors.Errorf("Unexpected sequence number %d (wait for %d)", seqNo, f.readSeqNo)
} }
f.readSeqNo++ f.readSeqNo++
data := buf.Bytes()[:int(messageLength)-4-4-4] data, _ := ioutil.ReadAll(buf)
checksum := binary.LittleEndian.Uint32(buf.Bytes()[int(messageLength)-4-4-4:]) buf.Reset()
// write to buf, not to writer. This is because we are going to fetch
// crc32 checksum.
if _, err := io.CopyN(buf, f.conn, 4); err != nil {
return errors.Annotate(err, "Cannot read checksum")
}
checksum := binary.LittleEndian.Uint32(buf.Bytes())
if checksum != sum.Sum32() { if checksum != sum.Sum32() {
return errors.Errorf("CRC32 checksum mismatch. Wait for %d, got %d", sum.Sum32(), checksum) return errors.Errorf("CRC32 checksum mismatch. Wait for %d, got %d", sum.Sum32(), checksum)
telegram/middle.go
+8 -5
View File
@@ -2,7 +2,6 @@ package telegram
import ( import (
"io" "io"
"io/ioutil"
"net" "net"
"net/http" "net/http"
"sync" "sync"
@@ -84,11 +83,13 @@ func (t *middleTelegram) sendRPCNonceRequest(conn io.Writer) (*rpc.RPCNonceReque
} }
func (t *middleTelegram) receiveRPCNonceResponse(conn io.Reader, req *rpc.RPCNonceRequest) (*rpc.RPCNonceResponse, error) { func (t *middleTelegram) receiveRPCNonceResponse(conn io.Reader, req *rpc.RPCNonceRequest) (*rpc.RPCNonceResponse, error) {
ans, err := ioutil.ReadAll(conn) var ans [128]byte
n, err := conn.Read(ans[:])
if err != nil { if err != nil {
return nil, errors.Annotate(err, "Cannot read RPC nonce response") return nil, errors.Annotate(err, "Cannot read RPC nonce response")
} }
rpcNonceResp, err := rpc.NewRPCNonceResponse(ans) rpcNonceResp, err := rpc.NewRPCNonceResponse(ans[:n])
if err != nil { if err != nil {
return nil, errors.Annotate(err, "Cannot initialize RPC nonce response") return nil, errors.Annotate(err, "Cannot initialize RPC nonce response")
} }
@@ -109,11 +110,13 @@ func (t *middleTelegram) sendRPCHandshakeRequest(conn io.Writer) (*rpc.RPCHandsh
} }
func (t *middleTelegram) receiveRPCHandshakeResponse(conn io.Reader, req *rpc.RPCHandshakeRequest) (*rpc.RPCHandshakeResponse, error) { func (t *middleTelegram) receiveRPCHandshakeResponse(conn io.Reader, req *rpc.RPCHandshakeRequest) (*rpc.RPCHandshakeResponse, error) {
ans, err := ioutil.ReadAll(conn) var ans [128]byte
n, err := conn.Read(ans[:])
if err != nil { if err != nil {
return nil, errors.Annotate(err, "Cannot read RPC handshake response") return nil, errors.Annotate(err, "Cannot read RPC handshake response")
} }
rpcHandshakeResp, err := rpc.NewRPCHandshakeResponse(ans) rpcHandshakeResp, err := rpc.NewRPCHandshakeResponse(ans[:n])
if err != nil { if err != nil {
return nil, errors.Annotate(err, "Cannot initialize RPC handshake response") return nil, errors.Annotate(err, "Cannot initialize RPC handshake response")
} }