diff --git a/jasset/urls.py b/jasset/urls.py index 1e66eb59b..d0e7e3f89 100644 --- a/jasset/urls.py +++ b/jasset/urls.py @@ -18,7 +18,7 @@ urlpatterns = patterns('', url(r'^group_edit/$', group_edit), url(r'^group_list/$', group_list), url(r'^group_detail/$', group_detail), - url(r'^group_del_host/(\w+)/$', group_del_host), + url(r'^group_del_host/$', group_del_host), url(r'^group_del/$', group_del), url(r'^host_del/(\w+)/$', host_del), url(r'^host_edit/$', view_splitter, {'su': host_edit, 'adm': host_edit_adm}), diff --git a/jasset/views.py b/jasset/views.py index c37c22910..f41c3b931 100644 --- a/jasset/views.py +++ b/jasset/views.py @@ -184,31 +184,54 @@ def host_add(request): def host_add_batch(request): header_title, path1, path2 = u'批量添加主机', u'资产管理', u'批量添加主机' login_types = {'LDAP': 'L', 'MAP': 'M'} + active_types = {'激活': 1, '禁用': 0} dept_id = get_user_dept(request) if request.method == 'POST': multi_hosts = request.POST.get('j_multi').split('\n') + print multi_hosts for host in multi_hosts: if host == '': break j_ip, j_port, j_type, j_idc, j_groups, j_depts, j_active, j_comment = host.split() j_type = login_types[j_type] + j_active = active_types[str(j_active)] j_group = ast.literal_eval(j_groups) j_dept = ast.literal_eval(j_depts) + idc = IDC.objects.filter(name=j_idc) + if idc: + j_idc = idc[0].id + + group_ids, dept_ids = [], [] + for group_name in j_group: + group = BisGroup.objects.filter(name=group_name) + if group: + group_id = group[0].id + group_ids.append(group_id) + + for dept_name in j_dept: + dept = DEPT.objects.filter(name=dept_name) + if dept: + dept_id = dept[0].id + dept_ids.append(dept_id) + + if is_group_admin(request) and not verify(request, asset_group=group_ids, edept=dept_ids): + return httperror(request, '添加失败, 您无权添加!') + if Asset.objects.filter(ip=str(j_ip)): emg = u'该IP %s 已存在!' % j_ip return render_to_response('jasset/host_add_multi.html', locals(), context_instance=RequestContext(request)) - if j_type == 'M': - j_user = request.POST.get('j_user') - j_password = cryptor.encrypt(request.POST.get('j_password')) - db_host_insert(j_ip, j_port, j_idc, j_type, j_group, j_dept, j_active, j_comment, j_user, j_password) - else: - db_host_insert(j_ip, j_port, j_idc, j_type, j_group, j_dept, j_active, j_comment) + # if j_type == 'M': + # j_user = request.POST.get('j_user') + # j_password = request.POST.get('j_password') + # db_host_insert(j_ip, j_port, j_idc, j_type, group_ids, dept_ids, j_active, j_comment) + # else: + db_host_insert(j_ip, j_port, j_idc, j_type, group_ids, dept_ids, j_active, j_comment) smg = u'批量添加添加成功' - return HttpResponseRedirect('/jasset/host_list/') + return render_to_response('jasset/host_add_multi.html', locals(), context_instance=RequestContext(request)) return render_to_response('jasset/host_add_multi.html', locals(), context_instance=RequestContext(request)) @@ -450,7 +473,7 @@ def host_detail(request): return httperror(request, '您无权查看!') elif is_common_user(request): - username = get_session_user_info[1] + username = get_session_user_info(request)[1] user_permed_hosts = user_perm_asset_api(username) if post not in user_permed_hosts: return httperror(request, '您无权查看!') @@ -576,7 +599,7 @@ def group_add(request): dept_id = get_user_dept(request) dept = DEPT.objects.get(id=dept_id) posts = Asset.objects.filter(dept=dept) - edept = DEPT.objects.get(id=dept_id) + edept = get_session_user_info(request)[5] if request.method == 'POST': j_group = request.POST.get('j_group', '') @@ -652,15 +675,17 @@ def group_edit(request): header_title, path1, path2 = u'编辑主机组', u'资产管理', u'编辑主机组' group_id = request.GET.get('id', '') group = BisGroup.objects.get(id=group_id) - all = Asset.objects.all() + host_all = Asset.objects.all() dept_id = get_user_dept(request) - eposts = Asset.objects.filter(bis_group=group).order_by('ip') + eposts = Asset.objects.filter(bis_group=group) if is_super_user(request): edept = DEPT.objects.all() - posts = [g for g in all if g not in eposts] + posts = [g for g in host_all if g not in eposts] elif is_group_admin(request): + if not verify(request, asset_group=[group_id]): + return httperror(request, '编辑失败, 您无权操作!') dept = DEPT.objects.get(id=dept_id) all_dept = Asset.objects.filter(dept=dept) posts = [g for g in all_dept if g not in eposts] @@ -688,42 +713,44 @@ def group_edit(request): @require_admin def group_detail(request): header_title, path1, path2 = u'主机组详情', u'资产管理', u'主机组详情' - login_types = {'L': 'LDAP', 'S': 'SSH_KEY', 'P': 'PASSWORD', 'M': 'MAP'} - dept_id = get_user_dept(request) - dept = DEPT.objects.get(id=dept_id) - group_id = request.GET.get('id') - group_name = BisGroup.objects.get(id=group_id).name - b = BisGroup.objects.get(id=group_id) + login_types = {'L': 'LDAP', 'M': 'MAP'} + dept = get_session_user_info(request)[5] + group_id = request.GET.get('id', '') + group = BisGroup.objects.get(id=group_id) if is_super_user(request): - posts = Asset.objects.filter(bis_group=b).order_by('ip') - contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request) + posts = Asset.objects.filter(bis_group=group).order_by('ip') elif is_group_admin(request): - posts = Asset.objects.filter(bis_group=b).filter(dept=dept).order_by('ip') - contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request) + if not verify(request, asset_group=[group_id]): + return httperror(request, '您无权查看!') + posts = Asset.objects.filter(bis_group=group).filter(dept=dept).order_by('ip') + + contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request) return render_to_response('jasset/group_detail.html', locals(), context_instance=RequestContext(request)) @require_admin -def group_del_host(request, offset): +def group_del_host(request): if request.method == 'POST': - group_name = request.POST.get('group_name') + group_id = request.POST.get('group_id') + offset = request.GET.get('id', '') + group = BisGroup.objects.get(id=group_id) if offset == 'group': - group = BisGroup.objects.get(name=group_name) - elif offset == 'idc': - group = IDC.objects.get(name=group_name) - len_list = request.POST.get("len_list") - for i in range(int(len_list)): - key = "id_list[" + str(i) + "]" - jid = request.POST.get(key) - g = Asset.objects.get(id=jid) - if offset == 'group': + len_list = request.POST.get("len_list") + for i in range(int(len_list)): + key = "id_list[" + str(i) + "]" + jid = request.POST.get(key) + g = Asset.objects.get(id=jid) group.asset_set.remove(g) - elif offset == 'idc': - Asset.objects.filter(id=jid).delete() - BisGroup.objects.filter(name=g.ip).delete() - return HttpResponseRedirect('/jasset/%s_detail/?id=%s' % (offset, group.id)) + else: + offset = request.GET.get('id', '') + group_id = request.GET.get('gid', '') + group = BisGroup.objects.get(id=group_id) + g = Asset.objects.get(id=offset) + group.asset_set.remove(g) + + return HttpResponseRedirect('/jasset/group_detail/?id=%s' % group.id) @require_admin @@ -734,9 +761,13 @@ def group_del(request): for i in range(int(len_list)): key = "id_list[" + str(i) + "]" gid = request.POST.get(key) + if not verify(request, asset_group=[gid]): + return httperror(request, '删除失败, 您无权删除!') BisGroup.objects.filter(id=gid).delete() else: gid = int(offset) + if not verify(request, asset_group=[gid]): + return httperror(request, '删除失败, 您无权删除!') BisGroup.objects.filter(id=gid).delete() return HttpResponseRedirect('/jasset/group_list/') diff --git a/jperm/views.py b/jperm/views.py index 52e394ff2..40ad7eda2 100644 --- a/jperm/views.py +++ b/jperm/views.py @@ -722,7 +722,7 @@ def get_apply_posts(request, status, username, dept_name, keyword=None): posts = Apply.objects.filter(Q(applyer__contains=keyword) | Q(approver__contains=keyword)) \ .filter(status=status).filter(dept=dept_name).order_by('-date_add') else: - posts = Log.objects.filter(status=status).filter(dept=dept_name).order_by('-date_add') + posts = Apply.objects.filter(status=status).filter(dept=dept_name).order_by('-date_add') elif is_common_user(request): if keyword: diff --git a/jumpserver.conf b/jumpserver.conf index 3c56daab7..f49a1a542 100644 --- a/jumpserver.conf +++ b/jumpserver.conf @@ -15,14 +15,14 @@ database = jumpserver [ldap] ldap_enable = 1 -host_url = ldap://192.168.8.230:389 -base_dn = dc=jumpserver, dc=org -root_dn = cn=admin,dc=jumpserver,dc=org +host_url = ldap://192.168.8.220:389 +base_dn = dc=fun, dc=tv +root_dn = cn=admin,dc=fun,dc=tv root_pw = secret234 [websocket] -web_socket_host = 192.168.173.129:3000 +web_socket_host = 192.168.8.220:3000 [web] diff --git a/templates/error.html b/templates/error.html index 99356315b..43f72bf77 100644 --- a/templates/error.html +++ b/templates/error.html @@ -21,8 +21,8 @@

Error

-

{{ message }}

- +

{{ message }}

+

The server encountered something unexpected that didn't allow it to complete the request. We apologize.
You can go back to main page:
Dashboard @@ -34,6 +34,18 @@ - + diff --git a/templates/index.html b/templates/index.html index 269384465..3b8312182 100644 --- a/templates/index.html +++ b/templates/index.html @@ -62,7 +62,7 @@
-
+

活跃用户TOP5

过去一周共有{{ week_users }}位用户登录{{ week_hosts }}次服务器.
    diff --git a/templates/jasset/group_add.html b/templates/jasset/group_add.html index a3e769de3..ead0fecba 100644 --- a/templates/jasset/group_add.html +++ b/templates/jasset/group_add.html @@ -8,6 +8,23 @@
    填写主机组基本信息
    +
    + + + + + + + + + + +
    {% if emg %} @@ -124,8 +141,7 @@ } $('#search').keyup(function() { - var $rows = $('#groups option'); - console.log($rows); + var $rows = $('#hosts option'); var val = $.trim($(this).val()).replace(/ +/g, ' ').toLowerCase(); $rows.show().filter(function() { diff --git a/templates/jasset/group_detail.html b/templates/jasset/group_detail.html index a21da2796..ee4f0b39b 100644 --- a/templates/jasset/group_detail.html +++ b/templates/jasset/group_detail.html @@ -8,7 +8,7 @@
    -
    主机组{{ group_name }}详细信息列表
    +
    主机组{{ group.name }}详细信息列表
    @@ -30,7 +30,7 @@
    @@ -42,7 +42,7 @@ 端口号 登录方式 所属IDC - 所属业务组 + 所属业务组 是否激活 添加时间 备注 @@ -64,7 +64,7 @@ 详情 编辑 - 删除 + 删除 {% endfor %} @@ -89,21 +89,6 @@ $('#editable').editableTableWidget(); }); - $(".iframe").on('click', function(){ - var url= $(this).attr("value"); - $.layer({ - type: 2, - title: 'JumpServer主机详情', - maxmin: true, - shift: 'top', - border: [2, 0.3, '#1AB394'], - shade: [0.5, '#000000'], - shadeClose: true, - area : ['800px' , '600px'], - iframe: {src: url} - }); - }); - function alter(form) { selectData = GetTableDataBox(); if (selectData[1] != 0) { @@ -122,8 +107,7 @@ function del(form) { var checkboxes = document.getElementById(form); var id_list = {}; - var group_name = $('#j_group_name').attr("value"); - console.log(group_name); + var group_id = $('#group_id').attr("value"); var j = 0; for (var i = 0; i < checkboxes.elements.length; i++) { if (checkboxes.elements[i].type == "checkbox" && checkboxes.elements[i].checked == true && checkboxes.elements[i].value != "checkall") { @@ -134,8 +118,8 @@ if (confirm("确定从主机组中删除")) { $.ajax({ type: "POST", - url: "/jasset/group_del_host/group/", - data: {"id_list": id_list, "len_list": j, "group_name": group_name}, + url: "/jasset/group_del_host/?id=group", + data: {"id_list": id_list, "len_list": j, "group_id": group_id}, success: function (data) { window.open(window.location.href, "_self"); } diff --git a/templates/jasset/group_list.html b/templates/jasset/group_list.html index ed350feeb..b171df382 100644 --- a/templates/jasset/group_list.html +++ b/templates/jasset/group_list.html @@ -7,6 +7,26 @@
    +
    +
    主机组详细信息列表
    +
    + + + + + + + + + + +
    +
    添加主机组 diff --git a/templates/jasset/host_add_multi.html b/templates/jasset/host_add_multi.html index 5df6bc89a..122ca2ec3 100644 --- a/templates/jasset/host_add_multi.html +++ b/templates/jasset/host_add_multi.html @@ -42,9 +42,10 @@ {% if smg %}
    {{ smg }}
    {% endif %} -

    按照文本框内主机信息格式填写, 多台主机回车换行

    +

    请严格按照文本框内主机信息格式填写, 多台主机回车换行, 具体格式如下:

    +

    IP地址 端口号 登录方式 IDC名 所属主机组 所属部门 激活/禁用 备注

    -
    +
    diff --git a/templates/jasset/host_list_common.html b/templates/jasset/host_list_common.html index 7bd596f53..3ea78f019 100644 --- a/templates/jasset/host_list_common.html +++ b/templates/jasset/host_list_common.html @@ -73,7 +73,7 @@ {{ post|get_user_alias:user_id }} {{ post.comment }} - 详情 + 详情 {% endfor %} diff --git a/templates/jasset/idc_detail.html b/templates/jasset/idc_detail.html index 2653d6302..847ff7b43 100644 --- a/templates/jasset/idc_detail.html +++ b/templates/jasset/idc_detail.html @@ -63,13 +63,16 @@ {{ post.port }} {{ post.login_type|get_login_type }} {{ post.idc.name }} - {{ post.bis_group.all | group_str2 }} + {{ post.dept.all | group_str2 }} + {{ post.bis_group.all | group_str2_all }} {{ post.is_active|bool2str }} - {{ post.date_added|date:"Y-m-d H:i:s" }} {{ post.comment }} - 详情 - 删除 + 详情 + {% ifnotequal session_role_id 0 %} + 编辑 + 删除 + {% endifnotequal %} {% endfor %} @@ -80,38 +83,7 @@
    -
    -
    -
      - - {% if contacts.has_previous %} - - {% else %} - - {% endif %} - {% for page in page_range %} - {% ifequal current_page page %} -
    • {{ page }}
      • - {% else %} -
    • {{ page }}
      • - {% endifequal %} - {% endfor %} - {% if contacts.has_next %} - - {% else %} - - {% endif %} -
    -
    -
    + {% include 'paginator.html' %}
    @@ -125,21 +97,6 @@ $('#editable').editableTableWidget(); }); - $(".iframe").on('click', function(){ - var url= $(this).attr("value"); - $.layer({ - type: 2, - title: 'JumpServer主机详情', - maxmin: true, - shift: 'top', - border: [2, 0.3, '#1AB394'], - shade: [0.5, '#000000'], - shadeClose: true, - area : ['800px' , '600px'], - iframe: {src: url} - }); - }); - function alter(form) { selectData = GetTableDataBox(); if (selectData[1] != 0) { @@ -170,7 +127,7 @@ if (confirm("确定从该IDC中删除")) { $.ajax({ type: "POST", - url: "/jasset/group_del_host/idc/", + url: "/jasset/host_del/multi/", data: {"id_list": id_list, "len_list": j, "group_name": group_name}, success: function (data) { window.open(window.location.href, "_self"); diff --git a/templates/jasset/idc_list.html b/templates/jasset/idc_list.html index 0e0254ddf..e1f5dd465 100644 --- a/templates/jasset/idc_list.html +++ b/templates/jasset/idc_list.html @@ -7,6 +7,26 @@
    +
    +
    IDC详细信息列表
    +
    + + + + + + + + + + +
    +
    {% ifequal session_role_id 2 %} @@ -66,7 +86,7 @@
    {% ifequal session_role_id 2 %} - + {% endifequal %}
    {% include 'paginator.html' %}