[Update] jquery升级版本

2693d68e · ibuler · a654bbef · d3a61c5a · 2693d68e · 2693d68e
Commit 2693d68e authored Aug 09, 2019 by ibuler
18 changed files
--- a/README.md
+++ b/README.md
 ## Jumpserver 多云环境下更好用的堡垒机

+![Total visitor](https://visitor-count-badge.herokuapp.com/total.svg?repo_id=jumpserver)
+![Visitors in today](https://visitor-count-badge.herokuapp.com/today.svg?repo_id=jumpserver)
 [![Python3](https://img.shields.io/badge/python-3.6-green.svg?style=plastic)](https://www.python.org/)
 [![Django](https://img.shields.io/badge/django-2.1-brightgreen.svg?style=plastic)](https://www.djangoproject.com/)
 [![Ansible](https://img.shields.io/badge/ansible-2.4.2.0-blue.svg?style=plastic)](https://www.ansible.com/)

--- a/README_EN.md
+++ b/README_EN.md
 ## Jumpserver 

+![Total visitor](https://visitor-count-badge.herokuapp.com/total.svg?repo_id=jumpserver)
+![Visitors in today](https://visitor-count-badge.herokuapp.com/today.svg?repo_id=jumpserver)
 [![Python3](https://img.shields.io/badge/python-3.6-green.svg?style=plastic)](https://www.python.org/)
 [![Django](https://img.shields.io/badge/django-2.1-brightgreen.svg?style=plastic)](https://www.djangoproject.com/)
 [![Ansible](https://img.shields.io/badge/ansible-2.4.2.0-blue.svg?style=plastic)](https://www.ansible.com/)

--- a/apps/assets/tasks.py
+++ b/apps/assets/tasks.py
@@ -94,7 +94,7 @@ def set_assets_hardware_info(assets, result, **kwargs):
                break
        else:
            ___cpu_model = 'Unknown'
-        ___cpu_model = ___cpu_model[:64]
+        ___cpu_model = ___cpu_model[:48]
        ___cpu_count = info.get('ansible_processor_count', 0)
        ___cpu_cores = info.get('ansible_processor_cores', None) or \
                       len(info.get('ansible_processor', []))

--- a/apps/authentication/templates/authentication/new_login.html
+++ b/apps/authentication/templates/authentication/new_login.html
@@ -18,7 +18,7 @@
    <link href="{% static 'css/login-style.css' %}" rel="stylesheet">

    <!-- scripts -->
-    <script src="{% static 'js/jquery-2.1.1.js' %}"></script>
+    <script src="{% static 'js/jquery-3.1.1.min.js' %}"></script>
    <script src="{% static 'js/plugins/sweetalert/sweetalert.min.js' %}"></script>
    <script src="{% static 'js/bootstrap.min.js' %}"></script>
    <script src="{% static 'js/plugins/datatables/datatables.min.js' %}"></script>

--- a/apps/authentication/utils.py
+++ b/apps/authentication/utils.py
@@ -11,7 +11,7 @@ from . import const
 def write_login_log(*args, **kwargs):
    from audits.models import UserLoginLog
    default_city = _("Unknown")
-    ip = kwargs.get('ip', '')
+    ip = kwargs.get('ip') or ''
    if not (ip and validate_ip(ip)):
        ip = ip[:15]
        city = default_city

--- a/apps/common/utils/common.py
+++ b/apps/common/utils/common.py
@@ -110,7 +110,7 @@ def capacity_convert(size, expect='auto', rate=1000):

    if expect == 'auto':
        for unit, rate_ in rate_mapping.items():
-            if rate > std_size/rate_ > 1:
+            if rate > std_size/rate_ >= 1 or unit == "T":
                expect = unit
                break


--- a/apps/jumpserver/conf.py
+++ b/apps/jumpserver/conf.py
@@ -381,6 +381,7 @@ defaults = {
    'ASSETS_PERM_CACHE_ENABLE': False,
    'SYSLOG_ADDR': '',  # '192.168.0.1:514'
    'SYSLOG_FACILITY': 'user',
+    'PERM_SINGLE_ASSET_TO_UNGROUP_NODE': False,
 }



--- a/apps/jumpserver/middleware.py
+++ b/apps/jumpserver/middleware.py
@@ -57,7 +57,8 @@ class RequestMiddleware:
    def __call__(self, request):
        set_current_request(request)
        response = self.get_response(request)
-        if not settings.SESSION_EXPIRE_AT_BROWSER_CLOSE:
+        is_request_api = request.path.startswith('/api')
+        if not settings.SESSION_EXPIRE_AT_BROWSER_CLOSE and not is_request_api:
            age = request.session.get_expiry_age()
            request.session.set_expiry(age)
        return response
--- a/apps/jumpserver/settings.py
+++ b/apps/jumpserver/settings.py
@@ -616,3 +616,5 @@ ASSETS_PERM_CACHE_TIME = CONFIG.ASSETS_PERM_CACHE_TIME

 # Asset user auth external backend, default AuthBook backend
 BACKEND_ASSET_USER_AUTH_VAULT = False
+
+PERM_SINGLE_ASSET_TO_UNGROUP_NODE = CONFIG.PERM_SINGLE_ASSET_TO_UNGROUP_NODE
--- a/apps/ops/templates/ops/celery_task_log.html
+++ b/apps/ops/templates/ops/celery_task_log.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 <head>
    <title>{% trans 'Task log' %}</title>
-    <script src="{% static 'js/jquery-2.1.1.js' %}"></script>
+    <script src="{% static 'js/jquery-3.1.1.min.js' %}"></script>
    <script src="{% static 'js/plugins/xterm/xterm.js' %}"></script>
    <link rel="stylesheet" href="{% static 'js/plugins/xterm/xterm.css' %}" />
    <style>

--- a/apps/perms/api/asset_permission.py
+++ b/apps/perms/api/asset_permission.py
@@ -115,6 +115,7 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
    def filter_user(self, queryset):
        user_id = self.request.query_params.get('user_id')
        username = self.request.query_params.get('username')
+        query_group = self.request.query_params.get('all')
        if user_id:
            user = get_object_or_none(User, pk=user_id)
        elif username:
@@ -123,6 +124,14 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
            return queryset
        if not user:
            return queryset.none()
+        kwargs = {}
+        args = []
+        if query_group:
+            groups = user.groups.all()
+            args.append(Q(users=user) | Q(user_groups__in=groups))
+        else:
+            kwargs["users"] = user
+        return queryset.filter(*args, **kwargs).distinct()

    def filter_user_group(self, queryset):
        user_group_id = self.request.query_params.get('user_group_id')
@@ -148,6 +157,7 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
    def filter_queryset(self, queryset):
        queryset = super().filter_queryset(queryset)
        queryset = self.filter_valid(queryset)
+        queryset = self.filter_user(queryset)
        queryset = self.filter_keyword(queryset)
        queryset = self.filter_asset(queryset)
        queryset = self.filter_node(queryset)

--- a/apps/perms/utils/asset_permission.py
+++ b/apps/perms/utils/asset_permission.py
@@ -180,6 +180,19 @@ class GenerateTree:
            assets.append({"id": asset_id, "system_users": system_users})
        return assets

+    def set_ungrouped_assets_nodes_if_need(self):
+        if settings.PERM_SINGLE_ASSET_TO_UNGROUP_NODE:
+            return
+        ungrouped_assets_ids = self.nodes[self.ungrouped_key]["assets"]
+        for asset_id in ungrouped_assets_ids:
+            in_nodes = self.all_assets_nodes_keys.get(asset_id, [])
+            for node_key in in_nodes:
+                parents_keys = self.node_util.get_nodes_parents_keys_by_key(node_key, with_self=False)
+                for parent_key in parents_keys:
+                    n = self.nodes[parent_key]
+                self.nodes[node_key]["assets"].add(asset_id)
+        self.nodes.pop(self.ungrouped_key, None)
+
    @timeit
    def get_nodes_with_assets(self):
        """
@@ -198,6 +211,7 @@ class GenerateTree:
        """
        if self._nodes_with_assets:
            return self._nodes_with_assets
+        self.set_ungrouped_assets_nodes_if_need()
        util = PermAssetsAmountUtil()
        nodes_with_assets_amount = util.compute_nodes_assets_amount(self.nodes)
        nodes = []
@@ -219,6 +233,7 @@ class GenerateTree:
        return nodes

    def get_nodes(self):
+        self.set_ungrouped_assets_nodes_if_need()
        nodes = list(self.nodes.keys())
        if not nodes:
            nodes.append(const.EMPTY_NODE_KEY)

--- a/apps/static/js/jquery-3.1.1.min.js
+++ b/apps/static/js/jquery-3.1.1.min.js
--- a/apps/templates/_head_css_js.html
+++ b/apps/templates/_head_css_js.html
@@ -9,7 +9,7 @@
 <link href="{% static 'css/plugins/vaildator/jquery.validator.css' %}" rel="stylesheet">
 <link href="{% static 'css/plugins/datatables/datatables.min.css' %}" rel="stylesheet">
 <!-- scripts -->
-<script src="{% static 'js/jquery-2.1.1.js' %}"></script>
+<script src="{% static 'js/jquery-3.1.1.min.js' %}"></script>
 <script src="{% static 'js/plugins/sweetalert/sweetalert.min.js' %}"></script>
 <script src="{% static 'js/bootstrap.min.js' %}"></script>
 <script src="{% static 'js/plugins/datatables/datatables.min.js' %}"></script>
\ No newline at end of file
--- a/apps/terminal/templates/terminal/session_commands_list_modal.html
+++ b/apps/terminal/templates/terminal/session_commands_list_modal.html
@@ -8,7 +8,7 @@
    {% include '_head_css_js.html' %}
    <link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">
    <link href="{% static "css/plugins/footable/footable.core.css" %}" rel="stylesheet">
-    <script src="{% static 'js/jquery-2.1.1.js' %}"></script>
+    <script src="{% static 'js/jquery-3.1.1.min.js' %}"></script>
    <script src="{% static 'js/plugins/sweetalert/sweetalert.min.js' %}"></script>
    <script src="{% static 'js/bootstrap.min.js' %}"></script>
 </head>

--- a/apps/users/api/user.py
+++ b/apps/users/api/user.py
@@ -178,6 +178,11 @@ class UserProfileApi(generics.RetrieveAPIView):
    def get_object(self):
        return self.request.user

+    def retrieve(self, request, *args, **kwargs):
+        age = request.session.get_expiry_age()
+        request.session.set_expiry(age)
+        return super().retrieve(request, *args, **kwargs)
+

 class UserResetOTPApi(generics.RetrieveAPIView):
    queryset = User.objects.all()

--- a/apps/users/templates/users/_base_otp.html
+++ b/apps/users/templates/users/_base_otp.html
@@ -9,7 +9,7 @@
        <link rel="shortcut icon" href="{{ FAVICON_URL }}" type="image/x-icon">
 		<link rel="stylesheet" href="{% static 'fonts/font_otp/iconfont.css' %}" />
 		<link rel="stylesheet" href="{% static 'css/otp.css' %}" />
-        <script src="{% static 'js/jquery-2.1.1.js' %}"></script>
+        <script src="{% static 'js/jquery-3.1.1.min.js' %}"></script>
        <script src="{% static "js/plugins/qrcode/qrcode.min.js" %}"></script>
        <script type="text/javascript" src="{% url 'javascript-catalog' %}"></script>
 	</head>

--- a/config_example.yml
+++ b/config_example.yml
@@ -76,3 +76,7 @@ REDIS_PORT: 6379
 # OTP/MFA 配置
 # OTP_VALID_WINDOW: 0
 # OTP_ISSUER_NAME: Jumpserver
+
+# Perm show single asset to ungrouped node
+# 是否把未授权节点资产放入到 未分组 节点中
+# PERM_SINGLE_ASSET_TO_UNGROUP_NODE: false