Handle auth error (#226)

client_test.go

@@ -75,6 +75,11 @@ func TestConnection(t *testing.T) {
  t.Fatalf("fail to authenticate, username: %s, password: %s, %s", username, password, authErr.Error())
  }
 
+ if authResp.GetErrorCode() != nebula.ErrorCode_SUCCEEDED {
+ t.Fatalf("failed to authenticate, error code: %d, error msg: %s",
+ authResp.GetErrorCode(), authResp.GetErrorMsg())
+ }
+
  sessionID := authResp.GetSessionID()
 
  defer logoutAndClose(conn, sessionID)
@@ -127,6 +132,11 @@ func TestConnectionIPv6(t *testing.T) {
  t.Fatalf("fail to authenticate, username: %s, password: %s, %s", username, password, authErr.Error())
  }
 
+ if authResp.GetErrorCode() != nebula.ErrorCode_SUCCEEDED {
+ t.Fatalf("failed to authenticate, error code: %d, error msg: %s",
+ authResp.GetErrorCode(), authResp.GetErrorMsg())
+ }
+
  sessionID := authResp.GetSessionID()
 
  defer logoutAndClose(conn, sessionID)
@@ -250,8 +260,12 @@ func TestAuthentication(t *testing.T) {
  }
  defer conn.close()
 
- _, authErr := conn.authenticate(username, password)
- assert.EqualError(t, authErr, "fail to authenticate, error: User not exist")
+ resp, authErr := conn.authenticate(username, password)
+ if authErr != nil {
+ t.Fatalf("fail to authenticate, username: %s, password: %s, %s", username, password, authErr.Error())
+ }
+
+ assert.Equal(t, string(resp.GetErrorMsg()), "User not exist")
 }
 
 func TestInvalidHostTimeout(t *testing.T) {
@@ -1398,6 +1412,11 @@ func prepareSpace(spaceName string) error {
  return fmt.Errorf("fail to authenticate, username: %s, password: %s, %s", username, password, authErr.Error())
  }
 
+ if authResp.GetErrorCode() != nebula.ErrorCode_SUCCEEDED {
+ return fmt.Errorf("failed to authenticate, error code: %d, error msg: %s",
+ authResp.GetErrorCode(), authResp.GetErrorMsg())
+ }
+
  sessionID := authResp.GetSessionID()
 
  defer logoutAndClose(conn, sessionID)
@@ -1430,6 +1449,11 @@ func dropSpace(spaceName string) error {
  return fmt.Errorf("fail to authenticate, username: %s, password: %s, %s", username, password, authErr.Error())
  }
 
+ if authResp.GetErrorCode() != nebula.ErrorCode_SUCCEEDED {
+ return fmt.Errorf("failed to authenticate, error code: %d, error msg: %s",
+ authResp.GetErrorCode(), authResp.GetErrorMsg())
+ }
+
  sessionID := authResp.GetSessionID()
 
  defer logoutAndClose(conn, sessionID)

connection.go

@@ -106,10 +106,8 @@ func (cn *connection) authenticate(username, password string) (*graph.AuthRespon
  }
  return nil, err
  }
- if resp.ErrorCode != nebula.ErrorCode_SUCCEEDED {
- return nil, fmt.Errorf("fail to authenticate, error: %s", resp.ErrorMsg)
- }
- return resp, err
+
+ return resp, nil
 }
 
 func (cn *connection) execute(sessionID int64, stmt string) (*graph.ExecutionResponse, error) {

connection_pool.go

@@ -112,7 +112,7 @@ func (pool *ConnectionPool) GetSession(username, password string) (*Session, err
  }
  // Authenticate
  resp, err := conn.authenticate(username, password)
- if err != nil || resp.GetErrorCode() != nebula.ErrorCode_SUCCEEDED {
+ if err != nil {
  // if authentication failed, put connection back
  pool.rwLock.Lock()
  defer pool.rwLock.Unlock()
@@ -121,6 +121,12 @@ func (pool *ConnectionPool) GetSession(username, password string) (*Session, err
  return nil, err
  }
 
+ // Check auth response
+ if resp.GetErrorCode() != nebula.ErrorCode_SUCCEEDED {
+ return nil, fmt.Errorf("failed to authenticate, error code: %d, error msg: %s",
+ resp.GetErrorCode(), resp.GetErrorMsg())
+ }
+
  sessID := resp.GetSessionID()
  timezoneOffset := resp.GetTimeZoneOffsetSeconds()
  timezoneName := resp.GetTimeZoneName()

session_pool.go

@@ -310,9 +310,14 @@ func (pool *SessionPool) newSession() (*Session, error) {
 
  // If the authentication failed, close the session pool because the pool must have a valid user to work
  if authResp.GetErrorCode() != 0 {
- pool.Close()
- return nil, fmt.Errorf("failed to authenticate the user, error code: %d, error message: %s, the pool has been closed",
- authResp.ErrorCode, authResp.ErrorMsg)
+ if authResp.GetErrorCode() == nebula.ErrorCode_E_BAD_USERNAME_PASSWORD ||
+ authResp.GetErrorCode() == nebula.ErrorCode_E_USER_NOT_FOUND {
+ pool.Close()
+ return nil, fmt.Errorf(
+ "failed to authenticate the user, error code: %d, error message: %s, the pool has been closed",
+ authResp.ErrorCode, authResp.ErrorMsg)
+ }
+ return nil, fmt.Errorf("failed to create a new session: %s", authResp.GetErrorMsg())
  }
 
  sessID := authResp.GetSessionID()
@@ -327,19 +332,18 @@ func (pool *SessionPool) newSession() (*Session, error) {
  log: pool.log,
  timezoneInfo: timezoneInfo{timezoneOffset, timezoneName},
  }
- err = newSession.Ping()
- if err != nil {
- return nil, err
- }
 
+ // Switch to the default space
  stmt := fmt.Sprintf("USE %s", pool.conf.spaceName)
- createSpaceResp, err := newSession.connection.execute(newSession.sessionID, stmt)
+ useSpaceResp, err := newSession.connection.execute(newSession.sessionID, stmt)
  if err != nil {
  return nil, err
  }
- if createSpaceResp.GetErrorCode() != nebula.ErrorCode_SUCCEEDED {
+
+ if useSpaceResp.GetErrorCode() != nebula.ErrorCode_SUCCEEDED {
+ newSession.connection.close()
  return nil, fmt.Errorf("failed to use space %s: %s",
- pool.conf.spaceName, createSpaceResp.GetErrorMsg())
+ pool.conf.spaceName, useSpaceResp.GetErrorMsg())
  }
  return &newSession, nil
 }