Merge pull request #1175 from jumpserver/dev

支持sftp

apps/assets/templates/assets/asset_list.html

@@ -182,7 +182,6 @@ function initTable() {
     return asset_table
 }
 
-
 function addTreeNode() {
 	hideRMenu();
 	var parentNode = zTree.getSelectedNodes()[0];
@@ -238,7 +237,6 @@ function editTreeNode() {
     zTree.editName(current_node);
 }
 
-
 function OnRightClick(event, treeId, treeNode) {
     if (!treeNode && event.target.tagName.toLowerCase() !== "button" && $(event.target).parents("a").length === 0) {
 		zTree.cancelSelectedNode();
@@ -432,6 +430,11 @@ $(document).ready(function(){
 .on('click', '.btn_export', function () {
     var $data_table = $('#asset_list_table').DataTable();
     var rows = $data_table.rows('.selected').data();
+    var nodes = zTree.getSelectedNodes();
+    var current_node;
+    if (nodes && nodes.length === 1) {
+        current_node = nodes[0];
+    }
     var assets = [];
     $.each(rows, function (index, obj) {
         assets.push(obj.id)
@@ -439,7 +442,7 @@ $(document).ready(function(){
     $.ajax({
         url: "{% url "assets:asset-export" %}",
         method: 'POST',
-        data: JSON.stringify({assets_id: assets}),
+        data: JSON.stringify({assets_id: assets, node_id: current_node.id}),
         dataType: "json",
         success: function (data, textStatus) {
             window.open(data.redirect)

apps/assets/views/asset.py

@@ -233,8 +233,16 @@ class AssetExportView(View):
     def post(self, request, *args, **kwargs):
         try:
             assets_id = json.loads(request.body).get('assets_id', [])
+            assets_node_id = json.loads(request.body).get('node_id', None)
         except ValueError:
             return HttpResponse('Json object not valid', status=400)
+
+        if not assets_id and assets_node_id:
+            assets_node = get_object_or_none(Node, id=assets_node_id)
+            assets = assets_node.get_all_assets()
+            for asset in assets:
+                assets_id.append(asset.id)
+
         spm = uuid.uuid4().hex
         cache.set(spm, assets_id, 300)
         url = reverse_lazy('assets:asset-export') + '?spm=%s' % spm

apps/audits/admin.py

+from django.contrib import admin
+
+# Register your models here.

apps/audits/api.py

+# -*- coding: utf-8 -*-
+#
+
+from rest_framework import viewsets
+
+from common.permissions import IsSuperUserOrAppUser
+from .models import FTPLog
+from .serializers import FTPLogSerializer
+
+
+class FTPLogViewSet(viewsets.ModelViewSet):
+    queryset = FTPLog.objects.all()
+    serializer_class = FTPLogSerializer
+    permission_classes = (IsSuperUserOrAppUser,)

apps/audits/apps.py

+from django.apps import AppConfig
+
+
+class AuditsConfig(AppConfig):
+    name = 'audits'

apps/audits/models.py

+import uuid
+
+from django.db import models
+from django.utils.translation import ugettext_lazy as _
+
+
+class FTPLog(models.Model):
+    id = models.UUIDField(default=uuid.uuid4, primary_key=True)
+    user = models.CharField(max_length=128, verbose_name=_('User'))
+    remote_addr = models.CharField(max_length=15, verbose_name=_("Remote addr"), blank=True, null=True)
+    asset = models.CharField(max_length=1024, verbose_name=_("Asset"))
+    system_user = models.CharField(max_length=128, verbose_name=_("System user"))
+    operate = models.CharField(max_length=16, verbose_name=_("Operate"))
+    filename = models.CharField(max_length=1024, verbose_name=_("Filename"))
+    is_success = models.BooleanField(default=True, verbose_name=_("Success"))
+    date_start = models.DateTimeField(auto_now_add=True)

apps/audits/serializers.py

+# -*- coding: utf-8 -*-
+#
+
+from rest_framework import serializers
+
+from .models import FTPLog
+
+
+class FTPLogSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = FTPLog
+        fields = '__all__'

apps/audits/templates/audits/ftp_log_list.html

+{% extends '_base_list.html' %}
+{% load i18n %}
+{% load static %}
+{% load terminal_tags %}
+{% load common_tags %}
+{% block custom_head_css_js %}
+    <link href="{% static 'css/plugins/datepicker/datepicker3.css' %}" rel="stylesheet">
+    <link href="{% static 'css/plugins/select2/select2.min.css' %}" rel="stylesheet">
+    <script src="{% static 'js/plugins/select2/select2.full.min.js' %}"></script>
+    <style>
+        #search_btn {
+            margin-bottom: 0;
+        }
+    </style>
+{% endblock %}
+
+{% block content_left_head %}
+{% endblock %}
+
+
+{% block table_search %}
+    <form id="search_form" method="get" action="" class="pull-right form-inline">
+        <div class="form-group" id="date">
+            <div class="input-daterange input-group" id="datepicker">
+                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                <input type="text" class="input-sm form-control" style="width: 100px;" name="date_from" value="{{ date_from|date:'Y-m-d' }}">
+                <span class="input-group-addon">to</span>
+                <input type="text" class="input-sm form-control" style="width: 100px;" name="date_to" value="{{ date_to|date:'Y-m-d' }}">
+            </div>
+        </div>
+        <div class="input-group">
+            <select class="select2 form-control" name="user">
+                <option value="">{% trans 'User' %}</option>
+                {% for u in user_list %}
+                    <option value="{{ u }}" {% if u == user %} selected {% endif %}>{{ u }}</option>
+                {% endfor %}
+            </select>
+        </div>
+        <div class="input-group">
+            <select class="select2 form-control" name="asset">
+                <option value="">{% trans 'Asset' %}</option>
+                {% for a in asset_list %}
+                    <option value="{{ a }}" {% if a == asset %} selected {% endif %}>{{ a }}</option>
+                {% endfor %}
+            </select>
+        </div>
+        <div class="input-group">
+            <select class="select2 form-control" name="system_user">
+                <option value="">{% trans 'System user' %}</option>
+                {% for su in system_user_list %}
+                    <option value="{{ su }}" {% if su == system_user %} selected {% endif %}>{{ su }}</option>
+                {% endfor %}
+            </select>
+        </div>
+        <div class="input-group">
+            <input type="text" class="form-control input-sm" name="filename" placeholder="{% trans 'Filename' %}" value="{{ filename }}">
+        </div>
+        <div class="input-group">
+            <div class="input-group-btn">
+                <button id='search_btn' type="submit" class="btn btn-sm btn-primary">
+                    搜索
+                </button>
+            </div>
+        </div>
+    </form>
+{% endblock %}
+
+{% block table_head %}
+    <th class="text-center"></th>
+{#    <th class="text-center">{% trans 'ID' %}</th>#}
+    <th class="text-center">{% trans 'User' %}</th>
+    <th class="text-center">{% trans 'Asset' %}</th>
+    <th class="text-center">{% trans 'System user' %}</th>
+    <th class="text-center">{% trans 'Remote addr' %}</th>
+    <th class="text-center">{% trans 'Operate' %}</th>
+    <th class="text-center">{% trans 'Filename' %}</th>
+    <th class="text-center">{% trans 'Success' %}</th>
+    <th class="text-center">{% trans 'Date start' %}</th>
+{#    <th class="text-center">{% trans 'Action' %}</th>#}
+{% endblock %}
+
+{% block table_body %}
+    {% for object in object_list %}
+        <tr class="gradeX">
+            <td class="text-center"><input type="checkbox" value="{{ object.id }}"></td>
+{#            <td class="text-center">#}
+{#                <a href="{% url 'terminal:object-detail' pk=object.id %}">{{ forloop.counter }}</a>#}
+{#            </td>#}
+            <td class="text-center">{{ object.user }}</td>
+            <td class="text-center">{{ object.asset }}</td>
+            <td class="text-center">{{ object.system_user }}</td>
+            <td class="text-center">{{ object.remote_addr|default:"" }}</td>
+            <td class="text-center">{{ object.operate }}</td>
+            <td class="text-center">{{ object.filename }}</td>
+            <td class="text-center">
+                {% if object.is_success %}
+                    <i class="fa fa-check text-navy"></i>
+                {% else %}
+                    <i class="fa fa-times text-danger"></i>
+                {% endif %}
+            </td>
+            <td class="text-center">{{ object.date_start }}</td>
+        </tr>
+    {% endfor %}
+{% endblock %}
+
+{% block content_bottom_left %}
+{% endblock %}
+
+{% block custom_foot_js %}
+    <script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"></script>
+    <script>
+        $(document).ready(function() {
+            $('table').DataTable({
+                "searching": false,
+                "paging": false,
+                "bInfo" : false,
+                "order": []
+            });
+            $('.select2').select2({
+                dropdownAutoWidth: true,
+                width: "auto"
+            });
+            $('.input-daterange.input-group').datepicker({
+                format: "yyyy-mm-dd",
+                todayBtn: "linked",
+                keyboardNavigation: false,
+                forceParse: false,
+                calendarWeeks: true,
+                autoclose: true
+            });
+        })
+    </script>
+{% endblock %}
+

apps/audits/tests.py

+from django.test import TestCase
+
+# Create your tests here.

apps/audits/urls/api_urls.py

+# ~*~ coding: utf-8 ~*~
+from __future__ import unicode_literals
+
+from django.conf.urls import url
+from rest_framework.routers import DefaultRouter
+from .. import api
+
+
+app_name = "audits"
+
+router = DefaultRouter()
+router.register(r'v1/ftp-log', api.FTPLogViewSet, 'ftp-log')
+
+urlpatterns = [
+#    url(r'^v1/celery/task/(?P<pk>[0-9a-zA-Z\-]{36})/log/$', api.CeleryTaskLogApi.as_view(), name='celery-task-log'),
+]
+
+urlpatterns += router.urls

apps/audits/urls/view_urls.py

+# ~*~ coding: utf-8 ~*~
+from __future__ import unicode_literals
+
+
+from django.conf.urls import url
+from .. import views
+
+__all__ = ["urlpatterns"]
+
+app_name = "audits"
+
+urlpatterns = [
+    url(r'^ftp-log/$', views.FTPLogListView.as_view(), name='ftp-log-list'),
+]

apps/audits/views.py

+from django.conf import settings
+from django.views.generic import ListView
+from django.utils.translation import ugettext as _
+
+from common.mixins import AdminUserRequiredMixin, DatetimeSearchMixin
+
+from .models import FTPLog
+
+
+class FTPLogListView(AdminUserRequiredMixin, DatetimeSearchMixin, ListView):
+    model = FTPLog
+    template_name = 'audits/ftp_log_list.html'
+    paginate_by = settings.DISPLAY_PER_PAGE
+    user = asset = system_user = filename = ''
+    date_from = date_to = None
+
+    def get_queryset(self):
+        self.queryset = super().get_queryset()
+        self.user = self.request.GET.get('user')
+        self.asset = self.request.GET.get('asset')
+        self.system_user = self.request.GET.get('system_user')
+        self.filename = self.request.GET.get('filename', '')
+
+        filter_kwargs = dict()
+        filter_kwargs['date_start__gt'] = self.date_from
+        filter_kwargs['date_start__lt'] = self.date_to
+        if self.user:
+            filter_kwargs['user'] = self.user
+        if self.asset:
+            filter_kwargs['asset'] = self.asset
+        if self.system_user:
+            filter_kwargs['system_user'] = self.system_user
+        if self.filename:
+            filter_kwargs['filename__contains'] = self.filename
+        if filter_kwargs:
+            self.queryset = self.queryset.filter(**filter_kwargs).order_by('-date_start')
+        return self.queryset
+
+    def get_context_data(self, **kwargs):
+        context = {
+            'user_list': FTPLog.objects.values_list('user', flat=True).distinct(),
+            'asset_list': FTPLog.objects.values_list('asset', flat=True).distinct(),
+            'system_user_list': FTPLog.objects.values_list('system_user', flat=True).distinct(),
+            'date_from': self.date_from,
+            'date_to': self.date_to,
+            'user': self.user,
+            'asset': self.asset,
+            'system_user': self.system_user,
+            'filename': self.filename,
+            "app": _("Audits"),
+            "action": _("FTP log"),
+        }
+        kwargs.update(context)
+        return super().get_context_data(**kwargs)

apps/jumpserver/settings.py

@@ -62,6 +62,7 @@ INSTALLED_APPS = [
     'ops.apps.OpsConfig',
     'common.apps.CommonConfig',
     'terminal.apps.TerminalConfig',
+    'audits.apps.AuditsConfig',
     'rest_framework',
     'rest_framework_swagger',
     'django_filters',

apps/jumpserver/urls.py

@@ -19,6 +19,7 @@ urlpatterns = [
     url(r'^perms/', include('perms.urls.views_urls', namespace='perms')),
     url(r'^terminal/', include('terminal.urls.views_urls', namespace='terminal')),
     url(r'^ops/', include('ops.urls.view_urls', namespace='ops')),
+    url(r'^audits/', include('audits.urls.view_urls', namespace='audits')),
     url(r'^settings/', include('common.urls.view_urls', namespace='settings')),
     url(r'^common/', include('common.urls.view_urls', namespace='common')),
 
@@ -28,6 +29,7 @@ urlpatterns = [
     url(r'^api/perms/', include('perms.urls.api_urls', namespace='api-perms')),
     url(r'^api/terminal/', include('terminal.urls.api_urls', namespace='api-terminal')),
     url(r'^api/ops/', include('ops.urls.api_urls', namespace='api-ops')),
+    url(r'^api/audits/', include('audits.urls.api_urls', namespace='api-audits')),
     url(r'^api/common/', include('common.urls.api_urls', namespace='api-common')),
 
     # External apps url

apps/templates/_nav.html

@@ -59,6 +59,14 @@
         <li id="task"><a href="{% url 'ops:task-list' %}">{% trans 'Task list' %}</a></li>
     </ul>
 </li>
+<li id="audits">
+    <a>
+        <i class="fa fa-coffee" style="width: 14px"></i> <span class="nav-label">{% trans 'Audits' %}</span><span class="fa arrow"></span>
+    </a>
+    <ul class="nav nav-second-level">
+        <li id="ftp-log"><a href="{% url 'audits:ftp-log-list' %}">{% trans 'FTP log' %}</a></li>
+    </ul>
+</li>
 {#<li id="">#}
 {#    <a href="#">#}
 {#        <i class="fa fa-download"></i> <span class="nav-label">{% trans 'File' %}</span><span class="fa arrow"></span>#}

apps/terminal/views/command.py

@@ -38,7 +38,7 @@ class CommandListView(DatetimeSearchMixin, AdminUserRequiredMixin, ListView):
         if self.system_user:
             filter_kwargs['system_user'] = self.system_user
         if self.command:
-            filter_kwargs['input'] = self.command
+            filter_kwargs['input__contains'] = self.command
         queryset = common_storage.filter(**filter_kwargs)
         return queryset