[MM-32406] Introduce trace logging level for LDAP messages (mattermos…

…t#25118)

server/channels/api4/hosted_customer.go

@@ -251,7 +251,7 @@ func selfHostedInvoices(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	invoices, err := c.App.Cloud().GetSelfHostedInvoices()
+	invoices, err := c.App.Cloud().GetSelfHostedInvoices(c.AppContext)
 
 	if err != nil {
 		if err.Error() == "404" {

server/channels/api4/ldap.go

@@ -83,7 +83,7 @@ func testLdap(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if err := c.App.TestLdap(); err != nil {
+	if err := c.App.TestLdap(c.AppContext); err != nil {
 		c.Err = err
 		return
 	}
@@ -112,7 +112,7 @@ func getLdapGroups(c *Context, w http.ResponseWriter, r *http.Request) {
 		opts.IsConfigured = c.Params.IsConfigured
 	}
 
-	groups, total, appErr := c.App.GetAllLdapGroupsPage(c.Params.Page, c.Params.PerPage, opts)
+	groups, total, appErr := c.App.GetAllLdapGroupsPage(c.AppContext, c.Params.Page, c.Params.PerPage, opts)
 	if appErr != nil {
 		c.Err = appErr
 		return
@@ -163,7 +163,7 @@ func linkLdapGroup(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	ldapGroup, appErr := c.App.GetLdapGroup(c.Params.RemoteId)
+	ldapGroup, appErr := c.App.GetLdapGroup(c.AppContext, c.Params.RemoteId)
 	if appErr != nil {
 		c.Err = appErr
 		return

server/channels/app/ldap.go

@@ -35,10 +35,10 @@ func (a *App) SyncLdap(c request.CTX, includeRemovedMembers bool) {
 	})
 }
 
-func (a *App) TestLdap() *model.AppError {
+func (a *App) TestLdap(rctx request.CTX) *model.AppError {
 	license := a.Srv().License()
 	if ldapI := a.Ldap(); ldapI != nil && license != nil && *license.Features.LDAP && (*a.Config().LdapSettings.Enable || *a.Config().LdapSettings.EnableSync) {
-		if err := ldapI.RunTest(); err != nil {
+		if err := ldapI.RunTest(rctx); err != nil {
 			err.StatusCode = 500
 			return err
 		}
@@ -51,12 +51,12 @@ func (a *App) TestLdap() *model.AppError {
 }
 
 // GetLdapGroup retrieves a single LDAP group by the given LDAP group id.
-func (a *App) GetLdapGroup(ldapGroupID string) (*model.Group, *model.AppError) {
+func (a *App) GetLdapGroup(rctx request.CTX, ldapGroupID string) (*model.Group, *model.AppError) {
 	var group *model.Group
 
 	if a.Ldap() != nil {
 		var err *model.AppError
-		group, err = a.Ldap().GetGroup(ldapGroupID)
+		group, err = a.Ldap().GetGroup(rctx, ldapGroupID)
 		if err != nil {
 			return nil, err
 		}
@@ -70,13 +70,13 @@ func (a *App) GetLdapGroup(ldapGroupID string) (*model.Group, *model.AppError) {
 
 // GetAllLdapGroupsPage retrieves all LDAP groups under the configured base DN using the default or configured group
 // filter.
-func (a *App) GetAllLdapGroupsPage(page int, perPage int, opts model.LdapGroupSearchOpts) ([]*model.Group, int, *model.AppError) {
+func (a *App) GetAllLdapGroupsPage(rctx request.CTX, page int, perPage int, opts model.LdapGroupSearchOpts) ([]*model.Group, int, *model.AppError) {
 	var groups []*model.Group
 	var total int
 
 	if a.Ldap() != nil {
 		var err *model.AppError
-		groups, total, err = a.Ldap().GetAllGroupsPage(page, perPage, opts)
+		groups, total, err = a.Ldap().GetAllGroupsPage(rctx, page, perPage, opts)
 		if err != nil {
 			return nil, 0, err
 		}

server/channels/app/plugin_api.go

@@ -409,7 +409,7 @@ func (api *PluginAPI) GetLDAPUserAttributes(userID string, attributes []string)
 	// Only bother running the query if the user's auth service is LDAP or it's SAML and sync is enabled.
 	if user.AuthService == model.UserAuthServiceLdap ||
 		(user.AuthService == model.UserAuthServiceSaml && *api.app.Config().SamlSettings.EnableSyncWithLdap) {
-		return api.app.Ldap().GetUserAttributes(*user.AuthData, attributes)
+		return api.app.Ldap().GetUserAttributes(api.ctx, *user.AuthData, attributes)
 	}
 
 	return map[string]string{}, nil

server/channels/app/support_packet.go

@@ -96,7 +96,7 @@ func (a *App) generateSupportPacketYaml(c request.CTX) (*model.FileData, error)
 
 	var vendorName, vendorVersion string
 	if ldapInterface := a.ch.Ldap; a.ch.Ldap != nil {
-		vendorName, vendorVersion = ldapInterface.GetVendorNameAndVendorVersion()
+		vendorName, vendorVersion = ldapInterface.GetVendorNameAndVendorVersion(c)
 	}
 
 	/* Elastic Search */

server/einterfaces/cloud.go

@@ -5,6 +5,7 @@ package einterfaces
 
 import (
 	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/request"
 )
 
 type CloudInterface interface {
@@ -39,7 +40,7 @@ type CloudInterface interface {
 	ConfirmSelfHostedSignup(req model.SelfHostedConfirmPaymentMethodRequest, requesterEmail string) (*model.SelfHostedSignupConfirmResponse, error)
 	ConfirmSelfHostedExpansion(req model.SelfHostedConfirmPaymentMethodRequest, requesterEmail string) (*model.SelfHostedSignupConfirmResponse, error)
 	ConfirmSelfHostedSignupLicenseApplication() error
-	GetSelfHostedInvoices() ([]*model.Invoice, error)
+	GetSelfHostedInvoices(rctx request.CTX) ([]*model.Invoice, error)
 	GetSelfHostedInvoicePDF(invoiceID string) ([]byte, string, error)
 
 	CreateOrUpdateSubscriptionHistoryEvent(userID string, userCount int) (*model.SubscriptionHistory, error)

server/einterfaces/ldap.go

@@ -11,20 +11,20 @@ import (
 type LdapInterface interface {
 	DoLogin(c request.CTX, id string, password string) (*model.User, *model.AppError)
 	GetUser(c request.CTX, id string) (*model.User, *model.AppError)
-	GetUserAttributes(id string, attributes []string) (map[string]string, *model.AppError)
+	GetUserAttributes(rctx request.CTX, id string, attributes []string) (map[string]string, *model.AppError)
 	CheckPassword(c request.CTX, id string, password string) *model.AppError
 	CheckPasswordAuthData(c request.CTX, authData string, password string) *model.AppError
 	CheckProviderAttributes(c request.CTX, LS *model.LdapSettings, ouser *model.User, patch *model.UserPatch) string
 	SwitchToLdap(c request.CTX, userID, ldapID, ldapPassword string) *model.AppError
 	StartSynchronizeJob(c request.CTX, waitForJobToFinish bool, includeRemovedMembers bool) (*model.Job, *model.AppError)
-	RunTest() *model.AppError
+	RunTest(rctx request.CTX) *model.AppError
 	GetAllLdapUsers(c request.CTX) ([]*model.User, *model.AppError)
 	MigrateIDAttribute(c request.CTX, toAttribute string) error
-	GetGroup(groupUID string) (*model.Group, *model.AppError)
-	GetAllGroupsPage(page int, perPage int, opts model.LdapGroupSearchOpts) ([]*model.Group, int, *model.AppError)
+	GetGroup(rctx request.CTX, groupUID string) (*model.Group, *model.AppError)
+	GetAllGroupsPage(rctx request.CTX, page int, perPage int, opts model.LdapGroupSearchOpts) ([]*model.Group, int, *model.AppError)
 	FirstLoginSync(c request.CTX, user *model.User, userAuthService, userAuthData, email string) *model.AppError
 	UpdateProfilePictureIfNecessary(request.CTX, model.User, model.Session)
 	GetADLdapIdFromSAMLId(c request.CTX, authData string) string
 	GetSAMLIdFromADLdapId(c request.CTX, authData string) string
-	GetVendorNameAndVendorVersion() (string, string)
+	GetVendorNameAndVendorVersion(rctx request.CTX) (string, string)
 }