USEFULL/gogs
1
0
Fork 0
mirror of https://github.com/gogs/gogs.git synced 2025-05-25 17:00:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

auth/ldap: allow placeholder %s for BindDN (#2526)

Browse Source
This commit is contained in:
Unknwon 2017-11-16 19:32:33 -05:00
parent e1e76d3f88
commit 6f04ee879c
No known key found for this signature in database
GPG Key ID: 25B575AE3213B2B3
7 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf/locale/locale_en-US.ini
View File

@ -1099,6 +1099,7 @@ auths.domain = Domain
auths.host = Host auths.host = Host
auths.port = Port auths.port = Port
auths.bind_dn = Bind DN auths.bind_dn = Bind DN
auths.bind_dn_helper = You can use '%s' as placeholder for username, e.g. DOM\%s
auths.bind_password = Bind Password auths.bind_password = Bind Password
auths.bind_password_helper = Warning: This password is stored in plain text. Do not use a high privileged account. auths.bind_password_helper = Warning: This password is stored in plain text. Do not use a high privileged account.
auths.user_base = User Search Base auths.user_base = User Search Base

2
gogs.go
View File

@ -16,7 +16,7 @@ import (
"github.com/gogits/gogs/pkg/setting" "github.com/gogits/gogs/pkg/setting"
) )
const APP_VER = "0.11.32.1115" const APP_VER = "0.11.33.1116"
func init() { func init() {
setting.AppVer = APP_VER setting.AppVer = APP_VER

10
pkg/auth/ldap/ldap.go
View File

@ -96,13 +96,15 @@ func (ls *Source) sanitizedGroupDN(groupDn string) (string, bool) {
func (ls *Source) findUserDN(l *ldap.Conn, name string) (string, bool) { func (ls *Source) findUserDN(l *ldap.Conn, name string) (string, bool) {
log.Trace("Search for LDAP user: %s", name) log.Trace("Search for LDAP user: %s", name)
if ls.BindDN != "" && ls.BindPassword != "" { if len(ls.BindDN) > 0 && len(ls.BindPassword) > 0 {
err := l.Bind(ls.BindDN, ls.BindPassword) // Replace placeholders with username
bindDN := strings.Replace(ls.BindDN, "%s", name, -1)
err := l.Bind(bindDN, ls.BindPassword)
if err != nil { if err != nil {
log.Trace("LDAP: Failed to bind as BindDN '%s': %v", ls.BindDN, err) log.Trace("LDAP: Failed to bind as BindDN '%s': %v", bindDN, err)
return "", false return "", false
} }
log.Trace("LDAP: Bound as BindDN: %s", ls.BindDN) log.Trace("LDAP: Bound as BindDN: %s", bindDN)
} else { } else {
log.Trace("LDAP: Proceeding with anonymous LDAP search") log.Trace("LDAP: Proceeding with anonymous LDAP search")
} }

4
pkg/bindata/bindata.go
View File

File diff suppressed because one or more lines are too long

2
templates/.VERSION
View File

@ -1 +1 @@
0.11.32.1115 0.11.33.1116

1
templates/admin/auth/edit.tmpl
View File

@ -50,6 +50,7 @@
<div class="field"> <div class="field">
<label for="bind_dn">{{.i18n.Tr "admin.auths.bind_dn"}}</label> <label for="bind_dn">{{.i18n.Tr "admin.auths.bind_dn"}}</label>
<input id="bind_dn" name="bind_dn" value="{{$cfg.BindDN}}" placeholder="e.g. cn=Search,dc=mydomain,dc=com"> <input id="bind_dn" name="bind_dn" value="{{$cfg.BindDN}}" placeholder="e.g. cn=Search,dc=mydomain,dc=com">
<p class="help text red">{{.i18n.Tr "admin.auths.bind_dn_helper"}}</p>
</div> </div>
<input class="fake" type="password"> <input class="fake" type="password">
<div class="field"> <div class="field">

1
templates/admin/auth/new.tmpl
View File

@ -56,6 +56,7 @@
<div class="ldap field {{if not (eq .type 2)}}hide{{end}}"> <div class="ldap field {{if not (eq .type 2)}}hide{{end}}">
<label for="bind_dn">{{.i18n.Tr "admin.auths.bind_dn"}}</label> <label for="bind_dn">{{.i18n.Tr "admin.auths.bind_dn"}}</label>
<input id="bind_dn" name="bind_dn" value="{{.bind_dn}}" placeholder="e.g. cn=Search,dc=mydomain,dc=com"> <input id="bind_dn" name="bind_dn" value="{{.bind_dn}}" placeholder="e.g. cn=Search,dc=mydomain,dc=com">
<p class="help text blue">{{.i18n.Tr "admin.auths.bind_dn_helper"}}</p>
</div> </div>
<div class="ldap field {{if not (eq .type 2)}}hide{{end}}"> <div class="ldap field {{if not (eq .type 2)}}hide{{end}}">
<label for="bind_password">{{.i18n.Tr "admin.auths.bind_password"}}</label> <label for="bind_password">{{.i18n.Tr "admin.auths.bind_password"}}</label>