From d4c48139b52088d7fcff31ab2c65744d17179214 Mon Sep 17 00:00:00 2001 From: Doug Lauder Date: Fri, 17 Jun 2022 19:01:50 -0400 Subject: [PATCH] Check for nil,nil returned from GetUser (#20501) * check for nil,nil returned from GetUser * add logging --- app/user.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/user.go b/app/user.go index 27bdb20558..f05fd43270 100644 --- a/app/user.go +++ b/app/user.go @@ -17,6 +17,8 @@ import ( "github.com/pkg/errors" + "golang.org/x/sync/errgroup" + "github.com/mattermost/mattermost-server/v6/app/email" "github.com/mattermost/mattermost-server/v6/app/imaging" "github.com/mattermost/mattermost-server/v6/app/request" @@ -28,7 +30,6 @@ import ( "github.com/mattermost/mattermost-server/v6/shared/mfa" "github.com/mattermost/mattermost-server/v6/shared/mlog" "github.com/mattermost/mattermost-server/v6/store" - "golang.org/x/sync/errgroup" ) const ( @@ -387,6 +388,12 @@ func (a *App) GetUser(userID string) (*model.User, *model.AppError) { } } + // Temporary check to diagnose a SET escalation; when GetUser is called by some plugins a nil,nil is returned. + if user == nil { + mlog.Error("Unexpected nil from GetUser", mlog.String("user_id", userID)) + return nil, model.NewAppError("GetUser", "app.user.get.app_error", nil, "Unexpected nil fetching userid "+userID, http.StatusInternalServerError) + } + return user, nil }