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
183ff095
Commit
183ff095
authored
Aug 01, 2018
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Update] 修改token返回
parent
8386f107
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
api.py
apps/users/api.py
+9
-1
hands.py
apps/users/hands.py
+1
-0
No files found.
apps/users/api.py
View file @
183ff095
...
@@ -3,6 +3,7 @@ import uuid
...
@@ -3,6 +3,7 @@ import uuid
from
django.core.cache
import
cache
from
django.core.cache
import
cache
from
django.urls
import
reverse
from
django.urls
import
reverse
from
django.shortcuts
import
get_object_or_404
from
django.utils.translation
import
ugettext
as
_
from
django.utils.translation
import
ugettext
as
_
from
rest_framework
import
generics
from
rest_framework
import
generics
...
@@ -20,6 +21,7 @@ from .permissions import IsSuperUser, IsValidUser, IsCurrentUserOrReadOnly, \
...
@@ -20,6 +21,7 @@ from .permissions import IsSuperUser, IsValidUser, IsCurrentUserOrReadOnly, \
IsSuperUserOrAppUser
IsSuperUserOrAppUser
from
.utils
import
check_user_valid
,
generate_token
,
get_login_ip
,
\
from
.utils
import
check_user_valid
,
generate_token
,
get_login_ip
,
\
check_otp_code
,
set_user_login_failed_count_to_cache
,
is_block_login
check_otp_code
,
set_user_login_failed_count_to_cache
,
is_block_login
from
.hands
import
Asset
,
SystemUser
from
common.mixins
import
IDInFilterMixin
from
common.mixins
import
IDInFilterMixin
from
common.utils
import
get_logger
from
common.utils
import
get_logger
...
@@ -305,10 +307,16 @@ class UserConnectionTokenApi(APIView):
...
@@ -305,10 +307,16 @@ class UserConnectionTokenApi(APIView):
asset_id
=
request
.
data
.
get
(
'asset'
,
''
)
asset_id
=
request
.
data
.
get
(
'asset'
,
''
)
system_user_id
=
request
.
data
.
get
(
'system_user'
,
''
)
system_user_id
=
request
.
data
.
get
(
'system_user'
,
''
)
token
=
str
(
uuid
.
uuid4
())
token
=
str
(
uuid
.
uuid4
())
user
=
get_object_or_404
(
User
,
id
=
user_id
)
asset
=
get_object_or_404
(
Asset
,
id
=
asset_id
)
system_user
=
get_object_or_404
(
SystemUser
,
id
=
system_user_id
)
value
=
{
value
=
{
'user'
:
user_id
,
'user'
:
user_id
,
'username'
:
user
.
username
,
'asset'
:
asset_id
,
'asset'
:
asset_id
,
'system_user'
:
system_user_id
'hostname'
:
asset
.
hostname
,
'system_user'
:
system_user_id
,
'system_user_name'
:
system_user
.
name
}
}
cache
.
set
(
token
,
value
,
timeout
=
20
)
cache
.
set
(
token
,
value
,
timeout
=
20
)
return
Response
({
"token"
:
token
},
status
=
201
)
return
Response
({
"token"
:
token
},
status
=
201
)
...
...
apps/users/hands.py
View file @
183ff095
...
@@ -15,3 +15,4 @@
...
@@ -15,3 +15,4 @@
# from users.models import User
# from users.models import User
# from perms.models import AssetPermission
# from perms.models import AssetPermission
# from perms.utils import get_user_granted_assets, get_user_granted_asset_groups
# from perms.utils import get_user_granted_assets, get_user_granted_asset_groups
from
assets.models
import
Asset
,
SystemUser
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