Skip to content

Commit

Permalink
feat: no longer verify HELLO error messages (#2515)
Browse files Browse the repository at this point in the history
Signed-off-by: monkey92t <golang@88.com>
  • Loading branch information
monkey92t committed Apr 12, 2023
1 parent 6edb152 commit 7b4f217
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions redis.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"errors"
"fmt"
"net"
"strings"
"sync/atomic"
"time"

Expand Down Expand Up @@ -281,13 +280,18 @@ func (c *baseClient) initConn(ctx context.Context, cn *pool.Conn) error {

var auth bool

// For redis-server < 6.0 that does not support the Hello command,
// we continue to provide services with RESP2.
// for redis-server versions that do not support the HELLO command,
// RESP2 will continue to be used.
if err := conn.Hello(ctx, 3, username, password, "").Err(); err == nil {
auth = true
} else if !strings.HasPrefix(err.Error(), "ERR unknown command") &&
// this check is for compatibility DragonflyDB.
!strings.HasPrefix(err.Error(), "NOAUTH Authentication") {
} else if !isRedisError(err) {
// When the server responds with the RESP protocol and the result is not a normal
// execution result of the HELLO command, we consider it to be an indication that
// the server does not support the HELLO command.
// The server may be a redis-server that does not support the HELLO command,
// or it could be DragonflyDB or a third-party redis-proxy. They all respond
// with different error string results for unsupported commands, making it
// difficult to rely on error strings to determine all results.
return err
}

Expand Down

0 comments on commit 7b4f217

Please sign in to comment.