diff --git a/apps/assets/templates/assets/system_user_detail.html b/apps/assets/templates/assets/system_user_detail.html
index 68b00a0e8..4367b1c3a 100644
--- a/apps/assets/templates/assets/system_user_detail.html
+++ b/apps/assets/templates/assets/system_user_detail.html
@@ -23,6 +23,9 @@
{% trans 'Associate assets and asset groups' %}
+
+ Update
+
diff --git a/apps/assets/urls.py b/apps/assets/urls.py
index 50c4669cb..825b3e4ab 100644
--- a/apps/assets/urls.py
+++ b/apps/assets/urls.py
@@ -64,10 +64,10 @@ urlpatterns = [
]
urlpatterns += [
- #json
url(r'^v1/assets/$', api.AssetViewSet.as_view({'get':'list'}), name='assets-list-api'),
url(r'^v1/assets_bulk/$', api.AssetListUpdateApi.as_view(), name='asset-bulk-update-api'),
url(r'^v1/idc/$', api.IDCViewSet.as_view({'get':'list'}), name='idc-list-json'),
+ url(r'^v1/system-user/auth/', api.SystemUserAuthApi.as_view(), name='system-user-auth'),
]
diff --git a/apps/assets/views.py b/apps/assets/views.py
index f0b91c195..f15612de8 100644
--- a/apps/assets/views.py
+++ b/apps/assets/views.py
@@ -44,8 +44,6 @@ class AssetListView(AdminUserRequiredMixin, ListView):
return super(AssetListView, self).get_context_data(**kwargs)
-
-
class AssetCreateView(AdminUserRequiredMixin,CreateAssetTagsMiXin,CreateView):
model = Asset
tag_type = 'asset'
@@ -182,12 +180,16 @@ class AssetDetailView(DetailView):
def get_context_data(self, **kwargs):
asset_groups = self.object.groups.all()
+ system_users = self.object.system_users.all()
context = {
'app': 'Assets',
'action': 'Asset detail',
'asset_groups_remain': [asset_group for asset_group in AssetGroup.objects.all()
- if asset_group not in asset_groups],
+ if asset_group not in asset_groups],
'asset_groups': asset_groups,
+ 'system_users_remain': [system_user for system_user in SystemUser.objects.all()
+ if system_user not in system_users],
+ 'system_users': system_users,
}
kwargs.update(context)
return super(AssetDetailView, self).get_context_data(**kwargs)
diff --git a/apps/audits/hands.py b/apps/audits/hands.py
index f530b5e78..36358cbf5 100644
--- a/apps/audits/hands.py
+++ b/apps/audits/hands.py
@@ -1,5 +1,7 @@
# ~*~ coding: utf-8 ~*~
#
+from users.models import User
+from assets.models import Asset, SystemUser
from users.backends import IsSuperUserOrTerminalUser
from terminal.models import Terminal
diff --git a/apps/audits/models.py b/apps/audits/models.py
index 015f0bfb7..a98178a0d 100644
--- a/apps/audits/models.py
+++ b/apps/audits/models.py
@@ -71,7 +71,7 @@ class ProxyLog(models.Model):
class CommandLog(models.Model):
- proxy_log = models.ForeignKey(ProxyLog, on_delete=models.CASCADE, related_name='command_log')
+ proxy_log = models.ForeignKey(ProxyLog, on_delete=models.CASCADE, related_name='commands')
command_no = models.IntegerField()
command = models.CharField(max_length=1000, blank=True)
output = models.TextField(blank=True)
@@ -82,7 +82,10 @@ class CommandLog(models.Model):
@property
def output_decode(self):
- return base64.b64decode(self.output).replace('\n', '
')
+ try:
+ return base64.b64decode(self.output).replace('\n', '
')
+ except UnicodeDecodeError:
+ return 'UnicodeDecodeError'
class Meta:
db_table = 'command_log'
diff --git a/apps/audits/serializers.py b/apps/audits/serializers.py
index 881f84666..4d02ef5b4 100644
--- a/apps/audits/serializers.py
+++ b/apps/audits/serializers.py
@@ -14,7 +14,8 @@ class ProxyLogSerializer(serializers.ModelSerializer):
class Meta:
model = models.ProxyLog
fields = ['id', 'name', 'username', 'hostname', 'ip', 'system_user', 'login_type', 'terminal',
- 'log_file', 'was_failed', 'is_finished', 'date_start', 'time', 'command_length', "commands_dict"]
+ 'log_file', 'was_failed', 'is_finished', 'date_start', 'date_finished', 'time',
+ 'command_length', "commands_dict"]
@staticmethod
def get_time(obj):
@@ -25,7 +26,7 @@ class ProxyLogSerializer(serializers.ModelSerializer):
@staticmethod
def get_command_length(obj):
- return len(obj.command_log.all())
+ return len(obj.commands.all())
class CommandLogSerializer(serializers.ModelSerializer):
diff --git a/apps/audits/templates/audits/command_log_list.html b/apps/audits/templates/audits/command_log_list.html
index 6682273af..19a9a63e6 100644
--- a/apps/audits/templates/audits/command_log_list.html
+++ b/apps/audits/templates/audits/command_log_list.html
@@ -3,10 +3,61 @@
{% load static %}
{% load common_tags %}
{% block content_left_head %}
-{#
{% trans "Create permission" %} #}
+
{% endblock %}
+{% block table_search %}
+
+{% endblock %}
{% block table_container %}