Merge 033d34b1e8 into ed698d1a61

services/auth/source/smtp/source_authenticate.go

@@ -42,16 +42,13 @@ func (source *Source) Authenticate(ctx context.Context, user *user_model.User, u
 	}
 
 	if err := Authenticate(auth, source); err != nil {
-		// Check standard error format first,
-		// then fallback to worse case.
-		tperr, ok := err.(*textproto.Error)
-		if (ok && tperr.Code == 535) ||
-			strings.Contains(err.Error(), "Username and Password not accepted") {
-			return nil, user_model.ErrUserNotExist{Name: userName}
-		}
-		if (ok && tperr.Code == 534) ||
-			strings.Contains(err.Error(), "Application-specific password required") {
-			return nil, user_model.ErrUserNotExist{Name: userName}
+		// when authentication via smtp fails, wraps ErrInvalidArgument
+		// with the original textproto.Error as the cause,
+		// so it will show username_password_incorrect to the user
+		// while log the original error so that admin can check.
+		// see: routers/web/auth/auth.go SiginPost
+		if tperr, ok := err.(*textproto.Error); ok {
+			return nil, errors.Join(util.ErrInvalidArgument, tperr)
 		}
 		return nil, err
 	}