Skip to content

Commit cdf33ef

Browse files
committed
address comments
Signed-off-by: xhe <[email protected]>
1 parent 903f698 commit cdf33ef

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

pkg/proxy/backend/authenticator.go

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"encoding/binary"
1010
"fmt"
1111
"net"
12+
"strings"
1213

1314
"github.com/go-mysql-org/go-mysql/mysql"
1415
"github.com/pingcap/tidb/util/hack"
@@ -212,11 +213,6 @@ loop:
212213
for {
213214
serverPkt, err := backendIO.ReadPacket()
214215
if err != nil {
215-
// tiproxy pp enabled, tidb pp disabled, tls disabled => invalid sequence
216-
// tiproxy pp disabled, tidb pp enabled, tls disabled => invalid sequence
217-
if pktIdx == 0 {
218-
return errors.Wrap(ErrBackendPPV2, err)
219-
}
220216
return err
221217
}
222218
var packetErr *mysql.MyError
@@ -235,6 +231,18 @@ loop:
235231
return err
236232
}
237233
if packetErr != nil {
234+
// tiproxy pp enabled, tidb pp disabled, tls disabled => invalid sequence
235+
// tiproxy pp disabled, tidb pp enabled, tls disabled => invalid sequence
236+
for _, p := range []string{
237+
"packets out of order",
238+
"(nvali): d sequence",
239+
"invalid sequence",
240+
"PROXY Protocol",
241+
} {
242+
if strings.Contains(packetErr.Message, p) {
243+
return errors.Wrap(ErrBackendPPV2, packetErr)
244+
}
245+
}
238246
return errors.Wrap(ErrClientAuthFail, packetErr)
239247
}
240248

0 commit comments

Comments
 (0)