From fe52c57a1133976c585d9db0acf0331c142a8c6e Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 24 May 2018 11:13:22 +0800
Subject: [PATCH 1/4] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83uitls=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/perms/utils.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/perms/utils.py b/apps/perms/utils.py
index abcd2e17e..36349b982 100644
--- a/apps/perms/utils.py
+++ b/apps/perms/utils.py
@@ -197,10 +197,8 @@ class AssetPermissionUtil:
                     in_node = True
                     nodes[node][asset].update(_system_users)
             if not in_node:
-                if unnode in nodes:
-                    nodes[unnode][asset].update(_system_users)
-                else:
-                    nodes[unnode][asset] = _system_users
+                nodes[unnode] = defaultdict(set)
+                nodes[unnode][asset].update(_system_users)
         return nodes
 
     @classmethod

From c529061ee0ade5494d4f1e0947f8e12c3ef41792 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 24 May 2018 11:18:20 +0800
Subject: [PATCH 2/4] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83uitls=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/perms/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/perms/utils.py b/apps/perms/utils.py
index 36349b982..7899cc5cb 100644
--- a/apps/perms/utils.py
+++ b/apps/perms/utils.py
@@ -188,6 +188,7 @@ class AssetPermissionUtil:
             children = _node.get_family()
             for node in children:
                 nodes[node] = defaultdict(set)
+        nodes[unnode] = defaultdict(set)
         _assets = cls.get_user_assets(user)
         for asset, _system_users in _assets.items():
             _nodes = asset.get_nodes()
@@ -197,7 +198,6 @@ class AssetPermissionUtil:
                     in_node = True
                     nodes[node][asset].update(_system_users)
             if not in_node:
-                nodes[unnode] = defaultdict(set)
                 nodes[unnode][asset].update(_system_users)
         return nodes
 

From 5a7192e035e3f6b1c08bf909641f1063d36e681d Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 24 May 2018 13:30:15 +0800
Subject: [PATCH 3/4] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E5=BF=83?=
 =?UTF-8?q?=E8=B7=B3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/terminal/api.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/terminal/api.py b/apps/terminal/api.py
index 924a30dfd..fbbae5e22 100644
--- a/apps/terminal/api.py
+++ b/apps/terminal/api.py
@@ -109,10 +109,9 @@ class StatusViewSet(viewsets.ModelViewSet):
     task_serializer_class = TaskSerializer
 
     def create(self, request, *args, **kwargs):
-        if self.request.query_params.get("from_guacamole", None):
-            return Response({"msg": "From guacamole, not support now"})
-
-        self.handle_sessions()
+        from_gua = self.request.query_params.get("from_guacamole", None)
+        if not from_gua:
+            self.handle_sessions()
         super().create(request, *args, **kwargs)
         tasks = self.request.user.terminal.task_set.filter(is_finished=False)
         serializer = self.task_serializer_class(tasks, many=True)

From b9d0d89f66f6b578b9112a5d64c532cd66918696 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 24 May 2018 13:32:20 +0800
Subject: [PATCH 4/4] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=94=B9=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=A5=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/__init__.py            | 2 +-
 apps/templates/_footer.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/__init__.py b/apps/__init__.py
index 90767858b..c6491d9fa 100644
--- a/apps/__init__.py
+++ b/apps/__init__.py
@@ -2,4 +2,4 @@
 # -*- coding: utf-8 -*-
 #
 
-__version__ = "1.3.0"
+__version__ = "1.3.1"
diff --git a/apps/templates/_footer.html b/apps/templates/_footer.html
index 8a723646d..10e607fa3 100644
--- a/apps/templates/_footer.html
+++ b/apps/templates/_footer.html
@@ -1,6 +1,6 @@
 <div class="footer fixed">
     <div class="pull-right">
-        Version <strong>1.3.0-{% include '_build.html' %}</strong> GPLv2.
+        Version <strong>1.3.1-{% include '_build.html' %}</strong> GPLv2.
         <img style="display: none" src="http://www.jumpserver.org/img/evaluate_avatar1.jpg">
     </div>
     <div>