diff --git a/apps/applications/api.py b/apps/applications/api.py index d30f9667c..9cc75ca8a 100644 --- a/apps/applications/api.py +++ b/apps/applications/api.py @@ -95,9 +95,6 @@ class TerminateConnectionView(APIView): proxy_log_id = d.get('proxy_log_id') proxy_log = get_object_or_404(ProxyLog, id=proxy_log_id) terminal_id = proxy_log.terminal - proxy_log.is_finished = True - proxy_log.date_finished = timezone.now() - proxy_log.save() if terminal_id in tasks: tasks[terminal_id].append({'name': 'kill_proxy', 'proxy_log_id': proxy_log_id}) diff --git a/apps/applications/templates/applications/terminal_list.html b/apps/applications/templates/applications/terminal_list.html index 33a04c009..9574d72d5 100644 --- a/apps/applications/templates/applications/terminal_list.html +++ b/apps/applications/templates/applications/terminal_list.html @@ -29,7 +29,7 @@ {% trans 'Name' %} {% trans 'IP' %} {% trans 'Type' %} - {% trans 'proxy online' %} + {% trans 'Session online' %} {% trans 'Active' %} {% trans 'Alive' %} {% trans 'Action' %} diff --git a/apps/audits/api.py b/apps/audits/api.py index 302fc3a69..d8a7b21de 100644 --- a/apps/audits/api.py +++ b/apps/audits/api.py @@ -90,8 +90,3 @@ class RecordLogViewSet(BulkModelViewSet): else: return record_store.all() - - - - - diff --git a/apps/audits/templates/audits/command_log_list.html b/apps/audits/templates/audits/command_log_list.html index 3ed7d5d0b..04bb976fb 100644 --- a/apps/audits/templates/audits/command_log_list.html +++ b/apps/audits/templates/audits/command_log_list.html @@ -23,18 +23,18 @@
- {% for u in user_list %} - + {% endfor %}
- {% for a in asset_list %} - + {% endfor %}
diff --git a/apps/audits/templates/audits/proxy_log_detail.html b/apps/audits/templates/audits/proxy_log_detail.html index 909d66fe6..0fa28b517 100644 --- a/apps/audits/templates/audits/proxy_log_detail.html +++ b/apps/audits/templates/audits/proxy_log_detail.html @@ -1,6 +1,7 @@ {% extends 'base.html' %} {% load static %} {% load i18n %} +{% load common_tags %} {% block custom_head_css_js %} diff --git a/apps/audits/templates/audits/proxy_log_offline_list.html b/apps/audits/templates/audits/proxy_log_offline_list.html index 6a3c815b0..ffe695662 100644 --- a/apps/audits/templates/audits/proxy_log_offline_list.html +++ b/apps/audits/templates/audits/proxy_log_offline_list.html @@ -24,16 +24,16 @@
@@ -68,7 +68,7 @@ {% trans 'Command' %} {% trans 'Success' %} {% trans 'Finished' %} - {% trans 'R/M' %} + {% trans 'Play' %} {% trans 'Date start' %} {% trans 'Time' %} {% endblock %} @@ -113,20 +113,6 @@ {% endfor %} {% endblock %} -{% block content_bottom_left %} -
-
- -
- -
-
-
-{% endblock %} {% block custom_foot_js %} diff --git a/apps/audits/templates/audits/proxy_log_online_list.html b/apps/audits/templates/audits/proxy_log_online_list.html index 6a3c815b0..500fe68b3 100644 --- a/apps/audits/templates/audits/proxy_log_online_list.html +++ b/apps/audits/templates/audits/proxy_log_online_list.html @@ -24,16 +24,16 @@
@@ -68,7 +68,7 @@ {% trans 'Command' %} {% trans 'Success' %} {% trans 'Finished' %} - {% trans 'R/M' %} + {% trans 'Monitor' %} {% trans 'Date start' %} {% trans 'Time' %} {% endblock %} diff --git a/apps/audits/views.py b/apps/audits/views.py index 33762c25b..de7cc9421 100644 --- a/apps/audits/views.py +++ b/apps/audits/views.py @@ -3,7 +3,6 @@ import time from datetime import datetime -import pytz from django.views.generic import ListView, UpdateView, DeleteView, DetailView, TemplateView from django.views.generic.edit import SingleObjectMixin from django.utils.translation import ugettext as _ @@ -25,7 +24,7 @@ class ProxyLogListView(AdminUserRequiredMixin, ListView): template_name = 'audits/proxy_log_online_list.html' context_object_name = 'proxy_log_list' paginate_by = settings.CONFIG.DISPLAY_PER_PAGE - keyword = user = asset = system_user = date_from_s = date_to_s = '' + keyword = username = hostname = system_user = date_from_s = date_to_s = '' ordering = ['is_finished', '-id'] date_format = '%m/%d/%Y' @@ -37,8 +36,8 @@ class ProxyLogListView(AdminUserRequiredMixin, ListView): self.queryset = super(ProxyLogListView, self).get_queryset() self.keyword = self.request.GET.get('keyword', '') - self.user = self.request.GET.get('user') - self.asset = self.request.GET.get('asset') + self.username = self.request.GET.get('username') + self.ip = self.request.GET.get('ip') self.system_user = self.request.GET.get('system_user') self.date_from_s = self.request.GET.get('date_from', date_from_default) self.date_to_s = self.request.GET.get('date_to', date_to_default) @@ -53,10 +52,10 @@ class ProxyLogListView(AdminUserRequiredMixin, ListView): self.date_to_s + ' 23:59:59', '%m/%d/%Y %H:%M:%S') date_to = date_to.replace(tzinfo=timezone.get_current_timezone()) filter_kwargs['date_start__lt'] = date_to - if self.user: - filter_kwargs['user'] = self.user - if self.asset: - filter_kwargs['asset'] = self.asset + if self.username: + filter_kwargs['user'] = self.username + if self.ip: + filter_kwargs['ip'] = self.ip if self.system_user: filter_kwargs['system_user'] = self.system_user if self.keyword: @@ -81,8 +80,8 @@ class ProxyLogListView(AdminUserRequiredMixin, ListView): 'keyword': self.keyword, 'date_from': self.date_from_s, 'date_to': self.date_to_s, - 'user': self.user, - 'asset': self.asset, + 'username': self.username, + 'ip': self.ip, 'system_user': self.system_user, } kwargs.update(context) @@ -90,7 +89,7 @@ class ProxyLogListView(AdminUserRequiredMixin, ListView): class ProxyLogOfflineListView(ProxyLogListView): - template_name = 'audits/proxy_log_online_list.html' + template_name = 'audits/proxy_log_offline_list.html' def get_queryset(self): queryset = super(ProxyLogOfflineListView, self).get_queryset() @@ -163,7 +162,7 @@ class CommandLogListView(AdminUserRequiredMixin, ListView): template_name = 'audits/command_log_list.html' paginate_by = settings.CONFIG.DISPLAY_PER_PAGE context_object_name = 'command_list' - user = asset = system_user = command = date_from_s = date_to_s = '' + username = ip = system_user = command = date_from_s = date_to_s = '' date_format = '%m/%d/%Y' ordering = ['-id'] @@ -173,8 +172,8 @@ class CommandLogListView(AdminUserRequiredMixin, ListView): date_from_default = (date_now - timezone.timedelta(7)) \ .strftime(self.date_format) self.command = self.request.GET.get('command', '') - self.user = self.request.GET.get('user') - self.asset = self.request.GET.get('asset') + self.username = self.request.GET.get('username') + self.ip = self.request.GET.get('ip') self.system_user = self.request.GET.get('system_user') self.date_from_s = \ self.request.GET.get('date_from', date_from_default) @@ -194,10 +193,10 @@ class CommandLogListView(AdminUserRequiredMixin, ListView): .replace(tzinfo=timezone.get_current_timezone()) date_to_ts = time.mktime(date_to.timetuple()) filter_kwargs['date_to_ts'] = date_to_ts - if self.user: - filter_kwargs['user'] = self.user - if self.asset: - filter_kwargs['asset'] = self.asset + if self.username: + filter_kwargs['user'] = self.username + if self.ip: + filter_kwargs['asset'] = self.ip if self.system_user: filter_kwargs['system_user'] = self.system_user if self.command: @@ -215,8 +214,8 @@ class CommandLogListView(AdminUserRequiredMixin, ListView): 'command': self.command, 'date_from': self.date_from_s, 'date_to': self.date_to_s, - 'user': self.user, - 'asset': self.asset, + 'username': self.username, + 'ip': self.ip, 'system_user': self.system_user, } kwargs.update(context) diff --git a/apps/templates/_footer.html b/apps/templates/_footer.html index c43bda248..d0ef4c5b0 100644 --- a/apps/templates/_footer.html +++ b/apps/templates/_footer.html @@ -3,6 +3,6 @@ Version 0.4.0 GPL.
- Copyright Jumpserver.org Team © 2014-2016 + Copyright Jumpserver.org Team © 2014-2017
\ No newline at end of file diff --git a/apps/templates/_nav.html b/apps/templates/_nav.html index 6b89cd330..078229c39 100644 --- a/apps/templates/_nav.html +++ b/apps/templates/_nav.html @@ -56,11 +56,11 @@
  • {% trans 'Audits' %}
    • -
  • - - {% trans 'File' %} - - -
    • -
  • - - {% trans 'Settings' %} - -
    • +{#
  • #} +{# #} +{# {% trans 'File' %}#} +{# #} +{# #} +{#
    • #} +{#
  • #} +{# #} +{# {% trans 'Settings' %}#} +{# #} +{#
    • #}
  • {% trans 'Visit us' %}