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
0db84828
Commit
0db84828
authored
Oct 10, 2017
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update ldap auth
parent
8bccaa6e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
utils.py
apps/users/utils.py
+2
-2
No files found.
apps/users/utils.py
View file @
0db84828
...
...
@@ -8,7 +8,7 @@ import uuid
from
paramiko.rsakey
import
RSAKey
from
django.conf
import
settings
from
django.contrib.auth.mixins
import
UserPassesTestMixin
from
django.
urls
import
reverse_lazy
from
django.
contrib.auth
import
authenticate
from
django.utils.translation
import
ugettext
as
_
from
django.core.cache
import
cache
...
...
@@ -140,7 +140,7 @@ def check_user_valid(**kwargs):
elif
not
user
.
is_valid
:
return
None
,
_
(
'Disabled or expired'
)
if
password
and
user
.
password
and
user
.
check_password
(
password
):
if
password
and
authenticate
(
username
=
username
,
password
=
password
):
return
user
,
''
if
public_key
and
user
.
public_key
:
...
...
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