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
6fbc4ce4
Commit
6fbc4ce4
authored
Nov 06, 2019
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Update] MFA
parent
8de86352
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
10 deletions
+11
-10
mfa.py
apps/authentication/api/mfa.py
+3
-2
errors.py
apps/authentication/errors.py
+7
-7
serializers.py
apps/authentication/serializers.py
+1
-1
No files found.
apps/authentication/api/mfa.py
View file @
6fbc4ce4
...
...
@@ -30,9 +30,10 @@ class MFAChallengeApi(AuthMixin, CreateAPIView):
raise
errors
.
MFAFailedError
(
username
=
user
.
username
,
request
=
self
.
request
)
else
:
self
.
request
.
session
[
'auth_mfa'
]
=
'1'
except
errors
.
AuthFailedError
as
e
:
data
=
{
"error"
:
e
.
error
,
"msg"
:
e
.
reason
}
data
=
{
"error"
:
e
.
error
,
"msg"
:
e
.
msg
}
raise
ValidationError
(
data
)
def
create
(
self
,
request
,
*
args
,
**
kwargs
):
...
...
apps/authentication/errors.py
View file @
6fbc4ce4
...
...
@@ -128,12 +128,12 @@ class BlockLoginError(AuthFailedNeedBlockMixin, AuthFailedError):
class
SessionEmptyError
(
AuthFailedError
):
msg
=
session_empty_msg
error
=
'session_empty
_msg
'
error
=
'session_empty'
class
MFARequiredError
(
AuthFailedError
):
msg
=
mfa_required_msg
error
=
'mfa_required
_msg
'
error
=
'mfa_required'
def
as_data
(
self
):
return
{
...
...
@@ -146,12 +146,12 @@ class MFARequiredError(AuthFailedError):
class
LoginConfirmRequiredError
(
AuthFailedError
):
msg
=
login_confirm_required_msg
error
=
'login_confirm_required
_msg
'
error
=
'login_confirm_required'
class
LoginConfirmError
(
AuthFailedError
):
msg
=
login_confirm_wait_msg
error
=
'login_confirm_wait
_msg
'
error
=
'login_confirm_wait'
def
__init__
(
self
,
order_id
,
**
kwargs
):
self
.
order_id
=
order_id
...
...
@@ -167,14 +167,14 @@ class LoginConfirmError(AuthFailedError):
class
LoginConfirmWaitError
(
LoginConfirmError
):
msg
=
login_confirm_wait_msg
error
=
'login_confirm_wait
_msg
'
error
=
'login_confirm_wait'
class
LoginConfirmRejectedError
(
LoginConfirmError
):
msg
=
login_confirm_rejected_msg
error
=
'login_confirm_rejected
_msg
'
error
=
'login_confirm_rejected'
class
LoginConfirmOrderNotFound
(
LoginConfirmError
):
msg
=
login_confirm_order_not_found_msg
error
=
'login_confirm_order_not_found
_msg
'
error
=
'login_confirm_order_not_found'
apps/authentication/serializers.py
View file @
6fbc4ce4
...
...
@@ -60,7 +60,7 @@ class BearerTokenSerializer(serializers.Serializer):
class
MFAChallengeSerializer
(
serializers
.
Serializer
):
auth_
type
=
serializers
.
CharField
(
write_only
=
True
,
required
=
False
,
allow_blank
=
True
)
type
=
serializers
.
CharField
(
write_only
=
True
,
required
=
False
,
allow_blank
=
True
)
code
=
serializers
.
CharField
(
write_only
=
True
)
def
create
(
self
,
validated_data
):
...
...
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