Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-02-02 21:11:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13621 from stonezdj/201127_fail_to_add_ldap_group

Browse Source 
Lowercase the LDAP DN in UnderBaseDN
This commit is contained in:
stonezdj(Daojun Zhang) 2020-11-27 11:45:07 +08:00 committed by GitHub
commit dec12308a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/utils/ldap/ldap.go
View File

@ -434,11 +434,11 @@ func (session *Session) searchGroup(groupDN, filter, gName, groupNameAttribute s
// UnderBaseDN - check if the childDN is under the baseDN, if the baseDN equals current DN, return true // UnderBaseDN - check if the childDN is under the baseDN, if the baseDN equals current DN, return true
func UnderBaseDN(baseDN, childDN string) (bool, error) { func UnderBaseDN(baseDN, childDN string) (bool, error) {
base, err := goldap.ParseDN(baseDN) base, err := goldap.ParseDN(strings.ToLower(baseDN))
if err != nil { if err != nil {
return false, err return false, err
} }
child, err := goldap.ParseDN(childDN) child, err := goldap.ParseDN(strings.ToLower(childDN))
if err != nil { if err != nil {
return false, err return false, err
} }

6
src/common/utils/ldap/ldap_test.go
View File

@ -615,6 +615,12 @@ func TestUnderBaseDN(t *testing.T) {
wantError: true, wantError: true,
want: false, want: false,
}, },
{
name: `should be case-insensitive`,
in: args{"CN=Users,CN=harbor,DC=com", "cn=harbor_group_1,cn=users,cn=harbor,dc=com"},
wantError: false,
want: true,
},
} }
for _, tt := range cases { for _, tt := range cases {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {