User-visible errors polish

Fixes #1779
gravitational · Mar 27, 2018 · 538515c · 538515c
1 parent ced29ea
commit 538515c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/auth/new_web_user.go b/lib/auth/new_web_user.go
@@ -74,7 +74,7 @@ func (s *AuthServer) CreateSignupToken(userv1 services.UserV1, ttl time.Duration
 	// when unable to.
 	_, err := s.GetPasswordHash(user.GetName())
 	if err == nil {
-		return "", trace.BadParameter("user %q already exists", user)
+		return "", trace.BadParameter("user '%s' already exists", user.GetName())
 	}
 
 	token, err := utils.CryptoRandomHex(TokenLenBytes)
@@ -142,7 +142,7 @@ func (s *AuthServer) GetSignupTokenData(token string) (user string, qrCode []byt
 	// It's a TOCTOU bug in the making: https://en.wikipedia.org/wiki/Time_of_check_to_time_of_use
 	_, err = s.GetPasswordHash(tokenData.User.Name)
 	if err == nil {
-		return "", nil, trace.Errorf("can't add user %v: user already exists", tokenData.User)
+		return "", nil, trace.Errorf("user %q already exists", tokenData.User.Name)
 	}
 
 	return tokenData.User.Name, tokenData.OTPQRCode, nil
@@ -166,7 +166,7 @@ func (s *AuthServer) CreateSignupU2FRegisterRequest(token string) (u2fRegisterRe
 
 	_, err = s.GetPasswordHash(tokenData.User.Name)
 	if err == nil {
-		return nil, trace.AlreadyExists("can't add user %q, user already exists", tokenData.User)
+		return nil, trace.AlreadyExists("user %q already exists", tokenData.User.Name)
 	}
 
 	c, err := u2f.NewChallenge(universalSecondFactor.AppID, universalSecondFactor.Facets)

diff --git a/lib/service/service.go b/lib/service/service.go
@@ -712,7 +712,7 @@ func (process *TeleportProcess) initAuthService() error {
 					srv.SetAddr(net.JoinHostPort(ip.String(), port))
 				}
 			}
-			log.Warnf("Parameter advertise_ip is not set for this auth server. Trying to guess the IP this server can be reached at: %v.", srv.GetAddr())
+			log.Warnf("auth_service: advertise_ip is not set. guessing %v.", srv.GetAddr())
 		}
 		// immediately register, and then keep repeating in a loop:
 		ticker := time.NewTicker(defaults.ServerHeartbeatTTL / 2)