Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-22 18:25:56 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15196 from sixeIa/fix-basedn-empty

Browse Source 
Add SearchDN error, mark field as required in UI
This commit is contained in:
Daniel Jiang 2021-07-12 12:32:52 +08:00 committed by GitHub
commit 3e502ec9a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pkg/ldap/ldap.go
View File

@ -53,6 +53,9 @@ var ErrInvalidFilter = errors.New("invalid filter syntax")
// ErrEmptyBaseDN ... // ErrEmptyBaseDN ...
var ErrEmptyBaseDN = errors.New("empty base dn") var ErrEmptyBaseDN = errors.New("empty base dn")
// ErrEmptySearchDN ...
var ErrEmptySearchDN = errors.New("empty search dn")
// Session - define a LDAP session // Session - define a LDAP session
type Session struct { type Session struct {
basicCfg models.LdapConf basicCfg models.LdapConf
@ -125,7 +128,7 @@ func TestConfig(ldapConfig models.LdapConf) (bool, error) {
defer ts.Close() defer ts.Close()
if ts.basicCfg.SearchDn == "" { if ts.basicCfg.SearchDn == "" {
return false, ErrEmptyBaseDN return false, ErrEmptySearchDN
} }
if err := ts.Bind(ts.basicCfg.SearchDn, ts.basicCfg.SearchPassword); err != nil { if err := ts.Bind(ts.basicCfg.SearchDn, ts.basicCfg.SearchPassword); err != nil {
if goldap.IsErrorWithCode(err, goldap.LDAPResultInvalidCredentials) { if goldap.IsErrorWithCode(err, goldap.LDAPResultInvalidCredentials) {

2
src/portal/src/app/base/left-side-nav/config/auth/config-auth.component.html
View File

@ -61,7 +61,7 @@
<clr-control-error>{{'TOOLTIP.ITEM_REQUIRED' | translate}}</clr-control-error> <clr-control-error>{{'TOOLTIP.ITEM_REQUIRED' | translate}}</clr-control-error>
</clr-input-container> </clr-input-container>
<clr-input-container> <clr-input-container>
<label for="ldapSearchDN" >{{'CONFIG.LDAP.SEARCH_DN' | translate}} <label for="ldapSearchDN" class="required">{{'CONFIG.LDAP.SEARCH_DN' | translate}}
<clr-tooltip> <clr-tooltip>
<clr-icon clrTooltipTrigger shape="info-circle" size="24"></clr-icon> <clr-icon clrTooltipTrigger shape="info-circle" size="24"></clr-icon>
<clr-tooltip-content clrPosition="top-right" clrSize="lg" *clrIfOpen> <clr-tooltip-content clrPosition="top-right" clrSize="lg" *clrIfOpen>