github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'audits' of code.jumpserver.org:Jumpserver/jumpserver into audits

pull/530/head
ibuler 2016-11-09 19:29:26 +08:00
parent 8d7759d22f 0d4d64c274
commit c5d625e261
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/audits/api.py
View File

@ -3,14 +3,14 @@
from __future__ import absolute_import, unicode_literals from __future__ import absolute_import, unicode_literals
from rest_framework import generics from rest_framework import generics, viewsets
from rest_framework.views import APIView, Response from rest_framework.views import APIView, Response
from . import models, serializers from . import models, serializers
from .hands import IsSuperUserOrTerminalUser, Terminal from .hands import IsSuperUserOrTerminalUser, Terminal
class ProxyLogListCreateApi(generics.ListCreateAPIView): class ProxyLogViewSet(viewsets.ModelViewSet):
"""User proxy to backend server need call this api. """User proxy to backend server need call this api.
params: { params: {
@ -34,18 +34,8 @@ class ProxyLogListCreateApi(generics.ListCreateAPIView):
serializer_class = serializers.ProxyLogSerializer serializer_class = serializers.ProxyLogSerializer
permission_classes = (IsSuperUserOrTerminalUser,) permission_classes = (IsSuperUserOrTerminalUser,)
def perform_create(self, serializer):
# Todo: May be save log_file
super(ProxyLogListCreateApi, self).perform_create(serializer)
class CommandLogViewSet(viewsets.ModelViewSet):
class ProxyLogDetailApi(generics.RetrieveUpdateDestroyAPIView):
queryset = models.ProxyLog.objects.all()
serializer_class = serializers.ProxyLogSerializer
permission_classes = (IsSuperUserOrTerminalUser,)
class CommandLogListCreateApi(generics.ListCreateAPIView):
queryset = models.CommandLog.objects.all() queryset = models.CommandLog.objects.all()
serializer_class = serializers.CommandLogSerializer serializer_class = serializers.CommandLogSerializer
permission_classes = (IsSuperUserOrTerminalUser,) permission_classes = (IsSuperUserOrTerminalUser,)

10
apps/audits/urls.py
View File

@ -1,5 +1,6 @@
from django.conf.urls import url from django.conf.urls import url
from rest_framework import routers
import api import api
import views import views
@ -13,9 +14,8 @@ urlpatterns = [
url(r'^command-log$', views.CommandLogListView.as_view(), name='command-log-list'), url(r'^command-log$', views.CommandLogListView.as_view(), name='command-log-list'),
] ]
router = routers.DefaultRouter()
router.register(r'v1/proxy-log', api.ProxyLogViewSet, 'api-proxy-log')
router.register(r'v1/command-log', api.CommandLogViewSet, 'api-command-log')
urlpatterns += [ urlpatterns += router.urls
url(r'^v1/proxy-log/$', api.ProxyLogListCreateApi.as_view(), name='proxy-log-list-create-api'),
url(r'^v1/proxy-log/(?P<pk>\d+)/$', api.ProxyLogDetailApi.as_view(), name='proxy-log-detail-api'),
url(r'^v1/command-log/$', api.CommandLogListCreateApi.as_view(), name='command-log-create-list-api'),
]