mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-03-22 01:12:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

graph/education: Don't leak LDAP errors into the graph error message

Browse Source 
(cherry picked from commit 164edd16c0)
This commit is contained in:
Ralf Haferkamp
2023-09-25 17:43:59 +02:00
parent 03926e6182
commit b6ddfcccfb
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/graph/pkg/identity/ldap_education_school.go
View File

@@ -216,7 +216,7 @@ func (i *LDAP) updateDisplayName(ctx context.Context, dn string, providedDisplay
logger.Debug().Err(err).Msg("error updating school name")
if errors.As(err, &lerr) {
if lerr.ResultCode == ldap.LDAPResultEntryAlreadyExists {
err = errorcode.New(errorcode.NameAlreadyExists, lerr.Error())
err = errorcode.New(errorcode.NameAlreadyExists, "A school with that name is already present")
}
}
return err
@@ -235,9 +235,7 @@ func (i *LDAP) updateSchoolProperties(ctx context.Context, dn string, currentSch
if *updatedSchoolNumber != "" && currentSchool.GetSchoolNumber() != *updatedSchoolNumber {
_, err := i.getSchoolByNumberOrID(*updatedSchoolNumber)
if err == nil {
errmsg := fmt.Sprintf("school number '%s' already exists", *updatedSchoolNumber)
err = fmt.Errorf(errmsg)
return err
return errorcode.New(errorcode.NameAlreadyExists, "A school with that number is already present")
}
mr.Replace(i.educationConfig.schoolAttributeMap.schoolNumber, []string{*updatedSchoolNumber})
}