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
c5438fd6
Unverified
Commit
c5438fd6
authored
Nov 20, 2019
by
老广
Committed by
GitHub
Nov 20, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3445 from jumpserver/dev
Dev
parents
09466457
61a8d6a5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
8 deletions
+14
-8
base.py
apps/assets/backends/base.py
+7
-5
terminal.py
apps/terminal/api_v2/terminal.py
+7
-0
terminal.py
apps/terminal/serializers_v2/terminal.py
+0
-3
No files found.
apps/assets/backends/base.py
View file @
c5438fd6
...
...
@@ -38,6 +38,9 @@ class AssetUserQuerySet(list):
if
len
(
v
)
==
0
:
return
self
if
k
.
find
(
"__in"
)
>=
0
:
_k
=
k
.
split
(
'__'
)[
0
]
in_kwargs
[
_k
]
=
v
else
:
in_kwargs
[
k
]
=
v
for
k
in
in_kwargs
:
kwargs
.
pop
(
k
)
...
...
@@ -45,17 +48,16 @@ class AssetUserQuerySet(list):
if
len
(
in_kwargs
)
==
0
:
return
self
for
i
in
self
:
matched
=
Tru
e
matched
=
Fals
e
for
k
,
v
in
in_kwargs
.
items
():
key
=
k
.
split
(
'__'
)[
0
]
attr
=
getattr
(
i
,
key
,
None
)
attr
=
getattr
(
i
,
k
,
None
)
# 如果属性或者value中是uuid,则转换成string
if
isinstance
(
v
[
0
],
uuid
.
UUID
):
v
=
[
str
(
i
)
for
i
in
v
]
if
isinstance
(
attr
,
uuid
.
UUID
):
attr
=
str
(
attr
)
if
attr
not
in
v
:
matched
=
Fals
e
if
v
in
attr
:
matched
=
Tru
e
if
matched
:
queryset
.
append
(
i
)
return
AssetUserQuerySet
(
queryset
)
...
...
apps/terminal/api_v2/terminal.py
View file @
c5438fd6
...
...
@@ -3,6 +3,7 @@
from
rest_framework
import
viewsets
,
generics
from
rest_framework
import
status
from
rest_framework.response
import
Response
from
django.conf
import
settings
from
common.permissions
import
IsSuperUser
,
WithBootstrapToken
...
...
@@ -17,6 +18,9 @@ class TerminalViewSet(viewsets.ModelViewSet):
queryset
=
Terminal
.
objects
.
filter
(
is_deleted
=
False
)
serializer_class
=
serializers
.
TerminalSerializer
permission_classes
=
[
IsSuperUser
]
http_method_names
=
[
'get'
,
'put'
,
'patch'
,
'delete'
,
'head'
,
'options'
,
'trace'
]
class
TerminalRegistrationApi
(
generics
.
CreateAPIView
):
...
...
@@ -29,6 +33,9 @@ class TerminalRegistrationApi(generics.CreateAPIView):
serializer
=
serializers
.
TerminalSerializer
(
data
=
data
,
context
=
{
'request'
:
request
}
)
if
not
settings
.
SECURITY_SERVICE_ACCOUNT_REGISTRATION
:
data
=
{
"error"
:
"service account registration disabled"
}
return
Response
(
data
=
data
,
status
=
status
.
HTTP_400_BAD_REQUEST
)
serializer
.
is_valid
(
raise_exception
=
True
)
terminal
=
serializer
.
save
()
sa_serializer
=
serializer
.
sa_serializer_class
(
instance
=
terminal
.
user
)
...
...
apps/terminal/serializers_v2/terminal.py
View file @
c5438fd6
...
...
@@ -28,9 +28,6 @@ class TerminalSerializer(serializers.ModelSerializer):
valid
=
super
()
.
is_valid
(
raise_exception
=
raise_exception
)
if
not
valid
:
return
valid
if
not
settings
.
SECURITY_SERVICE_ACCOUNT_REGISTRATION
:
error
=
{
"error"
:
"service account registration disabled"
}
raise
serializers
.
ValidationError
(
error
)
data
=
{
'name'
:
self
.
validated_data
.
get
(
'name'
)}
kwargs
=
{
'data'
:
data
}
if
self
.
instance
and
self
.
instance
.
user
:
...
...
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