From c1d8de455827a8d4f51a388e0f920160e0528930 Mon Sep 17 00:00:00 2001 From: ibuler Date: Sat, 18 Apr 2015 16:58:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E7=AE=80=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- connect.py | 7 ++++++- jasset/views.py | 9 +-------- jperm/views.py | 25 +++++++++++++------------ jumpserver.conf | 5 ++--- jumpserver/api.py | 4 ++++ jumpserver/views.py | 13 ++++++++----- templates/error.html | 2 +- templates/jasset/group_add.html | 3 ++- templates/jasset/group_edit.html | 2 +- templates/jlog/log_online.html | 5 +++-- templates/jperm/perm_detail.html | 2 +- templates/jperm/perm_list.html | 1 + templates/juser/dept_list.html | 4 ++-- templates/juser/user_detail.html | 9 ++------- templates/nav.html | 4 ++-- templates/success.html | 2 +- 16 files changed, 50 insertions(+), 47 deletions(-) diff --git a/connect.py b/connect.py index 64215601d..273edc052 100755 --- a/connect.py +++ b/connect.py @@ -1,7 +1,11 @@ # coding: utf-8 -import socket import sys + +reload(sys) +sys.setdefaultencoding('utf8') + +import socket import os import re import ast @@ -218,6 +222,7 @@ def print_user_host(username): hosts.sort() for ip in hosts: print '%-15s -- %s' % (ip, hosts_attr[ip][2]) + print '' def print_user_hostgroup(username): diff --git a/jasset/views.py b/jasset/views.py index f59aef065..4f30b0b40 100644 --- a/jasset/views.py +++ b/jasset/views.py @@ -4,8 +4,6 @@ import ast from django.db.models import Q from django.template import RequestContext -from django.shortcuts import render_to_response - from jperm.models import Perm from jumpserver.api import * @@ -20,11 +18,6 @@ def my_render(template, data, request): return render_to_response(template, data, context_instance=RequestContext(request)) -def httperror(request, emg): - message = emg - return render_to_response('error.html', locals(), context_instance=RequestContext(request)) - - def get_host_groups(groups): """ 获取主机所属的组类 """ ret = [] @@ -832,7 +825,7 @@ def dept_host_ajax(request): else: hosts = Asset.objects.all() - return my_render('jasset/dept_host_ajax.html', locals()) + return my_render('jasset/dept_host_ajax.html', locals(), request) @require_login diff --git a/jperm/views.py b/jperm/views.py index 38f4b80ee..237a929f0 100644 --- a/jperm/views.py +++ b/jperm/views.py @@ -187,18 +187,15 @@ def perm_edit_adm(request): @require_admin def perm_detail(request): header_title, path1, path2 = u'编辑授权', u'授权管理', u'授权详情' - perm_id = request.GET.get('id') - perm = Perm.objects.filter(id=perm_id) - if perm: - perm = perm[0] - user_groups = perm.user_group.all() - asset_groups = perm.asset_group.all() - - users_list = [] + group_id = request.GET.get('id') + user_group = UserGroup.objects.filter(id=group_id) + if user_group: + user_group = user_group[0] + users_list = user_group.user_set.all() + perms = user_group.perm_set.all() + asset_groups = [perm.asset_group for perm in perms] assets_list = [] - for user_group in user_groups: - users_list.extend(user_group.user_set.all()) for asset_group in asset_groups: assets_list.extend(asset_group.asset_set.all()) @@ -478,7 +475,7 @@ def sudo_refresh(request): asset_groups_select = sudo_perm.asset_group.all() cmd_groups_select = sudo_perm.cmd_group.all() sudo_ldap_add(user_group, user_runas, asset_groups_select, cmd_groups_select) - return HttpResponse('ok') + return HttpResponse('刷新sudo授权成功') # @require_admin @@ -652,7 +649,11 @@ def cmd_detail(request): cmd_ids = request.GET.get('id').split(',') cmds = [] if len(cmd_ids) == 1: - cmd_group = CmdGroup.objects.filter(id=cmd_ids[0]) + if cmd_ids[0]: + cmd_id = cmd_ids[0] + else: + cmd_id = 1 + cmd_group = CmdGroup.objects.filter(id=cmd_id) if cmd_group: cmd_group = cmd_group[0] cmds.extend(cmd_group.cmd.split(',')) diff --git a/jumpserver.conf b/jumpserver.conf index aeea304a5..c1e035757 100644 --- a/jumpserver.conf +++ b/jumpserver.conf @@ -6,7 +6,6 @@ port = 80 key = 88aaaf7ffe3c6c04 - [db] host = 127.0.0.1 port = 3306 @@ -17,14 +16,14 @@ database = jumpserver [ldap] ldap_enable = 1 -host_url = ldap://192.168.0.129:389 +host_url = ldap://127.0.0.1:389 base_dn = dc=jumpserver, dc=org root_dn = cn=admin,dc=jumpserver,dc=org root_pw = secret234 [websocket] -web_socket_host = 192.168.0.129:3000 +web_socket_host = 192.168.20.209:3000 [mail] diff --git a/jumpserver/api.py b/jumpserver/api.py index 6b19fd033..048031312 100644 --- a/jumpserver/api.py +++ b/jumpserver/api.py @@ -487,3 +487,7 @@ def is_dir(dir_name, username='root', mode=0755): def success(request, msg): return render_to_response('success.html', locals()) + +def httperror(request, emg): + message = emg + return render_to_response('error.html', locals()) \ No newline at end of file diff --git a/jumpserver/views.py b/jumpserver/views.py index eb9796bfa..005baa162 100644 --- a/jumpserver/views.py +++ b/jumpserver/views.py @@ -231,16 +231,19 @@ def filter_ajax_api(request): def install(request): from juser.models import DEPT, User - dept = DEPT(id=1, name="超管部", comment="SUPER DEPT") + if User.objects.filter(id=5000): + return httperror(request, 'Jumpserver已初始化，不能重复安装！') + + dept = DEPT(id=1, name="超管部", comment="超级管理部门") dept.save() - dept2 = DEPT(id=2, name="默认", comment="DEFAULT DEPT") + dept2 = DEPT(id=2, name="默认", comment="默认部门") dept2.save() - IDC(id=1, name="默认", comment="DEFAULT IDC").save() - BisGroup(id=1, name="ALL", dept=dept, comment="ALL USER GROUP").save() + IDC(id=1, name="默认", comment="默认IDC").save() + BisGroup(id=1, name="ALL", dept=dept, comment="所有主机组").save() User(id=5000, username="admin", password=md5_crypt('admin'), name='admin', email='admin@jumpserver.org', role='SU', is_active=True, dept=dept).save() - return success(request, u'安装成功') + return success(request, u'Jumpserver初始化成功') def download(request): diff --git a/templates/error.html b/templates/error.html index 43f72bf77..702d7b4b6 100644 --- a/templates/error.html +++ b/templates/error.html @@ -25,7 +25,7 @@

The server encountered something unexpected that didn't allow it to complete the request. We apologize.
- You can go back to main page:
Dashboard + You can go back to main page:
首页
diff --git a/templates/jasset/group_add.html b/templates/jasset/group_add.html index 489bd0157..be6c7b91d 100644 --- a/templates/jasset/group_add.html +++ b/templates/jasset/group_add.html @@ -196,7 +196,8 @@ $.get('/jasset/dept_host_ajax/', {'id': dept_id}, function(data){ - $('#hosts').html(data) + $('#assets').html(data) + $('#assets_total').html(data) }) } diff --git a/templates/jasset/group_edit.html b/templates/jasset/group_edit.html index 6008f9deb..2080f97c2 100644 --- a/templates/jasset/group_edit.html +++ b/templates/jasset/group_edit.html @@ -205,7 +205,7 @@ $.get('/jasset/dept_host_ajax/', {'id': dept_id}, function(data){ - $('#hosts').html(data) + $('#assets').html(data) }) } diff --git a/templates/jlog/log_online.html b/templates/jlog/log_online.html index cc253d9e8..6a89b9663 100644 --- a/templates/jlog/log_online.html +++ b/templates/jlog/log_online.html @@ -153,7 +153,8 @@ var regx = /\x1B\[([0-9]{1,3}((;[0-9]{1,3})*)?)?[m|K]/g; // tag.append('

'+escapeString(obj.content.replace(regx,''))+'

'); if (option == 'new') { - tag.append('

' + escapeString(obj.content) + '

'); +// tag.append('

' + escapeString(obj.content) + '

'); + tag.append('

'+escapeString(obj.content.replace(regx,' '))+'

'); } else if (option == 'exist') { tag.append('
' + exsit_message + '
'); } @@ -208,7 +209,7 @@ $.ajax({ type: "GET", url: g_url, - success: window.open("/jlog/log_list/online/", "_self") + success: window.open("/jlog/log_list/online/", "_self"), error: window.open(g_url, "_self") }); diff --git a/templates/jperm/perm_detail.html b/templates/jperm/perm_detail.html index 039151aad..be7f25ccd 100644 --- a/templates/jperm/perm_detail.html +++ b/templates/jperm/perm_detail.html @@ -89,7 +89,7 @@ {{ asset.ip }} {{ asset.idc.name }} - {% for group in asset.bis_group.all|filter_private %} + {% for group in asset.bis_group.all %} {{ group }} {% endfor %} diff --git a/templates/jperm/perm_list.html b/templates/jperm/perm_list.html index e59a9da28..23b6818df 100644 --- a/templates/jperm/perm_list.html +++ b/templates/jperm/perm_list.html @@ -65,6 +65,7 @@ {{ group.id | ugrp_perm_asset_count }} {{ group.comment }} + 详情 授权编辑 diff --git a/templates/juser/dept_list.html b/templates/juser/dept_list.html index 3d81b9e24..82bf9d539 100644 --- a/templates/juser/dept_list.html +++ b/templates/juser/dept_list.html @@ -67,13 +67,13 @@ {{ dept.name }} {{ dept.id | dept_group_num }} {{ dept.id | dept_user_num}} - {{ dept.id | dept_asset_num}} + {{ dept.id | dept_asset_num}} {{ dept.comment }} {# 详情#} {% ifequal session_role_id 2 %} 编辑 - 删除 + 删除 {% else %} 编辑 删除 diff --git a/templates/juser/user_detail.html b/templates/juser/user_detail.html index c8aee9e1b..462423d73 100644 --- a/templates/juser/user_detail.html +++ b/templates/juser/user_detail.html @@ -74,7 +74,7 @@ {% for group in user.group.all %} - + {% endfor %}
{{ group.name }}{{ group.name }}
@@ -152,7 +152,6 @@
-
{% for log in logs_last %} @@ -168,19 +167,17 @@
{% endfor %} {% if not logs_last %} - (无) + (暂无) {% endif %}
{% if logs_num > 10 %} {% endif %} -
diff --git a/templates/nav.html b/templates/nav.html index fc9e46e19..61bfdba27 100644 --- a/templates/nav.html +++ b/templates/nav.html @@ -35,7 +35,7 @@ 部门授权 -
  • +
  • 小组授权
    • @@ -87,7 +87,7 @@
  • 授权管理