Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
6951f4dd
Commit
6951f4dd
authored
Nov 22, 2019
by
BaiJiangJie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Update] 删除 LDAP 查询时抛出的自定义异常类( LDAPOUGroupException),解决多有 OU 下导入用户时的问题
parent
d563a11a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
8 deletions
+1
-8
ldap.py
apps/settings/utils/ldap.py
+1
-8
No files found.
apps/settings/utils/ldap.py
View file @
6951f4dd
...
...
@@ -21,10 +21,6 @@ __all__ = [
LDAP_USE_CACHE_FLAGS
=
[
1
,
'1'
,
'true'
,
'True'
,
True
]
class
LDAPOUGroupException
(
Exception
):
pass
class
LDAPConfig
(
object
):
def
__init__
(
self
,
config
=
None
):
...
...
@@ -119,14 +115,11 @@ class LDAPServerUtil(object):
def
search_user_entries_ou
(
self
,
search_ou
,
paged_cookie
=
None
):
search_filter
=
self
.
get_search_filter
()
attributes
=
list
(
self
.
config
.
attr_map
.
values
())
ok
=
self
.
connection
.
search
(
self
.
connection
.
search
(
search_base
=
search_ou
,
search_filter
=
search_filter
,
attributes
=
attributes
,
paged_size
=
self
.
_paged_size
,
paged_cookie
=
paged_cookie
)
if
not
ok
:
error
=
_
(
"Search no entry matched in ou {}"
.
format
(
search_ou
))
raise
LDAPOUGroupException
(
error
)
@timeit
def
search_user_entries
(
self
):
...
...
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