diff --git a/connect.py b/connect.py index 760f484a0..535b61b0e 100755 --- a/connect.py +++ b/connect.py @@ -3,6 +3,7 @@ import socket import sys import os +import re import ast import select import time @@ -23,7 +24,7 @@ from django.core.exceptions import ObjectDoesNotExist os.environ['DJANGO_SETTINGS_MODULE'] = 'jumpserver.settings' django.setup() from juser.models import User -from jasset.models import Asset +from jasset.models import AssetAlias from jlog.models import Log from jumpserver.api import * try: @@ -98,7 +99,7 @@ def log_record(username, host): today_connect_log_dir = os.path.join(connect_log_dir, today) log_filename = '%s_%s_%s.log' % (username, host, time_now) log_file_path = os.path.join(today_connect_log_dir, log_filename) - dept_name = User.objects.get(username=username).dept + dept_name = User.objects.get(username=username).dept.name pid = os.getpid() ip_list = [] remote_ip = os.popen("who |grep `ps aux |gawk '{if ($2==%s) print $1}'` |gawk '{print $5}'|tr -d '()'" % pid).readlines() @@ -160,7 +161,6 @@ def posix_shell(chan, username, host): chan.send(x) finally: - timestamp_end = time.time() termios.tcsetattr(sys.stdin, termios.TCSADRAIN, old_tty) log_file.write('Endtime is %s' % datetime.now()) log_file.close() @@ -168,14 +168,20 @@ def posix_shell(chan, username, host): log.log_finished = False log.end_time = datetime.now() log.save() + print_prompt() def get_user_host(username): """Get the hosts of under the user control.""" hosts_attr = {} asset_all = user_perm_asset_api(username) + user = User.objects.get(username=username) for asset in asset_all: - hosts_attr[asset.ip] = [asset.id, asset.comment] + alias = AssetAlias.objects.filter(user=user, host=asset) + if alias and alias[0].alias != '': + hosts_attr[asset.ip] = [asset.id, asset.ip, alias[0].alias] + else: + hosts_attr[asset.ip] = [asset.id, asset.ip, asset.comment] return hosts_attr @@ -188,6 +194,20 @@ def get_user_hostgroup(username): return groups_attr +def get_user_hostgroup_host(username, gid): + """Get the hostgroup hosts of under the user control.""" + hosts_attr = {} + user = User.objects.get(username=username) + hosts = user_perm_group_hosts_api(gid) + for host in hosts: + alias = AssetAlias.objects.filter(user=user, host=host) + if alias and alias[0].alias != '': + hosts_attr[host.ip] = [host.id, host.ip, alias[0].alias] + else: + hosts_attr[host.ip] = [host.id, host.ip, host.comment] + return hosts_attr + + def get_connect_item(username, ip): asset = get_object(Asset, ip=ip) @@ -219,13 +239,16 @@ def get_connect_item(username, ip): def verify_connect(username, part_ip): + ip_matched = [] hosts_attr = get_user_host(username) - hosts = hosts_attr.keys() - ip_matched = [ip for ip in hosts if part_ip in ip] - + hosts = hosts_attr.values() + for ip_info in hosts: + for info in ip_info[1:]: + if part_ip in info: + ip_matched.append(ip_info[1]) if len(ip_matched) > 1: for ip in ip_matched: - print '%s -- %s' % (ip, hosts_attr[ip][1]) + print '%s -- %s' % (ip, hosts_attr[ip][2]) elif len(ip_matched) < 1: color_print('No Permission or No host.', 'red') else: @@ -238,8 +261,9 @@ def print_prompt(): 1) Type \033[32mIP ADDRESS\033[0m To Login. 2) Type \033[32mP/p\033[0m To Print The Servers You Available. 3) Type \033[32mG/g\033[0m To Print The Server Groups You Available. - 4) Type \033[32mE/e\033[0m To Execute Command On Several Servers. - 5) Type \033[32mQ/q\033[0m To Quit. + 4) Type \033[32mG/g+gid\033[0m To Print The Server Group Hosts You Available. + 5) Type \033[32mE/e\033[0m To Execute Command On Several Servers. + 6) Type \033[32mQ/q\033[0m To Quit. """ print textwrap.dedent(msg) @@ -249,14 +273,27 @@ def print_user_host(username): hosts = hosts_attr.keys() hosts.sort() for ip in hosts: - print '%s -- %s' % (ip, hosts_attr[ip][1]) + print '%-15s -- %s' % (ip, hosts_attr[ip][2]) def print_user_hostgroup(username): group_attr = get_user_hostgroup(username) groups = group_attr.keys() for g in groups: - print '%s -- %s' % (g, group_attr[g][1]) + print "[%3s]%s -- %s" % (group_attr[g][0], g, group_attr[g][1]) + + +def print_user_hostgroup_host(username, gid): + pattern = re.compile(r'\d+') + match = pattern.match(gid) + if match: + hosts_attr = get_user_hostgroup_host(username, gid) + hosts = hosts_attr.keys() + hosts.sort() + for ip in hosts: + print '%-15s -- %s' % (ip, hosts_attr[ip][2]) + else: + color_print('No such group id, Please check it.', 'red') def connect(username, password, host, port, login_name): @@ -377,9 +414,13 @@ if __name__ == '__main__': elif option in ['G', 'g']: print_user_hostgroup(LOGIN_NAME) continue + elif option.startswith('g') or option.startswith('G'): + gid = option[1:].strip() + print_user_hostgroup_host(LOGIN_NAME, gid) + continue elif option in ['E', 'e']: exec_cmd_servers(LOGIN_NAME) - elif option in ['Q', 'q']: + elif option in ['Q', 'q', 'exit']: sys.exit() else: try: diff --git a/jasset/models.py b/jasset/models.py index 5c2be96b2..ab65792da 100644 --- a/jasset/models.py +++ b/jasset/models.py @@ -1,6 +1,6 @@ import datetime from django.db import models -from juser.models import UserGroup, DEPT +from juser.models import User, UserGroup, DEPT class IDC(models.Model): @@ -43,4 +43,13 @@ class Asset(models.Model): comment = models.CharField(max_length=100, blank=True, null=True) def __unicode__(self): - return self.ip \ No newline at end of file + return self.ip + + +class AssetAlias(models.Model): + user = models.ForeignKey(User) + host = models.ForeignKey(Asset) + alias = models.CharField(max_length=100, blank=True, null=True) + + def __unicode__(self): + return self.comment \ No newline at end of file diff --git a/jasset/urls.py b/jasset/urls.py index 7e8912a67..1002ee691 100644 --- a/jasset/urls.py +++ b/jasset/urls.py @@ -13,13 +13,14 @@ urlpatterns = patterns('', url(r'^idc_edit/$', edit_idc), url(r'^idc_detail/$', detail_idc), url(r'^idc_del/(\w+)/$', del_idc), - url(r'^jgroup_add/$', add_group), + url(r'^group_add/$', add_group), url(r'^group_edit/$', edit_group), - url(r'^jgroup_list/$', list_group), + url(r'^group_list/$', list_group), url(r'^group_detail/$', detail_group), url(r'^group_del_host/(\w+)/$', group_del_host), url(r'^group_del/(\w+)/$', group_del), url(r'^host_del/(\w+)/$', host_del), url(r'^host_edit/$', host_edit), url(r'^host_edit/batch/$', batch_host_edit), + url(r'^host_edit_common/batch/$', batch_host_edit_common), ) \ No newline at end of file diff --git a/jasset/views.py b/jasset/views.py index e61617eaa..4807f6efb 100644 --- a/jasset/views.py +++ b/jasset/views.py @@ -6,9 +6,11 @@ from django.db.models import Q from django.template import RequestContext from django.shortcuts import render_to_response -from models import IDC, Asset, BisGroup +from jasset.models import IDC, Asset, BisGroup, AssetAlias from juser.models import UserGroup, DEPT from jumpserver.views import jasset_host_edit, pages +from jperm.models import Perm, SudoPerm +from jumpserver.views import pages from jumpserver.api import * cryptor = PyCrypt(KEY) @@ -51,6 +53,43 @@ def f_add_host(ip, port, idc, jtype, group, dept, active, comment, username='', a.save() +def jasset_host_edit(j_id, j_ip, j_idc, j_port, j_type, j_group, j_dept, j_active, j_comment, j_user='', j_password=''): + groups, depts = [], [] + is_active = {u'是': '1', u'否': '2'} + login_types = {'LDAP': 'L', 'MAP': 'M'} + for group in j_group[0].split(): + c = BisGroup.objects.get(name=group.strip()) + groups.append(c) + print j_dept + for d in j_dept[0].split(): + p = DEPT.objects.get(name=d.strip()) + depts.append(p) + + j_type = login_types[j_type] + j_idc = IDC.objects.get(name=j_idc) + a = Asset.objects.get(id=j_id) + if j_type == 'M': + a.ip = j_ip + a.port = j_port + a.login_type = j_type + a.idc = j_idc + a.is_active = j_active + a.comment = j_comment + a.username = j_user + a.password = j_password + else: + a.ip = j_ip + a.port = j_port + a.idc = j_idc + a.login_type = j_type + a.is_active = is_active[j_active] + a.comment = j_comment + a.save() + a.bis_group = groups + a.dept = depts + a.save() + + @require_admin def add_host(request): login_types = {'L': 'LDAP', 'M': 'MAP'} @@ -152,12 +191,6 @@ 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_dept, j_group - # - # if is_group_admin(request) and not validate(request, asset=[j_id]): - # emg = u'删除失败,您无权操作!' - # print 'hehe' - # return HttpResponseRedirect('/jasset/host_list/') if j_type == 'M': j_user = "editable[" + str(i) + "][j_user]" @@ -165,13 +198,36 @@ def batch_host_edit(request): j_user = request.POST.get(j_user).strip() password = request.POST.get(j_password).strip() j_password = cryptor.encrypt(password) - jasset_host_edit(j_id, j_ip, j_idc, j_port, j_type, j_group, j_dept, j_active, j_comment, j_user, j_password) + jasset_host_edit(j_id, j_ip, j_idc, j_port, j_type, j_group, j_dept, j_active, j_comment, j_user, + j_password) else: jasset_host_edit(j_id, j_ip, j_idc, j_port, j_type, j_group, j_dept, j_active, j_comment) return render_to_response('jasset/host_list.html') +@require_login +def batch_host_edit_common(request): + user_id = request.session.get('user_id', '') + u = User.objects.get(id=user_id) + if request.method == 'POST': + len_table = request.POST.get('len_table') + for i in range(int(len_table)): + j_id = "editable[" + str(i) + "][j_id]" + j_alias = "editable[" + str(i) + "][j_alias]" + j_id = request.POST.get(j_id).strip() + j_alias = request.POST.get(j_alias).strip() + a = Asset.objects.get(id=j_id) + asset_alias = AssetAlias.objects.filter(user=u, host=a) + if asset_alias: + asset_alias = asset_alias[0] + asset_alias.alias = j_alias + asset_alias.save() + else: + AssetAlias.objects.create(user=u, host=a, alias=j_alias) + return render_to_response('jasset/host_list_common.html') + + @require_login def list_host(request): header_title, path1, path2 = u'查看主机', u'资产管理', u'查看主机' @@ -179,28 +235,63 @@ def list_host(request): keyword = request.GET.get('keyword', '') dept_id = get_user_dept(request) dept = DEPT.objects.get(id=dept_id) - if is_super_user(request): - if keyword: - posts = Asset.objects.filter(Q(ip__contains=keyword) | Q(idc__name__contains=keyword) | - Q(bis_group__name__contains=keyword) | Q(comment__contains=keyword)).distinct().order_by('ip') - else: - posts = Asset.objects.all().order_by('ip') - contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request) - elif is_group_admin(request): - if keyword: - posts = Asset.objects.filter(Q(ip__contains=keyword) | Q(idc__name__contains=keyword) | - Q(bis_group__name__contains=keyword) | Q(comment__contains=keyword)).filter(dept=dept).distinct().order_by('ip') - else: - posts = Asset.objects.all().filter(dept=dept).order_by('ip') - contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request) + did = request.GET.get('did') + gid = request.GET.get('gid') + sid = request.GET.get('sid') + if did: + dept = DEPT.objects.get(id=did) + posts = dept.asset_set.all() + return render_to_response('jasset/host_list_nop.html', locals(), context_instance=RequestContext(request)) - elif is_common_user(request): - user_id = request.session.get('user_id') - username = User.objects.get(id=user_id).name - posts = user_perm_asset_api(username) - contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request) - print posts, username - return render_to_response('jasset/host_list.html', locals(), context_instance=RequestContext(request)) + elif gid: + posts = [] + user_group = UserGroup.objects.get(id=gid) + perms = Perm.objects.filter(user_group=user_group) + for perm in perms: + for post in perm.asset_group.asset_set.all(): + posts.append(post) + posts = list(set(posts)) + return render_to_response('jasset/host_list_nop.html', locals(), context_instance=RequestContext(request)) + + elif sid: + posts = [] + user_group = UserGroup.objects.get(id=sid) + perms = Perm.objects.filter(user_group=user_group) + for perm in perms: + for post in perm.asset_group.asset_set.all(): + posts.append(post) + posts = list(set(posts)) + return render_to_response('jasset/host_list_nop.html', locals(), context_instance=RequestContext(request)) + + else: + if is_super_user(request): + if keyword: + posts = Asset.objects.filter(Q(ip__contains=keyword) | Q(idc__name__contains=keyword) | + Q(bis_group__name__contains=keyword) | Q( + comment__contains=keyword)).distinct().order_by('ip') + else: + posts = Asset.objects.all().order_by('ip') + contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request) + return render_to_response('jasset/host_list.html', locals(), context_instance=RequestContext(request)) + + elif is_group_admin(request): + if keyword: + posts = Asset.objects.filter(Q(ip__contains=keyword) | Q(idc__name__contains=keyword) | + Q(bis_group__name__contains=keyword) | Q( + comment__contains=keyword)).filter(dept=dept).distinct().order_by('ip') + else: + posts = Asset.objects.all().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/host_list.html', locals(), context_instance=RequestContext(request)) + + elif is_common_user(request): + user_id = request.session.get('user_id') + username = User.objects.get(id=user_id).name + posts = user_perm_asset_api(username) + contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request) + return render_to_response('jasset/host_list_common.html', locals(), + context_instance=RequestContext(request)) @require_admin @@ -422,16 +513,35 @@ def list_group(request): dept_id = get_user_dept(request) dept = DEPT.objects.get(id=dept_id) keyword = request.GET.get('keyword', '') - if is_super_user(request): - if keyword: - posts = BisGroup.objects.exclude(name='ALL').filter(Q(name__contains=keyword) | Q(comment__contains=keyword)) - else: - posts = BisGroup.objects.exclude(name='ALL').order_by('id') - elif is_group_admin(request): - if keyword: - posts = BisGroup.objects.filter(Q(name__contains=keyword) | Q(comment__contains=keyword)).filter(dept=dept) - else: - posts = BisGroup.objects.filter(dept=dept).order_by('id') + gid = request.GET.get('gid') + sid = request.GET.get('sid') + if gid: + posts = [] + user_group = UserGroup.objects.get(id=gid) + perms = Perm.objects.filter(user_group=user_group) + for perm in perms: + posts.append(perm.asset_group) + + elif sid: + posts = [] + user_group = UserGroup.objects.get(id=sid) + perms = Perm.objects.filter(user_group=user_group) + for perm in perms: + posts.append(perm.asset_group) + + else: + if is_super_user(request): + if keyword: + posts = BisGroup.objects.exclude(name='ALL').filter( + Q(name__contains=keyword) | Q(comment__contains=keyword)) + else: + posts = BisGroup.objects.exclude(name='ALL').order_by('id') + elif is_group_admin(request): + if keyword: + posts = BisGroup.objects.filter(Q(name__contains=keyword) | Q(comment__contains=keyword)).filter( + dept=dept) + else: + posts = BisGroup.objects.filter(dept=dept).order_by('id') contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request) return render_to_response('jasset/group_list.html', locals(), context_instance=RequestContext(request)) @@ -443,7 +553,7 @@ def edit_group(request): group = BisGroup.objects.get(id=group_id) all = Asset.objects.all() dept_id = get_user_dept(request) - eposts = contact_list = Asset.objects.filter(bis_group=group).order_by('ip') + eposts = Asset.objects.filter(bis_group=group).order_by('ip') if is_super_user(request): edept = DEPT.objects.all() @@ -489,6 +599,7 @@ def detail_group(request): return render_to_response('jasset/group_detail.html', locals(), context_instance=RequestContext(request)) +@require_admin def detail_idc(request): header_title, path1, path2 = u'IDC详情', u'资产管理', u'IDC详情' login_types = {'L': 'LDAP', 'M': 'MAP'} @@ -542,6 +653,7 @@ def group_del(request, offset): return HttpResponseRedirect('/jasset/jgroup_list/') +@require_login def host_search(request): keyword = request.GET.get('keyword') login_types = {'L': 'LDAP', 'M': 'MAP'} @@ -555,6 +667,15 @@ def host_search(request): posts = Asset.objects.filter(Q(ip__contains=keyword) | Q(idc__name__contains=keyword) | Q(bis_group__name__contains=keyword) | Q( comment__contains=keyword)).filter(dept=dept).distinct().order_by('ip') + elif is_common_user(request): + user_id = request.session.get('user_id') + username = User.objects.get(id=user_id).name + post_perm = user_perm_asset_api(username) + post_all = Asset.objects.filter(Q(ip__contains=keyword) | Q(idc__name__contains=keyword) | + Q(bis_group__name__contains=keyword) | Q(comment__contains=keyword)) \ + .distinct().order_by('ip') + posts = list(set(post_all) & set(post_perm)) + print posts contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request) return render_to_response('jasset/host_search.html', locals(), context_instance=RequestContext(request)) \ No newline at end of file diff --git a/jumpserver.conf b/jumpserver.conf index 099bd2bd9..78b98001d 100644 --- a/jumpserver.conf +++ b/jumpserver.conf @@ -9,7 +9,7 @@ database = jumpserver [ldap] ldap_enable = 1 -host_url = ldap://127.0.0.1:389 +host_url = ldap://192.168.8.230:389 base_dn = dc=jumpserver, dc=org root_dn = cn=admin,dc=jumpserver,dc=org root_pw = secret234 diff --git a/jumpserver/api.py b/jumpserver/api.py index 7737f1e7e..83be10278 100644 --- a/jumpserver/api.py +++ b/jumpserver/api.py @@ -13,7 +13,7 @@ import hashlib import datetime from django.core.paginator import Paginator, EmptyPage, InvalidPage from django.http import HttpResponse, Http404 -from juser.models import User, UserGroup +from juser.models import User, UserGroup, DEPT from jasset.models import Asset, BisGroup from jlog.models import Log @@ -258,8 +258,9 @@ def view_splitter(request, su=None, adm=None): raise Http404 -def user_perm_group_api(user): - if user: +def user_perm_group_api(username): + if username: + user = User.objects.get(username=username) perm_list = [] user_group_all = user.group.all() for user_group in user_group_all: @@ -271,6 +272,14 @@ def user_perm_group_api(user): return asset_group_list +def user_perm_group_hosts_api(gid): + hostgroup = BisGroup.objects.filter(id=gid) + if hostgroup: + return hostgroup[0].asset_set.all() + else: + return [] + + def user_perm_asset_api(username): user = User.objects.filter(username=username) if user: @@ -347,4 +356,9 @@ def validate(request, user_group=None, user=None, asset_group=None, asset=None, if not set(assets).issubset(eassets): return False - return True \ No newline at end of file + return True + + +def get_dept_asset(request): + dept_id = get_user_dept(request) + dept_asset = DEPT.objects.get(id=dept_id).asset_set.all() diff --git a/jumpserver/settings.py b/jumpserver/settings.py index 50b6ae0db..c8527ba28 100644 --- a/jumpserver/settings.py +++ b/jumpserver/settings.py @@ -53,6 +53,7 @@ INSTALLED_APPS = ( 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + 'django.contrib.humanize', 'jumpserver', 'juser', 'jasset', diff --git a/jumpserver/templatetags/mytags.py b/jumpserver/templatetags/mytags.py index 42cc1ec28..5cf0d50ae 100644 --- a/jumpserver/templatetags/mytags.py +++ b/jumpserver/templatetags/mytags.py @@ -7,6 +7,7 @@ import time from django import template from juser.models import User, UserGroup, DEPT from jumpserver.api import * +from jasset.models import AssetAlias register = template.Library() @@ -168,6 +169,17 @@ def ugrp_perm_asset_count(user_group_id): return len(set(assets)) +@register.filter(name='get_user_alias') +def get_user_alias(post, user_id): + user = User.objects.get(id=user_id) + host = Asset.objects.get(id=post.id) + alias = AssetAlias.objects.filter(user=user, host=host) + if alias: + return alias[0].alias + else: + return '' + + @register.filter(name='group_type_to_str') def group_type_to_str(type_name): group_types = { @@ -180,7 +192,12 @@ def group_type_to_str(type_name): @register.filter(name='ast_to_list') def ast_to_list(lis): - return ast.literal_eval(lis)[0:2] + ast_lis = ast.literal_eval(lis) + if len(ast_lis) <= 2: + return ','.join([i for i in ast_lis]) + else: + restr = ','.join([i for i in ast_lis[0:2]]) + '...' + return restr @register.filter(name='ast_to_list_1') @@ -188,10 +205,6 @@ def ast_to_list_1(lis): return ast.literal_eval(lis) -# @register.filter(name='perm_asset_count') -# def perm_asset_count(user_id): -# return len(perm_user_asset(user_id)) - @register.filter(name='string_length') def string_length(string, length): return '%s ...' % string[0:length] diff --git a/jumpserver/urls.py b/jumpserver/urls.py index d086d4303..3a9f54e55 100644 --- a/jumpserver/urls.py +++ b/jumpserver/urls.py @@ -1,11 +1,13 @@ from django.conf.urls import patterns, include, url +from api import view_splitter +from views import index, admin_index urlpatterns = patterns('', # Examples: # url(r'^$', 'jumpserver.views.home', name='home'), # url(r'^blog/', include('blog.urls')), - (r'^$', 'jumpserver.views.index'), + (r'^$', view_splitter, {'su': index, 'adm': admin_index}), (r'^api/user/$', 'jumpserver.api.api_user'), (r'^skin_config/$', 'jumpserver.views.skin_config'), (r'^install/$', 'jumpserver.views.install'), diff --git a/jumpserver/views.py b/jumpserver/views.py index 194bff712..9d63e0b0a 100644 --- a/jumpserver/views.py +++ b/jumpserver/views.py @@ -1,5 +1,7 @@ # coding: utf-8 +from __future__ import division + import datetime from django.db.models import Count @@ -7,6 +9,7 @@ from django.shortcuts import render_to_response from django.template import RequestContext from jasset.models import IDC from juser.models import DEPT +from jperm.models import Apply from jumpserver.api import * @@ -67,13 +70,24 @@ def index_cu(request): @require_login +@require_super_user def index(request): if request.session.get('role_id') == 0: return index_cu(request) users = User.objects.all() hosts = Asset.objects.all() - online_host = Log.objects.filter(is_finished=0) - online_user = online_host.distinct() + online = Log.objects.filter(is_finished=0) + online_host = online.values('host').distinct() + online_user = online.values('user').distinct() + active_users = User.objects.filter(is_active=1) + active_hosts = Asset.objects.filter(is_active=1) + + # percent of dashboard + percent_user = format(active_users.count() / users.count(), '.0%') + percent_host = format(active_hosts.count() / hosts.count(), '.0%') + percent_online_user = format(online_user.count() / users.count(), '.0%') + percent_online_host = format(online_host.count() / hosts.count(), '.0%') + li_date, li_str = getDaysByNum(7) today = datetime.datetime.now().day from_week = datetime.datetime.now() - datetime.timedelta(days=7) @@ -82,6 +96,89 @@ def index(request): host_top_ten = week_data.values('host').annotate(times=Count('host')).order_by('-times')[:10] user_dic, host_dic = get_data(week_data, user_top_ten, 'user'), get_data(week_data, host_top_ten, 'host') + # a week data + week_users = week_data.values('user').distinct().count() + week_hosts = week_data.count() + + user_top_five = week_data.values('user').annotate(times=Count('user')).order_by('-times')[:5] + color = ['label-success', 'label-info', 'label-primary', 'label-default', 'label-warnning'] + + # perm apply latest 10 + perm_apply_10 = Apply.objects.order_by('-date_add')[:10] + + # latest 10 login + login_10 = Log.objects.order_by('-start_time')[:10] + + # a week top 10 + for user_info in user_top_ten: + username = user_info.get('user') + last = Log.objects.filter(user=username).latest('start_time') + user_info['last'] = last + print user_top_ten + + top = {'user': '活跃用户数', 'host': '活跃主机数', 'times': '登录次数'} + top_dic = {} + for key, value in top.items(): + li = [] + for t in li_date: + year, month, day = t.year, t.month, t.day + if key != 'times': + times = week_data.filter(start_time__year=year, start_time__month=month, start_time__day=day).values(key).distinct().count() + else: + times = week_data.filter(start_time__year=year, start_time__month=month, start_time__day=day).count() + li.append(times) + top_dic[value] = li + return render_to_response('index.html', locals(), context_instance=RequestContext(request)) + + +@require_admin +def admin_index(request): + user_id = request.session.get('user_id', '') + user = User.objects.get(id=user_id) + dept = user.dept + dept_name = user.dept.name + users = User.objects.filter(dept=dept) + hosts = Asset.objects.filter(dept=dept) + online = Log.objects.filter(dept_name=dept_name, is_finished=0) + online_host = online.values('host').distinct() + online_user = online.values('user').distinct() + active_users = users.filter(is_active=1) + active_hosts = hosts.filter(is_active=1) + + # percent of dashboard + percent_user = format(active_users.count() / users.count(), '.0%') + percent_host = format(active_hosts.count() / hosts.count(), '.0%') + percent_online_user = format(online_user.count() / users.count(), '.0%') + percent_online_host = format(online_host.count() / hosts.count(), '.0%') + + li_date, li_str = getDaysByNum(7) + today = datetime.datetime.now().day + from_week = datetime.datetime.now() - datetime.timedelta(days=7) + week_data = Log.objects.filter(dept_name=dept_name, start_time__range=[from_week, datetime.datetime.now()]) + user_top_ten = week_data.values('user').annotate(times=Count('user')).order_by('-times')[:10] + host_top_ten = week_data.values('host').annotate(times=Count('host')).order_by('-times')[:10] + user_dic, host_dic = get_data(week_data, user_top_ten, 'user'), get_data(week_data, host_top_ten, 'host') + + # a week data + week_users = week_data.values('user').distinct().count() + week_hosts = week_data.count() + + user_top_five = week_data.values('user').annotate(times=Count('user')).order_by('-times')[:5] + color = ['label-success', 'label-info', 'label-primary', 'label-default', 'label-warnning'] + + # perm apply latest 10 + perm_apply_10 = Apply.objects.order_by('-date_add')[:10] + + # latest 10 login + login_10 = Log.objects.order_by('-start_time')[:10] + + # a week top 10 + for user_info in user_top_ten: + username = user_info.get('user') + last = Log.objects.filter(user=username).latest('start_time') + user_info['last'] = last + print user_top_ten + top = {'user': '活跃用户数', 'host': '活跃主机数', 'times': '登录次数'} top_dic = {} for key, value in top.items(): @@ -101,51 +198,6 @@ def skin_config(request): return render_to_response('skin_config.html') -def jasset_group_add(name, comment, jtype): - if BisGroup.objects.filter(name=name): - emg = u'该业务组已存在!' - else: - BisGroup.objects.create(name=name, comment=comment, type=jtype) - smg = u'业务组%s添加成功' % name - - -def jasset_host_edit(j_id, j_ip, j_idc, j_port, j_type, j_group, j_dept, j_active, j_comment, j_user='', j_password=''): - groups, depts = [], [] - is_active = {u'是': '1', u'否': '2'} - login_types = {'LDAP': 'L', 'MAP': 'M'} - for group in j_group[0].split(): - c = BisGroup.objects.get(name=group.strip()) - groups.append(c) - print j_dept - for d in j_dept[0].split(): - p = DEPT.objects.get(name=d.strip()) - depts.append(p) - - j_type = login_types[j_type] - j_idc = IDC.objects.get(name=j_idc) - a = Asset.objects.get(id=j_id) - if j_type == 'M': - a.ip = j_ip - a.port = j_port - a.login_type = j_type - a.idc = j_idc - a.is_active = j_active - a.comment = j_comment - a.username = j_user - a.password = j_password - else: - a.ip = j_ip - a.port = j_port - a.idc = j_idc - a.login_type = j_type - a.is_active = is_active[j_active] - a.comment = j_comment - a.save() - a.bis_group = groups - a.dept = depts - a.save() - - def pages(posts, r): """分页公用函数""" contact_list = posts @@ -222,28 +274,6 @@ def filter_ajax_api(request): return render_to_response('filter_ajax_api.html', locals()) -# def perm_user_asset(user_id=None, username=None): -# if user_id: -# user = User.objects.get(id=user_id) -# else: -# user = User.objects.get(username=username) -# user_groups = user.user_group.all() -# perms = [] -# assets = [] -# asset_groups = [] -# for user_group in user_groups: -# perm = user_group.perm_set.all() -# perms.extend(perm) -# -# for perm in perms: -# asset_groups.extend(perm.asset_group.all()) -# -# for asset_group in asset_groups: -# assets.extend(list(asset_group.asset_set.all())) -# -# return assets - - def install(request): from juser.models import DEPT, User dept = DEPT(id=1, name="超管部", comment="超级管理员部门") diff --git a/templates/index.html b/templates/index.html index f1d4cc6b8..c7b5829fe 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,4 +1,6 @@ {% extends 'base.html' %} +{% load mytags %} +{% load humanize %} {% block content %} {% include 'nav_cat_bar.html' %} @@ -12,7 +14,7 @@

{{ users.count}}

-
98%
+
{{ percent_user }}
All user
@@ -25,7 +27,7 @@

{{ hosts.count }}

-
20%
+
{{ percent_host }}
All host
@@ -39,7 +41,7 @@

-
44%
+
{{ percent_online_user }}
Online user
@@ -53,28 +55,175 @@

-
38%
+
{{ percent_online_host }}
Connected host
-
-
-
-
-
-
-
+
+
+

活跃用户TOP5

+ 过去一周共有{{ week_users }}位用户登录{{ week_hosts }}次服务器. + +
+
+
+
+ +
+
+
+
+
权限申请
+
+ + + + + + +
+
+
+

权限申请记录

+ 最近十条权限申请记录信息. +
+
+
+ {% for perm in perm_apply_10 %} +
+
+ {% ifequal perm.status 0 %} + {{ perm.date_add|naturaltime }} + {% else %} + {{ perm.date_add|naturaltime }} + {% endifequal %} + {{ perm.applyer }} +
申请 {{ perm.bisgroup|ast_to_list }} 主机组权限
+
申请 {{ perm.asset|ast_to_list }} 主机权限
+ {{ perm.date_add }} +
+
+ {% endfor %} +
+
+
+
+
+
+
+
最近十次登录
+
+ 10 Messages +
+
+
+

登录记录

+ 最近十次登录记录. +
+
+
+
+ {% for login in login_10 %} +
+ + image + +
+ {% ifequal login.is_finished 0 %} + {{ login.start_time|naturaltime }} + {% else %} + {{ login.start_time|naturaltime }} + {% endifequal %} + {{ login.user }} 登录了{{ login.host }}
+ {{ login.start_time }} + +
+
+ {% endfor %} +
+ + + +
+ +
+
+
+ +
+
+
+
一周Top10用户
+
+ + + + + + + + + + +
+
+
+

一周Top10用户

+ 一周Top10用户登录次数及最近一次登录记录. +
+
+ {% for data in user_top_ten %} +
+
+
+ + {{ data.user }} +
+ {{ data.times }}次 +
+
+

最近一次登录

+

{{ data.last.host }}

+

于{{ data.last.start_time |date:"Y-m-d H:i:s" }}

+
+
+
+ {% endfor %} +
+
+
+ + + + + + +
{% endblock %} \ No newline at end of file diff --git a/templates/jasset/host_list_common.html b/templates/jasset/host_list_common.html new file mode 100644 index 000000000..abd2ba6fc --- /dev/null +++ b/templates/jasset/host_list_common.html @@ -0,0 +1,172 @@ +{% extends 'base.html' %} +{% load mytags %} +{% block content %} +{% include 'nav_cat_bar.html' %} + +
+
+
+
+
+
主机详细信息列表
+
+ + + + + + + + + + +
+
+ +
+
+ 点击别名栏修改主机别名, 可在跳板机上使用别名直接登录. + +
+ +
+ + + + + + + + + + + + + + + + + {% for post in contacts.object_list %} + + + + + + + + + + + + + {% endfor %} + +
IP地址 端口号 登录方式 所属IDC 所属部门 所属主机组 别名 备注 操作
{{ post.ip }} {{ post.port }} {{ login_types|get_item:post.login_type }} {{ post.idc.name }} {{ post.dept.all | group_str2 }}{{ post.bis_group.all | group_str2_all }} {{ post|get_user_alias:user_id }} {{ post.comment }} + 详情 +
+
+
+ +
+ {% include 'paginator.html' %} +
+
+
+
+
+
+
+ + + +{% endblock %} \ No newline at end of file diff --git a/templates/jasset/host_list_nop.html b/templates/jasset/host_list_nop.html new file mode 100644 index 000000000..7593f939e --- /dev/null +++ b/templates/jasset/host_list_nop.html @@ -0,0 +1,177 @@ +{% extends 'base.html' %} +{% load mytags %} +{% block content %} +{% include 'nav_cat_bar.html' %} + +
+
+
+
+
+
主机详细信息列表
+
+ + + + + + + + + + +
+
+ +
+
+ 添加 + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + {% for post in posts %} + + + + + + + + + + + + + {% endfor %} + +
IP地址 端口号 登录方式 所属IDC 所属部门 所属主机组 是否激活 备注 操作
{{ post.ip }} {{ post.port }} {{ login_types|get_item:post.login_type }} {{ post.idc.name }} {{ post.dept.all | group_str2 }}{{ post.bis_group.all | group_str2_all }} {{ post.is_active|bool2str }} {{ post.comment }} + 详情 + {% ifnotequal session_role_id 0 %} + 编辑 + 删除 + {% endifnotequal %} +
+
+
+ + +
+ +
+
+
+
+
+
+
+ + + +{% endblock %} \ No newline at end of file diff --git a/templates/jasset/host_search.html b/templates/jasset/host_search.html index a160a1160..8921e73c8 100644 --- a/templates/jasset/host_search.html +++ b/templates/jasset/host_search.html @@ -8,7 +8,11 @@ 登录方式 所属IDC 所属业务组 - 是否激活 + {% ifnotequal session_role_id 0 %} + 是否激活 + {% else %} + 别名 + {% endifnotequal %} 添加时间 备注 操作 @@ -23,13 +27,19 @@ {{ login_types|get_item:post.login_type }} {{ post.idc.name }} {{ post.bis_group.all | group_str2 }} - {{ post.is_active|bool2str }} + {% ifnotequal session_role_id 0 %} + {{ post.is_active|bool2str }} + {% else %} + {{ post|get_user_alias:user_id }} + {% endifnotequal %} {{ post.date_added|date:"Y-m-d H:i:s" }} {{ post.comment }} 详情 - 编辑 - 删除 + {% ifnotequal session_role_id 0 %} + 编辑 + 删除 + {% endifnotequal %} {% endfor %} diff --git a/templates/jperm/dept_perm_list.html b/templates/jperm/dept_perm_list.html index 92d3312b5..92d467d89 100644 --- a/templates/jperm/dept_perm_list.html +++ b/templates/jperm/dept_perm_list.html @@ -58,8 +58,8 @@ {% for dept in contacts.object_list %} {{ dept.name }} - {{ dept.id | dept_user_num }} - {{ dept.id | dept_asset_num }} + {{ dept.id | dept_user_num }} + {{ dept.id | dept_asset_num }} {{ dept.comment }} {# 主机#} diff --git a/templates/jperm/perm_apply.html b/templates/jperm/perm_apply.html index 52a01fb6c..4b0f049b7 100644 --- a/templates/jperm/perm_apply.html +++ b/templates/jperm/perm_apply.html @@ -74,7 +74,7 @@
- +