diff --git a/connect.py b/connect.py index dc9a6ae31..51ed7cd6f 100755 --- a/connect.py +++ b/connect.py @@ -47,7 +47,8 @@ SERVER_KEY_DIR = os.path.join(SSH_KEY_DIR, 'server') # The key of decryptor. KEY = CONF.get('web', 'key') # Login user. -LOGIN_NAME = getpass.getuser() +#LOGIN_NAME = getpass.getuser() +LOGIN_NAME = 'halcyon' #LOGIN_NAME = os.getlogin() USER_KEY_FILE = os.path.join(SERVER_KEY_DIR, LOGIN_NAME) @@ -259,6 +260,7 @@ def verify_connect(username, part_ip): color_print('No Permission or No host.', 'red') else: username, password, host, port = get_connect_item(username, ip_matched[0]) + print username, password, host, port connect(username, password, host, port, LOGIN_NAME) diff --git a/jasset/urls.py b/jasset/urls.py index 6fdf6f702..dee342670 100644 --- a/jasset/urls.py +++ b/jasset/urls.py @@ -4,18 +4,18 @@ from jasset.views import * urlpatterns = patterns('', url(r'^$', index), - url(r'^host_add/$', jadd_host), - url(r'^host_add_multi/$', jadd_host_multi), - url(r'^host_list/$', jlist_host), - url(r"^(\d+.\d+.\d+.\d+)/$",jlist_ip), - url(r'^idc_add/$', jadd_idc), - url(r'^idc_list/$', jlist_idc), - url(r'^idc_detail/(\d+)$', idc_detail), - url(r'^idc_del/(\d+)/$', idc_del), - url(r'^group_add/$', jadd_group), - url(r'^group_edit/(\d+)/$', group_edit), - url(r'^group_list/$', jlist_group), - url(r'^group_detail/(\d+)/$', group_detail), + url(r'^host_add/$', add_host), + url(r"^host_add_multi/$", add_host_multi), + url(r'^host_list/$', list_host), + url(r"^(\d+.\d+.\d+.\d+)/$", jlist_ip), + url(r'^idc_add/$', add_idc), + url(r'^idc_list/$', list_idc), + url(r'^idc_detail/(\d+)$', detail_idc), + url(r'^idc_del/(\d+)/$', del_idc), + url(r'^group_add/$', add_group), + url(r'^group_edit/(\d+)/$', edit_group), + url(r'^group_list/$', list_group), + url(r'^group_detail/(\d+)/$', detail_group), url(r'^group_del_host/(\w+)/$', group_del_host), url(r'^group_del/(\d+)/$', group_del), url(r'^host_del/(\w+)/$', host_del), diff --git a/jasset/views.py b/jasset/views.py index 75be2155b..709d0251c 100644 --- a/jasset/views.py +++ b/jasset/views.py @@ -16,10 +16,38 @@ def index(request): return render_to_response('jasset/jasset.html', ) -def jadd_host(request): +def f_add_host(ip, port, idc, jtype, group, active, comment, username='', password=''): + groups = [] + idc = IDC.objects.get(name=idc) + if type == 'M': + a = Asset(ip=ip, port=port, + login_type=jtype, idc=idc, + is_active=int(active), + comment=comment, + username=username, + password=password) + else: + a = Asset(ip=ip, port=port, + login_type=jtype, idc=idc, + is_active=int(active), + comment=comment) + a.save() + + jasset_group_add(ip, ip, 'P') + all_group = BisGroup.objects.get(name='ALL') + private_group = BisGroup.objects.get(name=ip.strip()) + for g in group: + c = BisGroup.objects.get(name=g) + groups.append(c) + groups.extend([all_group, private_group]) + + a.bis_group = groups + a.save() + + +def add_host(request): login_types = {'L': 'LDAP', 'S': 'SSH_KEY', 'P': 'PASSWORD', 'M': 'MAP'} header_title, path1, path2 = u'添加主机 | Add Host', u'资产管理', u'添加主机' - groups = [] eidc = IDC.objects.all() egroup = BisGroup.objects.filter(type='A') eusergroup = UserGroup.objects.all() @@ -32,13 +60,6 @@ def jadd_host(request): j_group = request.POST.getlist('j_group') j_active = request.POST.get('j_active') j_comment = request.POST.get('j_comment') - j_idc = IDC.objects.get(name=j_idc) - - all_group = BisGroup.objects.get(name='ALL') - for group in j_group: - c = BisGroup.objects.get(name=group) - groups.append(c) - groups.append(all_group) if Asset.objects.filter(ip=str(j_ip)): emg = u'该IP %s 已存在!' %j_ip @@ -47,47 +68,31 @@ def jadd_host(request): if j_type == 'M': j_user = request.POST.get('j_user') j_password = cryptor.encrypt(request.POST.get('j_password')) - a = Asset(ip=j_ip, port=j_port, - login_type=j_type, idc=j_idc, - is_active=int(j_active), - comment=j_comment, - username_common=j_user, - password_common=j_password) + f_add_host(j_ip, j_port, j_idc, j_type, j_group, j_active, j_comment, j_user, j_password) else: - a = Asset(ip=j_ip, port=j_port, - login_type=j_type, idc=j_idc, - is_active=int(j_active), - comment=j_comment) - jasset_group_add(j_ip, j_ip, 'P') - a.save() - a.bis_group = groups - a.save() + f_add_host(j_ip, j_port, j_idc, j_type, j_group, j_active, j_comment) + smg = u'主机 %s 添加成功' %j_ip return render_to_response('jasset/host_add.html', locals(), context_instance=RequestContext(request)) -def jadd_host_multi(request): +def add_host_multi(request): header_title, path1, path2 = u'批量添加主机 | Add Hosts', u'资产管理', u'批量添加主机' login_types = {'LDAP': 'L', 'SSH_KEY': 'S', 'PASSWORD': 'P', 'MAP': 'M'} + j_group = [] if request.method == 'POST': multi_hosts = request.POST.get('j_multi').split('\n') for host in multi_hosts: if host == '': break - groups = [] - j_ip, j_port, j_type, j_idc, j_group, j_user_group, j_active, j_comment = host.split() - j_idc = IDC.objects.get(name=j_idc) + j_ip, j_port, j_type, j_idc, j_groups, j_user_group, j_active, j_comment = host.split() j_type = login_types[j_type] - all_group = BisGroup.objects.get(name='ALL') - j_group = j_group.split(',') - for group in j_group: - g = group.strip('[]') - print g - c = BisGroup.objects.get(name=g) - groups.append(c) - groups.append(all_group) - + j_groups = j_groups.split(',') + for group in j_groups: + g = group.strip('[]').encode('utf-8').strip() + j_group.append(g) + print j_group,type(j_group) 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)) @@ -95,23 +100,13 @@ def jadd_host_multi(request): if j_type == 'M': j_user = request.POST.get('j_user') j_password = cryptor.encrypt(request.POST.get('j_password')) - a = Asset(ip=j_ip, port=j_port, - login_type=j_type, idc=j_idc, - is_active=int(j_active), - comment=j_comment, - username_common=j_user, - password_common=j_password) + f_add_host(j_ip, j_port, j_idc, j_type, j_group, j_active, j_comment, j_user, j_password) else: - a = Asset(ip=j_ip, port=j_port, - login_type=j_type, idc=j_idc, - is_active=int(j_active), - comment=j_comment) - jasset_group_add(j_ip, j_ip, 'P') - a.save() - a.bis_group = groups - a.save() + f_add_host(j_ip, j_port, j_idc, j_type, j_group, 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)) @@ -136,14 +131,13 @@ def batch_host_edit(request): j_group = request.POST.getlist(j_group) j_active = request.POST.get(j_active).strip() j_comment = request.POST.get(j_comment).strip() - print j_ip jasset_host_edit(j_id, j_ip, j_idc, j_port, j_type, j_group, j_active, j_comment) return render_to_response('jasset/host_list.html') -def jlist_host(request): +def list_host(request): header_title, path1, path2 = u'查看主机 | List Host', u'资产管理', u'查看主机' login_types = {'L': 'LDAP', 'S': 'SSH_KEY', 'P': 'PASSWORD', 'M': 'MAP'} posts = contact_list = Asset.objects.all().order_by('ip') @@ -167,12 +161,14 @@ def host_del(request, offset): len_list = request.POST.get("len_list") for i in range(int(len_list)): key = "id_list["+str(i)+"]" - print key jid = request.POST.get(key) - print jid + a = Asset.objects.get(id=jid).ip Asset.objects.filter(id=jid).delete() + BisGroup.objects.filter(name=a).delete() else: jid = int(offset) + a = Asset.objects.get(id=jid).ip + BisGroup.objects.filter(name=a).delete() Asset.objects.filter(id=jid).delete() return HttpResponseRedirect('/jasset/host_list/') @@ -235,7 +231,7 @@ def jlist_ip(request, offset): return render_to_response('jasset/jlist_ip.html', locals(), context_instance=RequestContext(request)) -def jadd_idc(request): +def add_idc(request): header_title, path1, path2 = u'添加IDC | Add IDC', u'资产管理', u'添加IDC' if request.method == 'POST': j_idc = request.POST.get('j_idc') @@ -250,18 +246,18 @@ def jadd_idc(request): return render_to_response('jasset/idc_add.html', locals(), context_instance=RequestContext(request)) -def jlist_idc(request): +def list_idc(request): header_title, path1, path2 = u'查看IDC | List IDC', u'资产管理', u'查看IDC' posts = IDC.objects.all().order_by('id') return render_to_response('jasset/idc_list.html', locals(), context_instance=RequestContext(request)) -def idc_del(request, offset): +def del_idc(request, offset): IDC.objects.filter(id=offset).delete() return HttpResponseRedirect('/jasset/idc_list/') -def jadd_group(request): +def add_group(request): header_title, path1, path2 = u'添加主机组 | Add Group', u'资产管理', u'添加主机组' posts = Asset.objects.all() if request.method == 'POST': @@ -283,13 +279,13 @@ def jadd_group(request): return render_to_response('jasset/group_add.html', locals(), context_instance=RequestContext(request)) -def jlist_group(request): +def list_group(request): header_title, path1, path2 = u'查看主机组 | List Group', u'资产管理', u'查看主机组' posts = BisGroup.objects.filter(type='A').order_by('id') return render_to_response('jasset/group_list.html', locals(), context_instance=RequestContext(request)) -def group_edit(request, offset): +def edit_group(request, offset): header_title, path1, path2 = u'编辑主机组 | Edit Group', u'资产管理', u'编辑主机组' group = BisGroup.objects.get(id=offset) all = Asset.objects.all() @@ -311,7 +307,7 @@ def group_edit(request, offset): return render_to_response('jasset/group_add.html', locals(), context_instance=RequestContext(request)) -def group_detail(request, offset): +def detail_group(request, offset): header_title, path1, path2 = u'主机组详情 | Group Detail', u'资产管理', u'主机组详情' login_types = {'L': 'LDAP', 'S': 'SSH_KEY', 'P': 'PASSWORD', 'M': 'MAP'} group_name = BisGroup.objects.get(id=offset).name @@ -330,7 +326,7 @@ def group_detail(request, offset): return render_to_response('jasset/group_detail.html', locals(), context_instance=RequestContext(request)) -def idc_detail(request, offset): +def detail_idc(request, offset): header_title, path1, path2 = u'主机组详情 | Group Detail', u'资产管理', u'主机组详情' login_types = {'L': 'LDAP', 'S': 'SSH_KEY', 'P': 'PASSWORD', 'M': 'MAP'} idc_name = IDC.objects.get(id=offset).name diff --git a/jperm/urls.py b/jperm/urls.py index 80d8f8630..89e6c05f1 100644 --- a/jperm/urls.py +++ b/jperm/urls.py @@ -8,6 +8,7 @@ urlpatterns = patterns('jperm.views', (r'^perm_edit/$', 'perm_edit'), (r'^perm_list/$', 'perm_list'), + (r'^perm_list_ajax/$', 'perm_list_ajax'), (r'^perm_detail/$', 'perm_detail'), (r'^perm_del/$', 'perm_del'), (r'^perm_asset_detail/$', 'perm_asset_detail'), diff --git a/jperm/views.py b/jperm/views.py index b9da25c6b..b0d18201e 100644 --- a/jperm/views.py +++ b/jperm/views.py @@ -65,6 +65,41 @@ def perm_list(request): return render_to_response('jperm/perm_list.html', locals()) +def perm_list_ajax(request): + tab = request.POST.get('tab', 'tab1') + search = request.POST.get('search', '') + + if tab == 'tab1': + groups = contact_list = UserGroup.objects.filter(name__icontains=search).order_by('type') + p = paginator = Paginator(contact_list, 10) + + try: + page = int(request.GET.get('page', '1')) + except ValueError: + page = 1 + + try: + contacts = paginator.page(page) + except (EmptyPage, InvalidPage): + contacts = paginator.page(paginator.num_pages) + + else: + users = contact_list2 = User.objects.filter(name__icontains=search).order_by('id') + p2 = paginator2 = Paginator(contact_list2, 10) + + try: + page = int(request.GET.get('page', '1')) + except ValueError: + page = 1 + + try: + contacts2 = paginator2.page(page) + except (EmptyPage, InvalidPage): + contacts2 = paginator2.page(paginator2.num_pages) + + return render_to_response('jperm/perm_list_ajax.html', locals()) + + def perm_edit(request): if request.method == 'GET': header_title, path1, path2 = u'编辑授权 | Perm Host Edit.', u'jperm', u'perm_edit' diff --git a/jumpserver/templatetags/mytags.py b/jumpserver/templatetags/mytags.py index b96a91fa1..26fa24b6d 100644 --- a/jumpserver/templatetags/mytags.py +++ b/jumpserver/templatetags/mytags.py @@ -1,6 +1,7 @@ # coding: utf-8 import time +import re from django import template from django.db.models import Q from juser.models import User, UserGroup @@ -34,7 +35,7 @@ def get_role(user_id): def groups_str(username): groups = [] user = User.objects.get(username=username) - for group in user.user_group.filter(Q(type='A') | Q(type='M')): + for group in user.user_group.filter(type='A'): groups.append(group.name) if len(groups) < 4: return ' '.join(groups) @@ -42,6 +43,16 @@ def groups_str(username): return "%s ..." % ' '.join(groups[0:3]) +@register.filter(name='group_manage_str') +def group_manage_str(username): + user = User.objects.get(username=username) + group = user.user_group.filter(type='M') + if group: + return group[0].name + else: + return '' + + @register.filter(name='get_item') def get_item(dictionary, key): return dictionary.get(key) @@ -70,9 +81,9 @@ def perm_count(group_id): @register.filter(name='group_type_to_str') def group_type_to_str(type_name): group_types = { - 'P': '私有组', - 'M': '管理组', - 'A': '授权组', + 'P': '用户', + 'M': '部门', + 'A': '用户组', } return group_types.get(type_name) @@ -85,6 +96,10 @@ def perm_asset_count(user_id): @register.filter(name='filter_private') def filter_private(group): agroup = [] + pattern = re.compile(r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}') p = BisGroup.objects.get(name='ALL') - [agroup.append(g) for g in group if g != p] - return agroup \ No newline at end of file + for g in group: + if not pattern.match(g.name): + agroup.append(g) + agroup.remove(p) + return agroup diff --git a/jumpserver/urls.py b/jumpserver/urls.py index 9352fc543..dff10261d 100644 --- a/jumpserver/urls.py +++ b/jumpserver/urls.py @@ -14,4 +14,5 @@ urlpatterns = patterns('', (r'^jasset/', include('jasset.urls')), (r'^jlog/', include('jlog.urls')), (r'^jperm/', include('jperm.urls')), + ) diff --git a/jumpserver/views.py b/jumpserver/views.py index 3349d8f49..2278923b9 100644 --- a/jumpserver/views.py +++ b/jumpserver/views.py @@ -23,11 +23,11 @@ def skin_config(request): return render_to_response('skin_config.html') -def jasset_group_add(name, comment, type): +def jasset_group_add(name, comment, jtype): if BisGroup.objects.filter(name=name): emg = u'该业务组已存在!' else: - BisGroup.objects.create(name=name, comment=comment, type=type) + BisGroup.objects.create(name=name, comment=comment, type=jtype) smg = u'业务组%s添加成功' %name diff --git a/juser/urls.py b/juser/urls.py index d9c51dc6f..0f35ece07 100644 --- a/juser/urls.py +++ b/juser/urls.py @@ -9,6 +9,7 @@ urlpatterns = patterns('juser.views', (r'^user_add/$', 'user_add'), (r'^user_list/$', 'user_list'), (r'^group_add/$', 'group_add'), + (r'^group_add_ajax/$', 'group_add_ajax'), (r'^group_list/$', 'group_list'), (r'^user_detail/$', 'user_detail'), (r'^user_del/$', 'user_del'), diff --git a/juser/views.py b/juser/views.py index 875754003..be12c67dc 100644 --- a/juser/views.py +++ b/juser/views.py @@ -4,7 +4,6 @@ import time import os -import hashlib import random import subprocess import ldap @@ -17,12 +16,14 @@ from django.shortcuts import render_to_response from django.core.exceptions import ObjectDoesNotExist from django.db.models import Q from django.http import HttpResponse +from django.core.paginator import Paginator, EmptyPage, InvalidPage from juser.models import UserGroup, User from connect import PyCrypt, KEY from connect import BASE_DIR from connect import CONF -from django.core.paginator import Paginator, EmptyPage, InvalidPage +from jumpserver.views import md5_crypt + CRYPTOR = PyCrypt(KEY) LDAP_ENABLE = CONF.getint('ldap', 'ldap_enable') @@ -253,16 +254,21 @@ def ldap_del_user(username): ldap_conn.delete(sudo_dn) -def group_add(request): +def group_add(request, group_type_select='A'): error = '' msg = '' header_title, path1, path2 = '添加属组 | Add Group', 'juser', 'group_add' group_types = { - # 'P': '私有组', - 'M': '管理组', - 'A': '授权组', + 'M': '部门', + 'A': '用户组', } - users = User.objects.all() + + users_all = User.objects.all() + if group_type_select == 'M': + users = [user for user in users_all if not user.user_group.filter(type='M')] + else: + users = users_all + if request.method == 'POST': group_name = request.POST.get('group_name', '') group_type = request.POST.get('group_type', 'A') @@ -287,9 +293,20 @@ def group_add(request): return render_to_response('juser/group_add.html', locals()) +def group_add_ajax(request): + group_type = request.POST.get('type', 'A') + users_all = User.objects.all() + if group_type == 'A': + users = users_all + else: + users = [user for user in users_all if not user.user_group.filter(type='M')] + + return render_to_response('juser/group_add_ajax.html', locals()) + + def group_list(request): header_title, path1, path2 = '查看属组 | Show Group', 'juser', 'group_list' - groups = contact_list = UserGroup.objects.filter(Q(type='M') | Q(type='A')).order_by('id') + groups = contact_list = UserGroup.objects.filter(Q(type='M') | Q(type='A')).order_by('type') p = paginator = Paginator(contact_list, 10) try: @@ -327,9 +344,8 @@ def group_edit(request): msg = '' header_title, path1, path2 = '修改属组 | Edit Group', 'juser', 'group_edit' group_types = { - # 'P': '私有组', - 'M': '管理组', - 'A': '授权组', + 'M': '部门', + 'A': '用户组', } if request.method == 'GET': group_id = request.GET.get('id', None) @@ -341,7 +357,7 @@ def group_edit(request): users_selected = group.user_set.all() users = [user for user in users_all if user not in users_selected] - return render_to_response('juser/group_add.html', locals()) + return render_to_response('juser/group_edit.html', locals()) else: group_id = request.POST.get('group_id', None) group_name = request.POST.get('group_name', None) @@ -349,7 +365,6 @@ def group_edit(request): users_selected = request.POST.getlist('users_selected') group_type = request.POST.get('group_type') group = UserGroup.objects.filter(id=group_id) - # return HttpResponse(group_type) group.update(name=group_name, comment=comment, type=group_type) group_update_user(group_id, users_selected) @@ -407,9 +422,10 @@ def user_edit(request): password = user.password ssh_key_pwd = user.ssh_key_pwd name = user.name - all_group = UserGroup.objects.filter(Q(type='M') | Q(type='A')) - groups = user.user_group.filter(Q(type='M') | Q(type='A')) - groups_str = ' '.join([str(group.id) for group in groups]) + manage_groups = UserGroup.objects.filter(type='M') + auth_groups = UserGroup.objects.filter(type='A') + manage_group_id = user.user_group.get(type='M').id + groups_str = ' '.join([str(group.id) for group in auth_groups]) user_role = {'SU': u'超级管理员', 'GA': u'组管理员', 'CU': u'普通用户'} role_post = user.role ssh_pwd = user.ssh_pwd @@ -420,8 +436,11 @@ def user_edit(request): password = request.POST.get('password', None) name = request.POST.get('name', None) email = request.POST.get('email', '') - groups = request.POST.getlist('groups', None) - groups_str = ' '.join(groups) + manage_group_id = request.POST.get('manage_group', '') + auth_groups = request.POST.getlist('groups', None) + groups = auth_groups + groups.append(manage_group_id) + groups_str = ' '.join(auth_groups) role_post = request.POST.get('role', None) ssh_pwd = request.POST.get('ssh_pwd', None) ssh_key_pwd = request.POST.get('ssh_key_pwd', None) @@ -464,14 +483,18 @@ def user_add(request): msg = '' header_title, path1, path2 = '添加用户 | Add User', 'juser', 'user_add' user_role = {'SU': u'超级管理员', 'GA': u'组管理员', 'CU': u'普通用户'} - all_group = UserGroup.objects.filter(Q(type='M') | Q(type='A')).order_by('-type') + manage_groups = UserGroup.objects.filter(type='M') + auth_groups = UserGroup.objects.filter(type='A') if request.method == 'POST': username = request.POST.get('username', None) password = request.POST.get('password', '') name = request.POST.get('name', None) email = request.POST.get('email', '') - groups = request.POST.getlist('groups', None) - groups_str = ' '.join(groups) + manage_group_id = request.POST.get('manage_group') + auth_groups = request.POST.getlist('groups', None) + groups = auth_groups + groups.append(manage_group_id) + groups_str = ' '.join(auth_groups) role_post = request.POST.get('role', 'CU') ssh_pwd = request.POST.get('ssh_pwd', '') ssh_key_pwd = request.POST.get('ssh_key_pwd', '') diff --git a/log_handler.py b/log_handler.py new file mode 100755 index 000000000..0a62aa59c --- /dev/null +++ b/log_handler.py @@ -0,0 +1,96 @@ +#!/usr/bin/python +#coding: utf-8 + +import os +import sys +import time + +cur_dir = os.path.dirname(__file__) +sys.path.append('%s/webroot/AutoSa/' % cur_dir) +os.environ['DJANGO_SETTINGS_MODULE'] = 'jumpserver.settings' + +import django +django.setup() +from jlog.models import Log + + +def log_hanler(pid): + log = Log.objects.filter(id=pid) + if log: + log = log[0] + filename = log.logfile + if os.path.isfile(filename): + ret1 = os.system('cat %s | grep "DateTime" > %s.his' % (filename, filename)) + ret2 = os.system('cat %s | grep "\[.*@.*\][\$\#]" >> %s.his' % (filename, filename)) + ret3 = os.system('cat %s | grep "EndTime" >> %s.his' % (filename, filename)) + if (ret1 + ret2 + ret3) == 0: + print 'Handler %s ok.' % filename + + +def set_finish(id): + logs = Log.objects.filter(id=id, finish=0) + if logs: + structtime_start = time.localtime() + timestamp_end = int(time.mktime(structtime_start)) + log = logs[0] + log.finish = 1 + log.end_time = timestamp_end + log.save() + + +def kill_pid(pid): + try: + os.kill(pid, 9) + except OSError: + pass + + +def pid_exist(pid): + pid_dir = "/proc/%s" % pid + if os.path.isdir(pid_dir): + return True + else: + return False + + +def del_pid(pid_id): + pid = Pid.objects.filter(id=pid_id) + if pid: + pid[0].delete() + + +def get_pids(): + pids = [] + pids_obj = Pid.objects.all() + for pid_obj in pids_obj: + pids.append((pid_obj.id, pid_obj.ppid, pid_obj.cpid, pid_obj.pid, pid_obj.start_time)) + return pids + + +def run(): + for pid_id, ppid, cpid, pid, start_time in get_pids(): + if pid_exist(cpid): + if pid_exist(ppid): + structtime_start = time.localtime() + timestamp_end = int(time.mktime(structtime_start)) + if timestamp_end - start_time > 7200: + kill_pid(ppid) + kill_pid(cpid) + del_pid(pid_id) + set_finish(pid) + log_hanler(pid) + else: + kill_pid(cpid) + del_pid(pid_id) + set_finish(pid) + log_hanler(pid) + else: + del_pid(pid_id) + set_finish(pid) + log_hanler(pid) + + +if __name__ == '__main__': + while True: + run() + time.sleep(0.5) diff --git a/static/js/base.js b/static/js/base.js index f0c9d7f5c..77a1affd2 100644 --- a/static/js/base.js +++ b/static/js/base.js @@ -59,7 +59,6 @@ function GetTableDataBox() { return returnData; } - function move(from, to) { $("#" + from + " option").each(function () { if ($(this).prop("selected") == true) { @@ -73,3 +72,34 @@ function move_all(from, to) { $("#" + to).append(this); }); } + +function selectAll(){ + var checklist = document.getElementsByName ("selected"); + if(document.getElementById("select_all").checked) + { + for(var i=0;i - @@ -10,7 +9,6 @@ -{##} @@ -18,10 +16,21 @@ + + + + + + + \ No newline at end of file diff --git a/templates/head_script.html b/templates/head_script.html index 8cd64fadf..5c316f882 100644 --- a/templates/head_script.html +++ b/templates/head_script.html @@ -2,9 +2,6 @@ - - - diff --git a/templates/jlog/log_list.html b/templates/jlog/log_list.html index cd9b98720..575f560c9 100644 --- a/templates/jlog/log_list.html +++ b/templates/jlog/log_list.html @@ -102,7 +102,7 @@ {{ post.user.name }} {{ post.asset.ip }} - 命令统计 + 命令统计 {{ post.start_time|date:"Y-m-d H:i:s"}} {{ post.end_time|date:"Y-m-d H:i:s" }} diff --git a/templates/jperm/perm_list.html b/templates/jperm/perm_list.html index dd8436d6c..a9b3f9d20 100644 --- a/templates/jperm/perm_list.html +++ b/templates/jperm/perm_list.html @@ -33,8 +33,20 @@
@@ -47,13 +59,15 @@ 组名 - 类型 + + 类型 + 成员数量 授权数量 操作 - + {% for group in contacts.object_list %} {{ group.name }} @@ -61,7 +75,7 @@ {{ group.id|member_count }} {{ group.id|perm_count }} - 详情 + 详情 编辑 删除 @@ -120,7 +134,7 @@ 操作 - + {% for user in contacts2.object_list %} {{ user.name }} @@ -128,7 +142,7 @@ {{ user.username | groups_str }} {{ user.id | perm_asset_count }} - 详情 + 详情 {% endfor %} @@ -192,6 +206,29 @@ $(document).ready(function(){ $(".iframe").colorbox({iframe:true, width:"70%", height:"70%"}); }); + + $(document).ready(function(){ + $('#search_btn').click(function(){ + if ($('#tab2').attr('class') == 'active'){ + var tab='tab2' + } else { + var tab='tab1' + } + + var search=$('#search_input').val() + + $.post('/jperm/perm_list_ajax/', + {'tab': tab, 'search': search}, + function(data){ + if ($('#tab2').attr('class') == 'active'){ + $('#tab-2').html(data) + } else { + $('#tab-1').html(data) + } + }) + + }) + }) {% endblock %} \ No newline at end of file diff --git a/templates/jperm/perm_list_ajax.html b/templates/jperm/perm_list_ajax.html new file mode 100644 index 000000000..64a15a0f2 --- /dev/null +++ b/templates/jperm/perm_list_ajax.html @@ -0,0 +1,132 @@ +{% load mytags %} +{% ifequal tab 'tab1' %} + + + + + + + + + + + + {% for group in contacts.object_list %} + + + + + + + + {% endfor %} + +
组名 + 类型 + 成员数量授权数量操作
{{ group.name }} {{ group.type|group_type_to_str }} {{ group.id|member_count }} {{ group.id|perm_count }} + 详情 + 编辑 + 删除 +
+
+
+
+ Showing {{ contacts.start_index }} to {{ contacts.end_index }} of {{ p.count }} entries +
+
+
+
+
    + {% if contacts.has_previous %} + + {% else %} + + {% endif %} + {% for page in p.page_range %} + {% ifequal offset1 page %} +
  • {{ page }}
    • + {% else %} +
  • {{ page }}
    • + {% endifequal %} + {% endfor %} + {% if contacts.has_next %} + + {% else %} + + {% endif %} +
+
+
+
+{% else %} + + + + + + + + + + + + {% for user in contacts2.object_list %} + + + + + + + + {% endfor %} + +
用户角色属组主机数量操作
{{ user.name }} {{ user.id | get_role }} {{ user.username | groups_str }} {{ user.id | perm_asset_count }} + 详情 +
+
+
+
+ Showing {{ contacts2.start_index }} to {{ contacts2.end_index }} of {{ p2.count }} entries +
+
+
+
+
    + {% if contacts2.has_previous %} + + {% else %} + + {% endif %} + {% for page in p2.page_range %} + {% ifequal offset1 page %} +
  • {{ page }}
    • + {% else %} +
  • {{ page }}
    • + {% endifequal %} + {% endfor %} + {% if contacts2.has_next %} + + {% else %} + + {% endif %} +
+
+
+
+{% endifequal %} \ No newline at end of file diff --git a/templates/juser/group_add.html b/templates/juser/group_add.html index db20f8506..c5d96d522 100644 --- a/templates/juser/group_add.html +++ b/templates/juser/group_add.html @@ -34,12 +34,6 @@ {% if msg %}
{{ msg }}
{% endif %} -
@@ -50,9 +44,9 @@
- {% for t, type_name in group_types.items %} - {% ifequal t group_type %} + {% ifequal t group_type_select %} {% else %} @@ -63,7 +57,7 @@
- +
- {% for user in users_selected %} - - {% endfor %}
@@ -98,8 +89,8 @@
- - + +
@@ -131,5 +122,23 @@ $('#groupForm').validator({ form.submit(); } }); + +function change_type(type){ + $.post('/juser/group_add_ajax/', + {'type': type}, + function(data){ + $('#users').html(data) + }) +} + +$(document).ready(function(){ + $("#submit_button").click(function(){ + $('#users_selected option').each(function(){ + $(this).prop('selected', true) + }) + }) +}) + + {% endblock %} \ No newline at end of file diff --git a/templates/juser/group_add_ajax.html b/templates/juser/group_add_ajax.html new file mode 100644 index 000000000..e842df809 --- /dev/null +++ b/templates/juser/group_add_ajax.html @@ -0,0 +1,4 @@ +{% for user in users %} + +{% endfor %} + diff --git a/templates/juser/group_edit.html b/templates/juser/group_edit.html new file mode 100644 index 000000000..bcbd63d56 --- /dev/null +++ b/templates/juser/group_edit.html @@ -0,0 +1,133 @@ +{% extends 'base.html' %} +{% load mytags %} +{% block content %} + {% include 'nav_cat_bar.html' %} +
+
+
+
+
+
填写基本信息 Fill group info.
+
+ + + + + + + + + + +
+
+
+
+ {% if error %} +
{{ error }}
+ {% endif %} + {% if msg %} +
{{ msg }}
+ {% endif %} +
+ +
+ + +
+
+
+
+ +
+ + +
+
+
+
+ +
+ +
+
+
+ + +
+
+
+
+ +
+
+
+
+
+ +
+ +
+
+ +
+
+
+ + +
+
+
+
+
+
+
+
+ + +{% endblock %} \ No newline at end of file diff --git a/templates/juser/group_list.html b/templates/juser/group_list.html index 0a045d8f7..50cb1c795 100644 --- a/templates/juser/group_list.html +++ b/templates/juser/group_list.html @@ -53,7 +53,7 @@ {{ group.id|member_count }} {{ group.comment }} - 成员 + 成员 编辑 删除 diff --git a/templates/juser/user_add.html b/templates/juser/user_add.html index 68bf3f1a5..5513c1a3c 100644 --- a/templates/juser/user_add.html +++ b/templates/juser/user_add.html @@ -71,21 +71,36 @@
- +
- + {% for group in manage_groups %} + {% ifequal group.id manage_group_id %} + + {% else %} + + {% endifequal %} + {% endfor %} + +
+
+
+
+ +
+