Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
be2fa544
Commit
be2fa544
authored
Feb 20, 2018
by
Martin Molnar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ldap): Allow use of DN in user attribute filter (#3132)
parent
9f4b7ac2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 deletions
+9
-1
pkg/login/ldap.go
+9
-1
No files found.
pkg/login/ldap.go
View file @
be2fa544
...
...
@@ -408,6 +408,10 @@ func (a *ldapAuther) searchForUser(username string) (*LdapUserInfo, error) {
if
a
.
server
.
GroupSearchFilterUserAttribute
==
""
{
filter_replace
=
getLdapAttr
(
a
.
server
.
Attr
.
Username
,
searchResult
)
}
if
a
.
server
.
GroupSearchFilterUserAttribute
==
"dn"
{
filter_replace
=
searchResult
.
Entries
[
0
]
.
DN
}
filter
:=
strings
.
Replace
(
a
.
server
.
GroupSearchFilter
,
"%s"
,
ldap
.
EscapeFilter
(
filter_replace
),
-
1
)
a
.
log
.
Info
(
"Searching for user's groups"
,
"filter"
,
filter
)
...
...
@@ -430,7 +434,11 @@ func (a *ldapAuther) searchForUser(username string) (*LdapUserInfo, error) {
if
len
(
groupSearchResult
.
Entries
)
>
0
{
for
i
:=
range
groupSearchResult
.
Entries
{
memberOf
=
append
(
memberOf
,
getLdapAttrN
(
a
.
server
.
Attr
.
MemberOf
,
groupSearchResult
,
i
))
if
a
.
server
.
Attr
.
MemberOf
==
"dn"
{
memberOf
=
append
(
memberOf
,
groupSearchResult
.
Entries
[
i
]
.
DN
)
}
else
{
memberOf
=
append
(
memberOf
,
getLdapAttrN
(
a
.
server
.
Attr
.
MemberOf
,
groupSearchResult
,
i
))
}
}
break
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment