Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-07-05 03:05:05 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4074 from stonezdj/ldap_4073

Browse Source 
Fix bug 4073
This commit is contained in:
Daniel Jiang 2018-01-19 13:52:19 +08:00 committed by GitHub
commit b83df87b79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/adminserver/systemcfg/systemcfg.go
View File

@ -365,7 +365,13 @@ func GetDatabaseFromCfg(cfg map[string]interface{}) *models.Database {
// Valid LDAP Scope // Valid LDAP Scope
func validLdapScope(cfg map[string]interface{}, isMigrate bool) { func validLdapScope(cfg map[string]interface{}, isMigrate bool) {
ldapScope := cfg[ldapScopeKey].(int) ldapScope, ok := cfg[ldapScopeKey].(int)
if !ok {
ldapScopeFloat, ok := cfg[ldapScopeKey].(float64)
if ok {
ldapScope = int(ldapScopeFloat)
}
}
if isMigrate && ldapScope > 0 && ldapScope < 3 { if isMigrate && ldapScope > 0 && ldapScope < 3 {
ldapScope = ldapScope - 1 ldapScope = ldapScope - 1
} }

5
src/adminserver/systemcfg/systemcfg_test.go
View File

@ -143,6 +143,8 @@ func TestGetDatabaseFromCfg(t *testing.T) {
} }
func TestValidLdapScope(t *testing.T) { func TestValidLdapScope(t *testing.T) {
var dbValue float64
dbValue = 2
ldapScopeKey := "ldap_scope" ldapScopeKey := "ldap_scope"
testCfgs := []struct { testCfgs := []struct {
config map[string]interface{} config map[string]interface{}
@ -167,6 +169,9 @@ func TestValidLdapScope(t *testing.T) {
{map[string]interface{}{ {map[string]interface{}{
ldapScopeKey: -100, ldapScopeKey: -100,
}, false, 0}, }, false, 0},
{map[string]interface{}{
ldapScopeKey: dbValue,
}, false, 2},
} }
for i, item := range testCfgs { for i, item := range testCfgs {