Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei

Conflicts:
	connect.py
	jumpserver.conf
	jumpserver/api.py

connect.py

@@ -3,6 +3,7 @@
 import socket
 import sys
 import os
+import ast
 import select
 import time
 from datetime import datetime
@@ -24,8 +25,7 @@ django.setup()
 from juser.models import User
 from jasset.models import Asset
 from jlog.models import Log
-from jumpserver.api import user_perm_asset_api, PyCrypt, BASE_DIR, CONF, CRYPTOR, KEY
-
+from jumpserver.api import *
 try:
     import termios
     import tty
@@ -98,7 +98,13 @@ 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
     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()
+    for ip in remote_ip:
+        ip_list.append(ip.strip('\n'))
+    ip_list = ','.join(list(set(ip_list)))
 
     if not os.path.isdir(today_connect_log_dir):
         try:
@@ -112,7 +118,7 @@ def log_record(username, host):
     except IOError:
         raise ServerError('Create logfile failed, Please modify %s permission.' % today_connect_log_dir)
 
-    log = Log(user=username, host=host, log_path=log_file_path, start_time=datetime.now(), pid=pid)
+    log = Log(user=username, host=host, remote_ip=ip_list, dept_name=dept_name, log_path=log_file_path, start_time=datetime.now(), pid=pid)
     log_file.write('Starttime is %s\n' % datetime.now())
     log.save()
     return log_file, log
@@ -173,6 +179,15 @@ def get_user_host(username):
     return hosts_attr
 
 
+def get_user_hostgroup(username):
+    """Get the hostgroups of under the user control."""
+    groups_attr = {}
+    group_all = user_perm_group_api(username)
+    for group in group_all:
+        groups_attr[group.name] = [group.id, group.comment]
+    return groups_attr
+
+
 def get_connect_item(username, ip):
 
     asset = get_object(Asset, ip=ip)
@@ -222,8 +237,9 @@ def print_prompt():
     msg = """\033[1;32m###  Welcome Use JumpServer To Login. ### \033[0m
           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[32mE/e\033[0m To Execute Command On Several Servers.
-          4) Type \033[32mQ/q\033[0m To Quit.
+          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.
           """
     print textwrap.dedent(msg)
 
@@ -236,6 +252,13 @@ def print_user_host(username):
         print '%s -- %s' % (ip, hosts_attr[ip][1])
 
 
+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])
+
+
 def connect(username, password, host, port, login_name):
     """
     Connect server.
@@ -351,6 +374,9 @@ if __name__ == '__main__':
             if option in ['P', 'p']:
                 print_user_host(LOGIN_NAME)
                 continue
+            elif option in ['G', 'g']:
+                print_user_hostgroup(LOGIN_NAME)
+                continue
             elif option in ['E', 'e']:
                 exec_cmd_servers(LOGIN_NAME)
             elif option in ['Q', 'q']:

docs/AddUserAsset.py

@@ -13,7 +13,6 @@ django.setup()
 from juser.views import db_add_user, md5_crypt, CRYPTOR, db_add_group
 from jasset.models import Asset, IDC, BisGroup
 from juser.models import UserGroup, DEPT, User
-from jasset.views import jasset_group_add
 from jperm.models import CmdGroup
 from jlog.models import Log
 
@@ -123,18 +122,18 @@ def test_add_log():
         end_time = datetime.datetime.now()
         log_path = '/var/log/jumpserver/test.log'
         host = '192.168.1.' + str(ip)
-        Log.objects.create(user=user, host=host, log_path=log_path, pid=168, start_time=start_time,
+        Log.objects.create(user=user, host=host, remote_ip='8.8.8.8', dept_name='运维部', log_path=log_path, pid=168, start_time=start_time,
                            is_finished=1, log_finished=1, end_time=end_time)
 
 
 if __name__ == '__main__':
-    install()
-    test_add_dept()
-    test_add_group()
-    test_add_user()
-    test_add_idc()
-    test_add_asset_group()
-    test_add_asset()
+    #install()
+    #test_add_dept()
+    #test_add_group()
+    #test_add_user()
+    #test_add_idc()
+    #test_add_asset_group()
+    #test_add_asset()
     test_add_log()
 
 

docs/install.py

+#coding:utf-8
+import django
+import os
+import sys
+import random
+import datetime
+
+sys.path.append('../')
+os.environ['DJANGO_SETTINGS_MODULE'] = 'jumpserver.settings'
+django.setup()
+
+
+from juser.views import db_add_user, md5_crypt, CRYPTOR, db_add_group
+from jasset.models import Asset, IDC, BisGroup
+from juser.models import UserGroup, DEPT, User
+from jasset.views import jasset_group_add
+from jperm.models import CmdGroup
+from jlog.models import Log
+
+
+def install():
+    IDC.objects.create(name='ALL', comment='ALL')
+    IDC.objects.create(name='默认', comment='默认')
+    DEPT.objects.create(name="默认", comment="默认部门")
+    DEPT.objects.create(name="超管部", comment="超级管理员部门")
+    dept = DEPT.objects.get(name='超管部')
+    dept2 = DEPT.objects.get(name='默认')
+    UserGroup.objects.create(name='ALL', dept=dept, comment='ALL')
+    UserGroup.objects.create(name='默认', dept=dept, comment='默认')
+
+    BisGroup.objects.create(name='ALL', dept=dept, comment='ALL')
+    BisGroup.objects.create(name='默认', dept=dept, comment='默认')
+
+    User(id=5000, username="admin", password=md5_crypt('admin'),
+         name='admin', email='admin@jumpserver.org', role='SU', is_active=True, dept=dept).save()
+    User(id=5001, username="group_admin", password=md5_crypt('group_admin'),
+         name='group_admin', email='group_admin@jumpserver.org', role='DA', is_active=True, dept=dept2).save()
+
+
+def test_add_idc():
+    for i in range(1, 20):
+        name = 'IDC' + str(i)
+        IDC.objects.create(name=name, comment='')
+        print 'Add: %s' % name
+
+
+def test_add_dept():
+    for i in range(1, 100):
+        name = 'DEPT' + str(i)
+        print "Add: %s" % name
+        DEPT.objects.create(name=name, comment=name)
+
+
+def test_add_group():
+    dept_all = DEPT.objects.all()
+    for i in range(1, 100):
+        name = 'UserGroup' + str(i)
+        UserGroup.objects.create(name=name, dept=random.choice(dept_all), comment=name)
+        print 'Add: %s' % name
+
+
+def test_add_cmd_group():
+    for i in range(1, 20):
+        name = 'CMD' + str(i)
+        cmd = '/sbin/ping%s, /sbin/ifconfig/' % str(i)
+        CmdGroup.objects.create(name=name, cmd=cmd, comment=name)
+        print 'Add: %s' % name
+
+
+def test_add_user():
+    for i in range(1, 500):
+        username = "test" + str(i)
+        dept_all = DEPT.objects.all()
+        group_all = UserGroup.objects.all()
+        group_all_id = [group.id for group in group_all]
+        db_add_user(username=username,
+                    password=md5_crypt(username),
+                    dept=random.choice(dept_all),
+                    name=username, email='%s@jumpserver.org' % username,
+                    groups=[random.choice(group_all_id) for i in range(1, 4)], role='CU',
+                    ssh_key_pwd=CRYPTOR.encrypt(username),
+                    ldap_pwd=CRYPTOR.encrypt(username),
+                    is_active=True,
+                    date_joined=datetime.datetime.now())
+        print "Add: %s" % username
+
+
+def test_add_asset_group():
+    dept = DEPT.objects.get(name='默认')
+    for i in range(1, 20):
+        name = 'AssetGroup' + str(i)
+        group = BisGroup(name=name, dept=dept, comment=name)
+        group.save()
+        print 'Add: %s' % name
+
+
+def test_add_asset():
+    idc_all = IDC.objects.all()
+    test_idc = random.choice(idc_all)
+    bis_group_all = BisGroup.objects.all()
+    dept_all = DEPT.objects.all()
+    for i in range(1, 500):
+        ip = '192.168.1.' + str(i)
+        asset = Asset(ip=ip, port=22, login_type='L', idc=test_idc, is_active=True, comment='test')
+        asset.save()
+        asset.bis_group = [random.choice(bis_group_all) for i in range(2)]
+        asset.dept = [random.choice(dept_all) for i in range(2)]
+        print "Add: %s" % ip
+
+
+def test_add_log():
+    li_date = []
+    today = datetime.date.today()
+    oneday = datetime.timedelta(days=1)
+    for i in range(0, 7):
+        today = today-oneday
+        li_date.append(today)
+    user_list = ['马云', '马化腾', '丁磊', '周鸿祎', '雷军', '柳传志', '陈天桥', '李彦宏', '李开复', '罗永浩']
+    for i in range(1, 1000):
+        user = random.choice(user_list)
+        ip = random.randint(1, 20)
+        start_time = random.choice(li_date)
+        end_time = datetime.datetime.now()
+        log_path = '/var/log/jumpserver/test.log'
+        host = '192.168.1.' + str(ip)
+        Log.objects.create(user=user, host=host, log_path=log_path, pid=168, start_time=start_time,
+                           is_finished=1, log_finished=1, end_time=end_time)
+
+
+if __name__ == '__main__':
+    install()
+
+
+
+

jlog/models.py

@@ -4,6 +4,8 @@ from django.db import models
 class Log(models.Model):
     user = models.CharField(max_length=20, null=True)
     host = models.CharField(max_length=20, null=True)
+    remote_ip = models.CharField(max_length=100)
+    dept_name = models.CharField(max_length=20)
     log_path = models.CharField(max_length=100)
     start_time = models.DateTimeField(null=True)
     pid = models.IntegerField(max_length=10)

jlog/views.py

@@ -5,12 +5,15 @@ from datetime import datetime
 
 from django.db.models import Q
 from django.http import HttpResponse
+from django.template import RequestContext
 from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response
 
 from connect import BASE_DIR
 from jlog.models import Log
 from jumpserver.views import pages
+from juser.models import User, DEPT
+from jumpserver.api import get_user_dept, is_super_user, is_group_admin, is_common_user
 
 CONF = ConfigParser.ConfigParser()
 CONF.read('%s/jumpserver.conf' % BASE_DIR)
@@ -20,30 +23,61 @@ def log_list_online(request):
     header_title, path1, path2 = u'查看日志', u'查看日志', u'在线用户'
     keyword = request.GET.get('keyword')
     web_socket_host = CONF.get('websocket', 'web_socket_host')
+    dept_id = get_user_dept(request)
+    dept_name = DEPT.objects.get(id=dept_id).name
+    user_id = request.session.get('user_id')
+    username = User.objects.get(id=user_id).username
+
+    if is_super_user(request):
         if keyword:
-        posts = contact_list = Log.objects.filter(Q(user__contains=keyword) | Q(host__contains=keyword)) \
+            posts = Log.objects.filter(Q(user__contains=keyword) | Q(host__contains=keyword)) \
                 .filter(is_finished=0).order_by('-start_time')
-        contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request)
         else:
             posts = Log.objects.filter(is_finished=0).order_by('-start_time')
         contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request)
 
-    return render_to_response('jlog/log_online.html', locals())
+    elif is_group_admin(request):
+        if keyword:
+            posts = Log.objects.filter(Q(user__contains=keyword) | Q(host__contains=keyword)) \
+                .filter(is_finished=0).filter(dept_name=dept_name).order_by('-start_time')
+        else:
+            posts = Log.objects.filter(is_finished=0).filter(dept_name=dept_name).order_by('-start_time')
+        contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request)
+
+    elif is_common_user(request):
+        posts = Log.objects.filter(is_finished=0).filter(user=username).order_by('-start_time')
+
+    return render_to_response('jlog/log_online.html', locals(), context_instance=RequestContext(request))
 
 
 def log_list_offline(request):
     header_title, path1, path2 = u'查看日志', u'查看日志', u'历史记录'
     keyword = request.GET.get('keyword')
     web_socket_host = CONF.get('websocket', 'web_socket_host')
+    dept_id = get_user_dept(request)
+    dept_name = DEPT.objects.get(id=dept_id).name
+    user_id = request.session.get('user_id')
+    username = User.objects.get(id=user_id).username
+    if is_super_user(request):
         if keyword:
-        posts = contact_list = Log.objects.filter(Q(user__contains=keyword) | Q(host__contains=keyword)) \
+            posts = Log.objects.filter(Q(user__contains=keyword) | Q(host__contains=keyword)) \
                 .filter(is_finished=1).order_by('-start_time')
-        contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request)
         else:
             posts = Log.objects.filter(is_finished=1).order_by('-start_time')
         contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request)
 
-    return render_to_response('jlog/log_offline.html', locals())
+    elif is_group_admin(request):
+        if keyword:
+            posts = Log.objects.filter(Q(user__contains=keyword) | Q(host__contains=keyword)) \
+                .filter(is_finished=1).filter(dept_name=dept_name).order_by('-start_time')
+        else:
+            posts = Log.objects.filter(is_finished=1).filter(dept_name=dept_name).order_by('-start_time')
+        contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request)
+
+    elif is_common_user(request):
+        posts = Log.objects.filter(is_finished=1).filter(user=username).order_by('-start_time')
+
+    return render_to_response('jlog/log_offline.html', locals(), context_instance=RequestContext(request))
 
 
 def log_kill(request, offset):
@@ -51,7 +85,7 @@ def log_kill(request, offset):
     if pid:
         os.kill(int(pid), 9)
         Log.objects.filter(pid=pid).update(is_finished=1, end_time=datetime.now())
-        return HttpResponseRedirect('jlog/log_offline.html', locals())
+        return HttpResponseRedirect('jlog/log_offline.html', locals(), context_instance=RequestContext(request))
 
 
 def log_history(request):
@@ -69,13 +103,23 @@ def log_history(request):
 def log_search(request):
     keyword = request.GET.get('keyword')
     env = request.GET.get('env')
+    dept_id = get_user_dept(request)
+    dept_name = DEPT.objects.get(id=dept_id).name
+    if is_super_user(request):
         if env == 'online':
             posts = contact_list = Log.objects.filter(Q(user__contains=keyword) | Q(host__contains=keyword)) \
                 .filter(is_finished=0).order_by('-start_time')
-        contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request)
         elif env == 'offline':
             posts = contact_list = Log.objects.filter(Q(user__contains=keyword) | Q(host__contains=keyword)) \
                 .filter(is_finished=1).order_by('-start_time')
         contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request)
 
-    return render_to_response('jlog/log_search.html', locals())
+    elif is_group_admin(request):
+        if env == 'online':
+            posts = contact_list = Log.objects.filter(Q(user__contains=keyword) | Q(host__contains=keyword)) \
+                .filter(is_finished=0).filter(dept_name=dept_name).order_by('-start_time')
+        elif env == 'offline':
+            posts = contact_list = Log.objects.filter(Q(user__contains=keyword) | Q(host__contains=keyword)) \
+                .filter(is_finished=1).filter(dept_name=dept_name).order_by('-start_time')
+        contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request)
+    return render_to_response('jlog/log_search.html', locals(), context_instance=RequestContext(request))

jumpserver/api.py

@@ -29,6 +29,15 @@ LOGIN_NAME = getpass.getuser()
 LDAP_ENABLE = CONF.getint('ldap', 'ldap_enable')
 
 
+# def user_perm_group_api(username):
+#     user = User.objects.get(username=username)
+#     if user:
+#         perm_list = []
+#         user_group_all = user.group.all()
+#         for user_group in user_group_all:
+#             perm_list.extend(user_group.perm_set.all())
+
+
 class LDAPMgmt():
     def __init__(self,
                  host_url,
@@ -177,12 +186,27 @@ def is_super_user(request):
 
 
 def is_group_admin(request):
+    print request.session.get('role_id'), type(request.session.get('role_id'))
     if request.session.get('role_id') == 1:
         return True
     else:
         return False
 
 
+def is_common_user(request):
+    if request.session.get('role_id') == 0:
+        return True
+    else:
+        return False
+
+
+def get_user_dept(request):
+    user_id = request.session.get('user_id')
+    if user_id:
+        user_dept = User.objects.get(id=user_id).dept
+        return user_dept.id
+
+
 def api_user(request):
     hosts = Log.objects.filter(is_finished=0).count()
     users = Log.objects.filter(is_finished=0).values('user').distinct().count()

jumpserver/context_processors.py

 from juser.models import User
+from jasset.models import Asset
 
 
 def name_proc(request):
@@ -6,8 +7,11 @@ def name_proc(request):
     role_id = request.session.get('role_id')
     user_total_num = User.objects.all().count()
     user_active_num = User.objects.filter(is_active=True).count()
+    host_total_num = Asset.objects.all().count()
+    host_active_num = Asset.objects.filter(is_active=True).count()
     request.session.set_expiry(3600)
 
     return {'session_user_id': user_id, 'session_role_id': role_id,
-            'user_total_num': user_total_num, 'user_active_num': user_active_num}
+            'user_total_num': user_total_num, 'user_active_num': user_active_num,
+            'host_total_num': host_total_num, 'host_active_num': host_active_num}
 

jumpserver/templatetags/mytags.py

@@ -169,22 +169,6 @@ def string_length(string, length):
     return '%s ...' % string[0:length]
 
 
-@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')
-    for g in group:
-        if not pattern.match(g.name):
-            agroup.append(g)
-    try:
-        agroup.remove(p)
-    except ValueError:
-        pass
-
-    return agroup
-
-
 @register.filter(name='to_name')
 def to_name(user_id):
     try:

static/css/plugins/fullcalendar/fullcalendar.print.css

+/*!
+ * FullCalendar v2.2.0 Print Stylesheet
+ * Docs & License: http://arshaw.com/fullcalendar/
+ * (c) 2013 Adam Shaw
+ */
+
+/*
+ * Include this stylesheet on your page to get a more printer-friendly calendar.
+ * When including this stylesheet, use the media='print' attribute of the <link> tag.
+ * Make sure to include this stylesheet IN ADDITION to the regular fullcalendar.css.
+ */
+
+.fc {
+	max-width: 100% !important;
+}
+
+
+/* Global Event Restyling
+--------------------------------------------------------------------------------------------------*/
+
+.fc-event {
+	background: #fff !important;
+	color: #000 !important;
+	page-break-inside: avoid;
+}
+
+.fc-event .fc-resizer {
+	display: none;
+}
+
+
+/* Table & Day-Row Restyling
+--------------------------------------------------------------------------------------------------*/
+
+th,
+td,
+hr,
+thead,
+tbody,
+.fc-row {
+	border-color: #ccc !important;
+	background: #fff !important;
+}
+
+/* kill the overlaid, absolutely-positioned common components */
+.fc-bg,
+.fc-bgevent-skeleton,
+.fc-highlight-skeleton,
+.fc-helper-skeleton {
+	display: none;
+}
+
+/* don't force a min-height on rows (for DayGrid) */
+.fc tbody .fc-row {
+	height: auto !important; /* undo height that JS set in distributeHeight */
+	min-height: 0 !important; /* undo the min-height from each view's specific stylesheet */
+}
+
+.fc tbody .fc-row .fc-content-skeleton {
+	position: static; /* undo .fc-rigid */
+	padding-bottom: 0 !important; /* use a more border-friendly method for this... */
+}
+
+.fc tbody .fc-row .fc-content-skeleton tbody tr:last-child td { /* only works in newer browsers */
+	padding-bottom: 1em; /* ...gives space within the skeleton. also ensures min height in a way */
+}
+
+.fc tbody .fc-row .fc-content-skeleton table {
+	/* provides a min-height for the row, but only effective for IE, which exaggerates this value,
+	   making it look more like 3em. for other browers, it will already be this tall */
+	height: 1em;
+}
+
+
+/* Undo month-view event limiting. Display all events and hide the "more" links
+--------------------------------------------------------------------------------------------------*/
+
+.fc-more-cell,
+.fc-more {
+	display: none !important;
+}
+
+.fc tr.fc-limited {
+	display: table-row !important;
+}
+
+.fc td.fc-limited {
+	display: table-cell !important;
+}
+
+.fc-popover {
+	display: none; /* never display the "more.." popover in print mode */
+}
+
+
+/* TimeGrid Restyling
+--------------------------------------------------------------------------------------------------*/
+
+/* undo the min-height 100% trick used to fill the container's height */
+.fc-time-grid {
+	min-height: 0 !important;
+}
+
+/* don't display the side axis at all ("all-day" and time cells) */
+.fc-agenda-view .fc-axis {
+	display: none;
+}
+
+/* don't display the horizontal lines */
+.fc-slats,
+.fc-time-grid hr { /* this hr is used when height is underused and needs to be filled */
+	display: none !important; /* important overrides inline declaration */
+}
+
+/* let the container that holds the events be naturally positioned and create real height */
+.fc-time-grid .fc-content-skeleton {
+	position: static;
+}
+
+/* in case there are no events, we still want some height */
+.fc-time-grid .fc-content-skeleton table {
+	height: 4em;
+}
+
+/* kill the horizontal spacing made by the event container. event margins will be done below */
+.fc-time-grid .fc-event-container {
+	margin: 0 !important;
+}
+
+
+/* TimeGrid *Event* Restyling
+--------------------------------------------------------------------------------------------------*/
+
+/* naturally position events, vertically stacking them */
+.fc-time-grid .fc-event {
+	position: static !important;
+	margin: 3px 2px !important;
+}
+
+/* for events that continue to a future day, give the bottom border back */
+.fc-time-grid .fc-event.fc-not-end {
+	border-bottom-width: 1px !important;
+}
+
+/* indicate the event continues via "..." text */
+.fc-time-grid .fc-event.fc-not-end:after {
+	content: "...";
+}
+
+/* for events that are continuations from previous days, give the top border back */
+.fc-time-grid .fc-event.fc-not-start {
+	border-top-width: 1px !important;
+}
+
+/* indicate the event is a continuation via "..." text */
+.fc-time-grid .fc-event.fc-not-start:before {
+	content: "...";
+}
+
+/* time */
+
+/* undo a previous declaration and let the time text span to a second line */
+.fc-time-grid .fc-event .fc-time {
+	white-space: normal !important;
+}
+
+/* hide the the time that is normally displayed... */
+.fc-time-grid .fc-event .fc-time span {
+	display: none;
+}
+
+/* ...replace it with a more verbose version (includes AM/PM) stored in an html attribute */
+.fc-time-grid .fc-event .fc-time:after {
+	content: attr(data-full);
+}
+
+
+/* Vertical Scroller & Containers
+--------------------------------------------------------------------------------------------------*/
+
+/* kill the scrollbars and allow natural height */
+.fc-scroller,
+.fc-day-grid-container,    /* these divs might be assigned height, which we need to cleared */
+.fc-time-grid-container {  /* */
+	overflow: visible !important;
+	height: auto !important;
+}
+
+/* kill the horizontal border/padding used to compensate for scrollbars */
+.fc-row {
+	border: 0 !important;
+	margin: 0 !important;
+}
+
+
+/* Button Controls
+--------------------------------------------------------------------------------------------------*/
+
+.fc-button-group,
+.fc button {
+	display: none; /* don't display any button-related controls */
+}

templates/foot_script.html

@@ -3,6 +3,8 @@
 <script src="/static/js/plugins/slimscroll/jquery.slimscroll.min.js"></script>
 <script src="/static/js/bootstrap-dialog.js"></script>
 <script src="/static/js/mindmup-editabletable.js"></script>
+<script src="/static/js/plugins/fullcalendar/moment.min.js"></script>
+<script src="/static/js/plugins/fullcalendar/fullcalendar.min.js"></script>
 
 <!-- Custom and plugin javascript -->
 <script src="/static/js/inspinia.js"></script>

templates/index.html

@@ -7,7 +7,7 @@
         <div class="col-lg-3">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
-                    <span class="label label-success pull-right">Monthly</span>
+                    <span class="label label-success pull-right">Users</span>
                     <h5>用户总数</h5>
                 </div>
                 <div class="ibox-content">
@@ -20,7 +20,7 @@
         <div class="col-lg-3">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
-                    <span class="label label-info pull-right">Annual</span>
+                    <span class="label label-info pull-right">Hosts</span>
                     <h5>主机总数</h5>
                 </div>
                 <div class="ibox-content">
@@ -34,7 +34,7 @@
         <div class="col-lg-3">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
-                    <span class="label label-primary pull-right">Today</span>
+                    <span class="label label-primary pull-right">Online</span>
                     <h5>实时在线用户</h5>
                 </div>
                 <div class="ibox-content">
@@ -48,13 +48,13 @@
         <div class="col-lg-3">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
-                    <span class="label label-danger pull-right">Low value</span>
+                    <span class="label label-danger pull-right">Connected</span>
                     <h5>已连接服务器</h5>
                 </div>
                 <div class="ibox-content">
                         <h1 class="no-margins"><a href="/jlog/log_list/online/"> <span id="online_hosts"></span></a></h1>
                     <div class="stat-percent font-bold text-danger">38% <i class="fa fa-level-down"></i></div>
-                    <small>Connect host</small>
+                    <small>Connected host</small>
                 </div>
             </div>
         </div>

templates/jasset/group_add.html

 {% extends 'base.html' %}
+{% load mytags %}
 {% block content %}
 {% include 'nav_cat_bar.html' %}
 <div class="wrapper wrapper-content animated fadeInRight">
@@ -20,6 +21,7 @@
                             <div class="col-sm-8" name="group_id" value="{{ post.id }}"><input type="text" value="{{ group.name }}" placeholder="网站" name="j_group" class="form-control"></div>
                         </div>
 
+                        {% ifequal session_role_id 2 %}
                             <div class="hr-line-dashed"></div>
                             <div class="form-group">
                                 <label for="j_dept" class="col-lg-2 control-label">所属部门<span class="red-fonts">*</span></label>
@@ -31,6 +33,15 @@
                                     </select>
                                 </div>
                             </div>
+                        {% endifequal %}
+
+                        {% ifequal session_role_id 1 %}
+                            <div class="hr-line-dashed"></div>
+                            <div class="form-group">
+                                <label for="j_dept" class="col-lg-2 control-label">所属部门<span class="red-fonts" style="">*</span></label>
+                                    <div class="col-sm-8"><input type="text" name="j_dept" value="{{  edept.name }}" class="form-control" readonly="readonly"></div>
+                            </div>
+                        {% endifequal %}
 
                         <div class="hr-line-dashed"></div>
                         <div class="form-group">
@@ -43,9 +54,9 @@
                                 </select>
                             </div>
                             <div class="col-sm-1">
-                                <div class="btn-group" style="margin-top: 50px;">
-                                    <button type="button" class="btn btn-white" onclick="move('groups', 'groups_selected')"><i class="fa fa-chevron-right"></i></button>
-                                    <button type="button" class="btn btn-white" onclick="move_left('groups_selected', 'groups')"><i class="fa fa-chevron-left"></i> </button>
+                                <div class="fc-button-group" style="margin-top: 50px;">
+                                    <button type="button" class="fc-button fc-state-default" onclick="move('groups', 'groups_selected')"><span class="fc-icon fc-icon-right-single-arrow"></span></button>
+                                    <button type="button" class="fc-button fc-state-default" onclick="move_left('groups_selected', 'groups')"><span class="fc-icon fc-icon-left-single-arrow"></span></button>
                                 </div>
                             </div>
                             <div class="col-sm-3">

templates/jasset/host_add.html

 {% extends 'base.html' %}
+{% load mytags %}
 {% block content %}
 {% include 'nav_cat_bar.html' %}
 <div class="wrapper wrapper-content animated fadeInRight">
@@ -84,6 +85,7 @@
                                             </div>
                                         </div>
 
+                                        {% ifequal session_role_id 2 %}
                                             <div class="hr-line-dashed"></div>
                                             <div class="form-group">
                                                 <label for="j_dept" class="col-lg-2 control-label">所属部门<span class="red-fonts">*</span></label>
@@ -95,6 +97,14 @@
                                                     </select>
                                                 </div>
                                             </div>
+                                        {% endifequal %}
+
+                                        {% ifequal session_role_id 1 %}
+                                            <div class="hr-line-dashed"></div>
+                                            <div class="form-group"><label class="col-sm-2 control-label"> 所属部门 </label>
+                                                <div class="col-sm-8"><input type="text" name="j_dept" value="{{  edept.name }}" class="form-control" readonly="readonly"></div>
+                                            </div>
+                                        {% endifequal %}
 
                                         <div class="hr-line-dashed"></div>
                                         <div class="form-group">
@@ -108,16 +118,6 @@
                                             </div>
                                         </div>
 
-                                        <!--<div class="hr-line-dashed"></div>-->
-                                        <!--<div class="form-group">-->
-                                            <!--<label for="j_group" class="col-sm-2 control-label"> 所属用户组<span class="red-fonts">*</span> </label>-->
-                                            <!--<div class="col-sm-8">-->
-                                                <!--{% for g in eusergroup %}-->
-                                                    <!--<label class="checkbox-inline"><input type="checkbox" id="j_usergroup" value="{{ g }}" name="j_usergroup"> {{ g }} </label>-->
-                                                <!--{% endfor %}-->
-                                            <!--</div>-->
-                                        <!--</div>-->
-
                                         <div class="hr-line-dashed"></div>
                                         <div class="form-group"><label class="col-sm-2 control-label"> 是否激活<span class="red-fonts">*</span> </label>
                                             <div class="col-sm-8">

templates/jasset/host_add_multi.html

@@ -44,7 +44,7 @@
                                 {% endif %}
                                 <h4>按照文本框内主机信息格式填写, 多台主机回车换行</h4>
                                     <form id="assetMulti" method="post" class="form-horizontal">
-                                        <div><textarea id="j_multi" name="j_multi" type="text" placeholder="192.168.1.1 22 LDAP 北京联通 [网站,数据库] 1 网站服务器" class="form-control" style="width:700px;height:500px"></textarea></div>
+                                        <div><textarea id="j_multi" name="j_multi" type="text" placeholder="192.168.1.1 22 LDAP 北京联通 [网站,数据库] 运维部 1 网站服务器" class="form-control" style="width:700px;height:500px">192.168.1.1 22 LDAP 北京联通 ['网站','数据库'] ['运维部','测试部'] 1 网站服务器</textarea></div>
                                         <div class="hr-line-dashed"></div>
                                         <div class="form-group">
                                             <div class="col-sm-4 col-sm-offset-4">

templates/jasset/jlist_ip.html

@@ -34,7 +34,7 @@
                             <td> {{ post.port }} </td>
                             <td> {{ login_types|get_item:post.login_type }} </td>
                             <td class="text-center"> {{ post.idc.name }} </td>
-                            <td class="text-center">{% for group in post.bis_group.all|filter_private %} {{ group }} {% endfor %}</td>
+                            <td class="text-center">{% for group in post.bis_group.all %} {{ group }} {% endfor %}</td>
                             <td class="text-center"> {{ post.date_added|date:"Y-m-d H:i:s" }} </td>
                             <td class="text-center"> {{ post.comment }} </td>
                         </tr>

templates/jlog/log_offline.html

@@ -77,7 +77,9 @@
                             <thead>
                                 <tr>
                                     <th class="text-center"> 用户名 </th>
+                                    <th class="text-center"> 所属部门 </th>
                                     <th class="text-center"> 登录主机 </th>
+                                    <th class="text-center"> 来源IP </th>
                                     <th class="text-center"> 命令统计 </th>
                                     <th class="text-center"> 登录时间 </th>
                                     <th class="text-center"> 结束时间 </th>
@@ -88,7 +90,9 @@
                             {% for post in contacts.object_list %}
                                 <tr class="gradeX">
                                     <td class="text-center" id="username"> {{ post.user }} </td>
+                                    <td class="text-center" id="dept"> {{ post.dept_name }} </td>
                                     <td class="text-center" id="ip"> {{ post.host }} </td>
+                                    <td class="text-center" id="remote_ip"> {{ post.remote_ip }} </td>
                                     <td class="text-center"><a href="/jlog/history/?id={{ post.id }}" class="log_command"> 命令统计 </td>
                                     <td class="text-center" id="start_time"> {{ post.start_time|date:"Y-m-d H:i:s"}} </td>
                                     <td class="text-center" id="end_time"> {{ post.end_time|date:"Y-m-d H:i:s" }} </td>

templates/jlog/log_online.html

@@ -77,7 +77,9 @@
                             <thead>
                                 <tr>
                                     <th class="text-center"> 用户名 </th>
+                                    <th class="text-center"> 所属部门 </th>
                                     <th class="text-center"> 登录主机 </th>
+                                    <th class="text-center"> 来源IP </th>
                                     <th class="text-center"> 实时监控 </th>
                                     <th class="text-center"> 阻断 </th>
                                     <th class="text-center"> 登录时间 </th>
@@ -88,7 +90,9 @@
                             {% for post in contacts.object_list %}
                                 <tr class="gradeX">
                                     <td id="username" class="text-center"> {{ post.user }} </td>
+                                    <td id="ip" class="text-center"> {{ post.dept_name }} </td>
                                     <td id="ip" class="text-center"> {{ post.host }} </td>
+                                    <td id="ip" class="text-center"> {{ post.remote_ip }} </td>
                                     <td class="text-center"><a class="monitor" filename="{{ post.log_path }}"> 监控 </a></td>
                                     <td class="text-center"><input type="button" id="cut" class="btn btn-danger btn-xs"  name="cut" value="阻断" onclick='cut("{{ post.pid }}")' /></td>
                                     <td class="text-center"> {{ post.start_time|date:"Y-m-d H:i:s" }} </td>
@@ -145,9 +149,9 @@
                 var regx =  /\x1B\[([0-9]{1,3}((;[0-9]{1,3})*)?)?[m|K]/g;
 //                tag.append('<p>'+escapeString(obj.content.replace(regx,''))+'</p>');
                 if (option == 'new') {
-                    tag.append('<p>' + escapeString(obj.content) + '</p>');
+                    tag.append('<p style="margin: 2px">' + escapeString(obj.content) + '</p>');
                 } else if (option == 'exist') {
-                    tag.append('<p>' + exsit_message + '</p>');
+                    tag.append('<p style="margin: 0">' + exsit_message + '</p>');
                 }
                 tag.animate({ scrollTop: tag[0].scrollHeight}, 1);
             });

templates/jlog/log_search.html

@@ -3,7 +3,9 @@
         <thead>
             <tr>
                 <th class="text-center"> 用户名 </th>
+                <th class="text-center"> 所属部门 </th>
                 <th class="text-center"> 登录主机 </th>
+                <th class="text-center"> 来源IP </th>
                 <th class="text-center"> 命令统计 </th>
                 <th class="text-center"> 登录时间 </th>
                 <th class="text-center"> 结束时间 </th>
@@ -14,7 +16,9 @@
         {% for post in contacts.object_list %}
             <tr class="gradeX">
                 <td class="text-center" id="username"> {{ post.user }} </td>
+                <td class="text-center" id="ip"> {{ post.dept_name }} </td>
                 <td class="text-center" id="ip"> {{ post.host }} </td>
+                <td class="text-center" id="ip"> {{ post.remote_ip }} </td>
                 <td class="text-center"><a href="/jlog/history/?id={{ post.id }}" class="log_command"> 命令统计 </td>
                 <td class="text-center" id="start_time"> {{ post.start_time|date:"Y-m-d H:i:s"}} </td>
                 <td class="text-center" id="end_time"> {{ post.end_time|date:"Y-m-d H:i:s" }} </td>

templates/link_css.html

@@ -6,3 +6,4 @@
 <link href="/static/css/colorbox.css" rel="stylesheet">
 <link href="/static/css/vaildator/jquery.validator.css" rel="stylesheet">
 <link href="/static/css/magnific/magnific-popup.css" rel="stylesheet">
+<link href="/static/css/plugins/fullcalendar/fullcalendar.css" rel="stylesheet">

templates/nav.html

@@ -27,7 +27,7 @@
                 <a><i class="fa fa-cube"></i> <span class="nav-label">资产管理</span><span class="fa arrow"></span></a>
                 <ul class="nav nav-second-level">
                     <li class="host_add host_add_multi"><a href="/jasset/host_add/">添加资产</a></li>
-                    <li class="host_list"><a href="/jasset/host_list/">查看资产&nbsp&nbsp</span><span class="label label-info pull-right">16/18</span></a></li>
+                    <li class="host_list"><a href="/jasset/host_list/">查看资产&nbsp&nbsp</span><span class="label label-info pull-right">{{ host_active_num }}/{{ host_total_num}}</span></a></li>
                     <li class="jgroup_add"><a href="/jasset/jgroup_add/">添加主机组</a></li>
                     <li class="jgroup_list group_detail"><a href="/jasset/jgroup_list/">查看主机组</a></li>
                     <li class="idc_add"><a href="/jasset/idc_add/">添加IDC</a></li>
@@ -100,12 +100,11 @@
             <li id="jasset">
                 <a><i class="fa fa-cube"></i> <span class="nav-label">资产管理</span><span class="fa arrow"></span></a>
                 <ul class="nav nav-second-level">
-                    <li id="host_add"><a href="/jasset/host_add/">添加资产</a></li>
-                    <li id="host_list"><a href="/jasset/host_list/">查看资产&nbsp&nbsp</span><span class="label label-info pull-right">16/18</span></a></li>
-                    <li id="jgroup_add"><a href="/jasset/jgroup_add/">添加主机组</a></li>
-                    <li id="jgroup_list"><a href="/jasset/jgroup_list/">查看主机组</a></li>
-                    <li id="idc_add"><a href="/jasset/idc_add/">添加IDC</a></li>
-                    <li id="idc_list"><a href="/jasset/idc_list/">查看IDC</a></li>
+                    <li class="host_add host_add_multi"><a href="/jasset/host_add/">添加资产</a></li>
+                    <li class="host_list"><a href="/jasset/host_list/">查看资产&nbsp&nbsp</span><span class="label label-info pull-right">{{ host_active_num }}/{{ host_total_num}}</span></a></li>
+                    <li class="jgroup_add"><a href="/jasset/jgroup_add/">添加主机组</a></li>
+                    <li class="jgroup_list group_detail"><a href="/jasset/jgroup_list/">查看主机组</a></li>
+                    <li class="idc_list idc_detail"><a href="/jasset/idc_list/">查看IDC</a></li>
                 </ul>
             </li>
             <li id="jperm">
@@ -142,3 +141,48 @@
     </div>
 </nav>
 {% endifequal %}
+
+{% ifequal session_role_id 0 %}
+<nav class="navbar-default navbar-static-side" role="navigation">
+    <div class="sidebar-collapse">
+        <ul class="nav" id="side-menu">
+            {% include 'nav_li_profile.html' %}
+            <li>
+               <a href="/"><i class="fa fa-th-large"></i> <span class="nav-label">仪表盘</span><span class="label label-info pull-right"></span></a>
+            </li>
+            <li id="juser">
+                <a href="#"><i class="fa fa-rebel"></i> <span class="nav-label">用户管理</span><span class="fa arrow"></span></a>
+                <ul class="nav nav-second-level">
+                    <li id="user_list"><a href="/juser/user_list/">查看用户<span class="label {% ifequal user_active_num user_total_num %}label-primary {% else %}label-warning {% endifequal %}pull-right">{{ user_active_num }}/{{ user_total_num }}</span></a></li>
+                </ul>
+            </li>
+            <li id="jasset">
+                <a><i class="fa fa-cube"></i> <span class="nav-label">资产管理</span><span class="fa arrow"></span></a>
+                <ul class="nav nav-second-level">
+                    <li class="host_list"><a href="/jasset/host_list/">查看资产&nbsp&nbsp</span><span class="label label-info pull-right">16/18</span></a></li>
+                    <li class="jgroup_list group_detail"><a href="/jasset/jgroup_list/">查看主机组</a></li>
+                    <li class="idc_list idc_detail"><a href="/jasset/idc_list/">查看IDC</a></li>
+                </ul>
+            </li>
+            <li id="jlog">
+                <a href="#"><i class="fa fa-files-o"></i> <span class="nav-label">日志审计</span><span class="fa arrow"></span></a>
+                <ul class="nav nav-second-level">
+                    <li id="log_list"><a href="/jlog/log_list/online/">查看日志</a></li>
+                    <li id="log_detail"><a href="/jlog/log_detail/">日志分析</a></li>
+                </ul>
+            </li>
+            <li>
+                <a href="#"><i class="fa fa-download"></i> <span class="nav-label">上传下载</span><span class="fa arrow"></span></a>
+                <ul class="nav nav-second-level">
+                    <li><a href="/file/upload/">文件上传</a></li>
+                    <li><a href="/file/download/">文件下载</a></li>
+                </ul>
+            </li>
+
+            <li class="special_link">
+                <a href="http://www.jumpserver.org" target="_blank"><i class="fa fa-database"></i> <span class="nav-label">访问官网</span></a>
+            </li>
+        </ul>
+    </div>
+</nav>
+{% endifequal %}
\ No newline at end of file