From c742d1882835a54695dc3fa7f73d3d109aca9dc6 Mon Sep 17 00:00:00 2001 From: Martin Kraft Date: Wed, 16 Oct 2019 11:50:24 -0400 Subject: [PATCH] MM-17477: Truncates group display name upon linking. (#12751) --- api4/ldap.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/api4/ldap.go b/api4/ldap.go index 11f7fefe72..573e2b93af 100644 --- a/api4/ldap.go +++ b/api4/ldap.go @@ -155,13 +155,21 @@ func linkLdapGroup(c *Context, w http.ResponseWriter, r *http.Request) { var status int var newOrUpdatedGroup *model.Group + // Truncate display name if necessary + var displayName string + if len(ldapGroup.DisplayName) > model.GroupDisplayNameMaxLength { + displayName = ldapGroup.DisplayName[:model.GroupDisplayNameMaxLength] + } else { + displayName = ldapGroup.DisplayName + } + // Group has been previously linked if group != nil { if group.DeleteAt == 0 { newOrUpdatedGroup = group } else { group.DeleteAt = 0 - group.DisplayName = ldapGroup.DisplayName + group.DisplayName = displayName group.RemoteId = ldapGroup.RemoteId newOrUpdatedGroup, err = c.App.UpdateGroup(group) if err != nil { @@ -178,7 +186,7 @@ func linkLdapGroup(c *Context, w http.ResponseWriter, r *http.Request) { // the LDAP group name with an appended duplicate-breaker. newGroup := &model.Group{ Name: model.NewId(), - DisplayName: ldapGroup.DisplayName, + DisplayName: displayName, RemoteId: ldapGroup.RemoteId, Source: model.GroupSourceLdap, }