Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
d80fec6e
J
jumpserver
项目概览
gjl2004yn
/
jumpserver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jumpserver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d80fec6e
编写于
12月 28, 2016
作者:
baltery
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update some api
上级
d56f030d
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
25 addition
and
16 deletion
+25
-16
apps/applications/api.py
apps/applications/api.py
+12
-5
apps/applications/hands.py
apps/applications/hands.py
+1
-1
apps/applications/models.py
apps/applications/models.py
+1
-1
apps/applications/urls/api_urls.py
apps/applications/urls/api_urls.py
+3
-2
apps/applications/views.py
apps/applications/views.py
+1
-0
apps/assets/urls/api_urls.py
apps/assets/urls/api_urls.py
+4
-4
apps/audits/urls/api_urls.py
apps/audits/urls/api_urls.py
+2
-2
apps/users/permissions.py
apps/users/permissions.py
+1
-1
未找到文件。
apps/applications/api.py
浏览文件 @
d80fec6e
...
...
@@ -12,7 +12,7 @@ from rest_framework.decorators import api_view
from
.models
import
Terminal
,
TerminalHeatbeat
from
.serializers
import
TerminalSerializer
,
TerminalHeatbeatSerializer
from
.hands
import
IsSuperUserOrAppUser
,
User
from
.hands
import
IsSuperUserOrAppUser
,
IsAppUser
,
User
from
common.utils
import
get_object_or_none
...
...
@@ -39,7 +39,8 @@ class TerminalRegisterView(ListCreateAPIView):
data
[
'access_key_secret'
]
=
access_key
.
secret
return
Response
(
data
,
status
=
201
)
else
:
return
Response
(
serializer
.
errors
,
status
=
400
)
data
=
{
'msg'
:
'Not valid'
,
'detail'
:
';'
.
join
(
serializer
.
errors
)}
return
Response
(
data
,
status
=
400
)
def
list
(
self
,
request
,
*
args
,
**
kwargs
):
return
Response
(
''
,
status
=
404
)
...
...
@@ -57,10 +58,16 @@ class TerminalViewSet(viewsets.ModelViewSet):
class
TerminalHeatbeatViewSet
(
viewsets
.
ModelViewSet
):
queryset
=
TerminalHeatbeat
.
objects
.
all
()
serializer_class
=
TerminalHeatbeatSerializer
permission_classes
=
(
Is
SuperUserOr
AppUser
,)
permission_classes
=
(
IsAppUser
,)
def
create
(
self
,
request
,
*
args
,
**
kwargs
):
terminal
=
request
.
user
terminal
=
request
.
user
.
terminal
TerminalHeatbeat
.
objects
.
create
(
terminal
=
terminal
)
return
Response
({
'msg'
:
'Success'
})
return
Response
({
'msg'
:
'Success'
},
status
=
201
)
class
TestHeatbeat
(
APIView
):
permission_classes
=
(
IsAppUser
,)
def
post
(
self
,
request
):
return
Response
({
'hello'
:
'world'
})
\ No newline at end of file
apps/applications/hands.py
浏览文件 @
d80fec6e
...
...
@@ -2,5 +2,5 @@
#
from
users.models
import
User
from
users.permissions
import
IsSuperUserOrAppUser
from
users.permissions
import
IsSuperUserOrAppUser
,
IsAppUser
from
audits.models
import
ProxyLog
\ No newline at end of file
apps/applications/models.py
浏览文件 @
d80fec6e
...
...
@@ -14,7 +14,7 @@ class Terminal(models.Model):
name
=
models
.
CharField
(
max_length
=
30
,
unique
=
True
,
verbose_name
=
_
(
'Name'
))
remote_addr
=
models
.
GenericIPAddressField
(
verbose_name
=
_
(
'Remote address'
),
blank
=
True
,
null
=
True
)
type
=
models
.
CharField
(
choices
=
TYPE_CHOICES
,
max_length
=
3
,
blank
=
True
,
verbose_name
=
_
(
'Terminal type'
))
user
=
models
.
OneToOneField
(
User
,
verbose_name
=
'Application user'
,
null
=
True
)
user
=
models
.
OneToOneField
(
User
,
related_name
=
'terminal'
,
verbose_name
=
'Application user'
,
null
=
True
)
url
=
models
.
CharField
(
max_length
=
100
,
blank
=
True
,
verbose_name
=
_
(
'URL to login'
))
is_accepted
=
models
.
BooleanField
(
default
=
False
,
verbose_name
=
'Is Accepted'
)
date_created
=
models
.
DateTimeField
(
auto_now_add
=
True
)
...
...
apps/applications/urls/api_urls.py
浏览文件 @
d80fec6e
...
...
@@ -10,11 +10,12 @@ from .. import api
app_name
=
'applications'
router
=
routers
.
DefaultRouter
()
router
.
register
(
r
'v1/terminal'
,
api
.
TerminalViewSet
,
'terminal'
)
router
.
register
(
r
'v1/terminal/heatbeat'
,
api
.
TerminalHeatbeatViewSet
,
'terminal-heatbeat'
)
router
.
register
(
r
'v1/terminal'
,
api
.
TerminalViewSet
,
'terminal'
)
urlpatterns
=
[
url
(
r
'v1/terminal/register$'
,
api
.
TerminalRegisterView
.
as_view
(),
name
=
'terminal-register'
)
url
(
r
'^v1/terminal/register/$'
,
api
.
TerminalRegisterView
.
as_view
(),
name
=
'terminal-register'
),
# url(r'^v1/terminal/heatbeat/$', api.TestHeatbeat.as_view())
]
urlpatterns
+=
router
.
urls
\ No newline at end of file
apps/applications/views.py
浏览文件 @
d80fec6e
...
...
@@ -51,6 +51,7 @@ class TerminalModelAccept(AdminUserRequiredMixin, JSONResponseMixin, UpdateView)
def
form_valid
(
self
,
form
):
terminal
=
form
.
save
()
terminal
.
is_accepted
=
True
terminal
.
is_active
=
True
terminal
.
save
()
data
=
{
'success'
:
True
,
...
...
apps/assets/urls/api_urls.py
浏览文件 @
d80fec6e
...
...
@@ -14,12 +14,12 @@ router.register(r'v1/admin-user', api.AdminUserViewSet, 'admin-user')
router
.
register
(
r
'v1/system-user'
,
api
.
SystemUserViewSet
,
'system-user'
)
urlpatterns
=
[
url
(
r
'^v1/assets_bulk$'
,
api
.
AssetListUpdateApi
.
as_view
(),
name
=
'asset-bulk-update'
),
url
(
r
'^v1/assets_bulk
/
$'
,
api
.
AssetListUpdateApi
.
as_view
(),
name
=
'asset-bulk-update'
),
# url(r'^v1/idc/(?P<pk>[0-9]+)/assets/$', api.IDCAssetsApi.as_view(), name='api-idc-assets'),
url
(
r
'^v1/system-user/auth'
,
api
.
SystemUserAuthApi
.
as_view
(),
name
=
'system-user-auth'
),
url
(
r
'^v1/assets/(?P<pk>\d+)/groups$'
,
url
(
r
'^v1/system-user/auth
/
'
,
api
.
SystemUserAuthApi
.
as_view
(),
name
=
'system-user-auth'
),
url
(
r
'^v1/assets/(?P<pk>\d+)/groups
/
$'
,
api
.
AssetUpdateGroupApi
.
as_view
(),
name
=
'asset-update-group'
),
url
(
r
'^v1/assets/(?P<pk>\d+)/system-users$'
,
url
(
r
'^v1/assets/(?P<pk>\d+)/system-users
/
$'
,
api
.
SystemUserUpdateApi
.
as_view
(),
name
=
'asset-update-systemusers'
),
]
...
...
apps/audits/urls/api_urls.py
浏览文件 @
d80fec6e
...
...
@@ -7,8 +7,8 @@ app_name = 'audits'
router
=
routers
.
DefaultRouter
()
router
.
register
(
r
'v1/proxy-log'
,
api
.
ProxyLogViewSet
,
'proxy-log'
)
router
.
register
(
r
'v1/command-log'
,
api
.
CommandLogViewSet
,
'command-log'
)
router
.
register
(
r
'v1/proxy-log
/
'
,
api
.
ProxyLogViewSet
,
'proxy-log'
)
router
.
register
(
r
'v1/command-log
/
'
,
api
.
CommandLogViewSet
,
'command-log'
)
urlpatterns
=
router
.
urls
apps/users/permissions.py
浏览文件 @
d80fec6e
...
...
@@ -28,7 +28,7 @@ class IsAppUser(IsValidUser, permissions.BasePermission):
def
has_permission
(
self
,
request
,
view
):
return
super
(
IsAppUser
,
self
).
has_permission
(
request
,
view
)
\
and
request
.
user
.
is_app
()
and
request
.
user
.
is_app
class
IsSuperUser
(
IsValidUser
,
permissions
.
BasePermission
):
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录