mirror of
https://github.com/goharbor/harbor.git
synced 2024-09-10 04:58:08 +02:00
Return UAA settings in configuration API
All the UAA settings will be read only as we expect user to modify it via opsman instead of Harbor UI.
This commit is contained in:
parent
944fd1d97a
commit
cae581979b
@ -52,6 +52,10 @@ var (
|
|||||||
common.ProjectCreationRestriction,
|
common.ProjectCreationRestriction,
|
||||||
common.TokenExpiration,
|
common.TokenExpiration,
|
||||||
common.ScanAllPolicy,
|
common.ScanAllPolicy,
|
||||||
|
common.UAAClientID,
|
||||||
|
common.UAAClientSecret,
|
||||||
|
common.UAAEndpoint,
|
||||||
|
common.UAAVerifyCert,
|
||||||
}
|
}
|
||||||
|
|
||||||
stringKeys = []string{
|
stringKeys = []string{
|
||||||
@ -68,6 +72,8 @@ var (
|
|||||||
common.EmailFrom,
|
common.EmailFrom,
|
||||||
common.EmailIdentity,
|
common.EmailIdentity,
|
||||||
common.ProjectCreationRestriction,
|
common.ProjectCreationRestriction,
|
||||||
|
common.UAAClientID,
|
||||||
|
common.UAAEndpoint,
|
||||||
}
|
}
|
||||||
|
|
||||||
numKeys = []string{
|
numKeys = []string{
|
||||||
@ -82,11 +88,13 @@ var (
|
|||||||
common.EmailInsecure,
|
common.EmailInsecure,
|
||||||
common.SelfRegistration,
|
common.SelfRegistration,
|
||||||
common.LDAPVerifyCert,
|
common.LDAPVerifyCert,
|
||||||
|
common.UAAVerifyCert,
|
||||||
}
|
}
|
||||||
|
|
||||||
passwordKeys = []string{
|
passwordKeys = []string{
|
||||||
common.EmailPassword,
|
common.EmailPassword,
|
||||||
common.LDAPSearchPwd,
|
common.LDAPSearchPwd,
|
||||||
|
common.UAAClientSecret,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -223,8 +231,8 @@ func validateCfg(c map[string]interface{}) (bool, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if value, ok := strMap[common.AUTHMode]; ok {
|
if value, ok := strMap[common.AUTHMode]; ok {
|
||||||
if value != common.DBAuth && value != common.LDAPAuth {
|
if value != common.DBAuth && value != common.LDAPAuth && value != common.UAAAuth {
|
||||||
return false, fmt.Errorf("invalid %s, shoud be %s or %s", common.AUTHMode, common.DBAuth, common.LDAPAuth)
|
return false, fmt.Errorf("invalid %s, shoud be one of %s, %s, %s", common.AUTHMode, common.DBAuth, common.LDAPAuth, common.UAAAuth)
|
||||||
}
|
}
|
||||||
flag, err := authModeCanBeModified()
|
flag, err := authModeCanBeModified()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -329,8 +337,12 @@ func convertForGet(cfg map[string]interface{}) (map[string]*value, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result[common.AUTHMode].Editable = flag
|
//All configuration of UAA will be un-editable for PKS 1.0 (1.4)
|
||||||
|
result[common.AUTHMode].Editable = flag && result[common.AUTHMode].Value.(string) != common.UAAAuth
|
||||||
|
result[common.UAAEndpoint].Editable = false
|
||||||
|
// result[common.UAAClientSecret].Editable = false
|
||||||
|
result[common.UAAVerifyCert].Editable = false
|
||||||
|
result[common.UAAClientID].Editable = false
|
||||||
return result, nil
|
return result, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user