From c3de7b78c2d80df73860b15fc42df2505c273585 Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Thu, 21 Apr 2022 15:36:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E8=BF=9C=E7=A8=8B=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E6=97=B6=20=E6=9C=89=E4=BA=9B=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E5=B7=B2=E7=BB=8F=E4=B8=8D=E5=AD=98=E5=9C=A8=E4=BA=86?=
 =?UTF-8?q?=20=E5=AF=BC=E8=87=B4=E6=8E=88=E6=9D=83=E5=A4=B1=E8=B4=A5=20(#8?=
 =?UTF-8?q?127)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: feng626 <1304903146@qq.com>
---
 apps/perms/signal_handlers/app_permission.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/perms/signal_handlers/app_permission.py b/apps/perms/signal_handlers/app_permission.py
index 779c99dca..104f56e9a 100644
--- a/apps/perms/signal_handlers/app_permission.py
+++ b/apps/perms/signal_handlers/app_permission.py
@@ -4,7 +4,7 @@ from django.db.models.signals import m2m_changed
 from django.dispatch import receiver
 
 from users.models import User, UserGroup
-from assets.models import SystemUser
+from assets.models import Asset, SystemUser
 from applications.models import Application
 from common.utils import get_logger
 from common.exceptions import M2MReverseNotAllowed
@@ -48,6 +48,8 @@ def set_remote_app_asset_system_users_if_need(instance: ApplicationPermission, s
 
     attrs = instance.applications.all().values_list('attrs', flat=True)
     asset_ids = [attr['asset'] for attr in attrs if attr.get('asset')]
+    # 远程应用中资产可能在资产表里不存在
+    asset_ids = Asset.objects.filter(id__in=asset_ids).values_list('id', flat=True)
     if not asset_ids:
         return
 

From a6d61721ddd38fdff3df9de9fdd2ffb34ddb3bab Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <bugatti_it@163.com>
Date: Thu, 21 Apr 2022 16:13:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9csrftoken=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/static/js/jumpserver.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/static/js/jumpserver.js b/apps/static/js/jumpserver.js
index 070c811f7..680410763 100644
--- a/apps/static/js/jumpserver.js
+++ b/apps/static/js/jumpserver.js
@@ -125,7 +125,8 @@ function csrfSafeMethod(method) {
 }
 
 function setAjaxCSRFToken() {
-    const prefix = getCookie('SESSION_COOKIE_NAME_PREFIX', '')
+    let prefix = getCookie('SESSION_COOKIE_NAME_PREFIX');
+    if (!prefix || [`""`, `''`].indexOf(prefix) > -1) { prefix = ''; }
     var csrftoken = getCookie(`${prefix}csrftoken`);
     var sessionid = getCookie(`${prefix}sessionid`);