Merge pull request #8427 from jumpserver/dev

v2.23.0 rc6

apps/assets/tasks/push_system_user.py

@@ -274,7 +274,7 @@ def push_system_user_a_asset_manual(system_user, asset, username=None):
     # if username is None:
     #     username = system_user.username
     task_name = gettext_noop("Push system users to asset: ") + "{}({}) => {}".format(
-        system_user.name, username or '', asset
+        system_user.name, username or system_user.username, asset
     )
     return push_system_user_util(system_user, [asset], task_name=task_name, username=username)
 

apps/locale/ja/LC_MESSAGES/django.mo

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:449dcbd8e4b4f133d45e01642bb42a20477b09309d2b916f1aff9e854e6864e8
-size 128120
+oid sha256:132e7f59a56d1cf5b2358b21b547861e872fa456164f2e0809120fb2b13f0ec1
+size 128122

apps/locale/ja/LC_MESSAGES/django.po

@@ -1768,11 +1768,11 @@ msgstr "{ApplicationPermission} 削除 {SystemUser}"
 
 #: authentication/api/confirm.py:40
 msgid "Authentication failed password incorrect"
-msgstr "認証に失敗しました (ユーザー名またはパスワードが正しくありません): {}"
+msgstr "認証に失敗しました (ユーザー名またはパスワードが正しくありません)"
 
 #: authentication/api/confirm.py:48
 msgid "Login time has exceeded {} minutes, please login again"
-msgstr ""
+msgstr "ログイン時間が {} 分を超えました。もう一度ログインしてください"
 
 #: authentication/api/confirm.py:72 common/exceptions.py:47
 msgid "This action require verify your MFA"
@@ -4299,7 +4299,7 @@ msgstr "属性マップの有効化"
 
 #: settings/serializers/terminal.py:37
 msgid "Enable Razor"
-msgstr "XRDPの有効化"
+msgstr "Razor の有効化"
 
 #: settings/serializers/terminal.py:38
 msgid "Enable SSH Client"

apps/locale/zh/LC_MESSAGES/django.mo

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ea5daa59f376f85ad67dde8332499637e0e82999dcf051853589d1ebf22eca3
-size 105893
+oid sha256:002f6953ebbe368642f0ea3c383f617b5f998edf2238341be63393123d4be8a9
+size 105894

apps/locale/zh/LC_MESSAGES/django.po

@@ -1756,11 +1756,11 @@ msgstr "{ApplicationPermission} 移除 {SystemUser}"
 
 #: authentication/api/confirm.py:40
 msgid "Authentication failed password incorrect"
-msgstr "认证失败 (用户名或密码不正确): {}"
+msgstr "认证失败 (用户名或密码不正确)"
 
 #: authentication/api/confirm.py:48
 msgid "Login time has exceeded {} minutes, please login again"
-msgstr ""
+msgstr "登录时长已超过 {} 分钟，请重新登录"
 
 #: authentication/api/confirm.py:72 common/exceptions.py:47
 msgid "This action require verify your MFA"
@@ -4237,7 +4237,7 @@ msgstr "启用数据库组件"
 
 #: settings/serializers/terminal.py:37
 msgid "Enable Razor"
-msgstr "启用 XRDP 服务"
+msgstr "启用 Razor 服务"
 
 #: settings/serializers/terminal.py:38
 msgid "Enable SSH Client"

apps/perms/tasks.py

@@ -80,7 +80,7 @@ def check_asset_permission_will_expired():
         if org in org_perm_remain_day_mapper[remain_days]:
             org_perm_remain_day_mapper[remain_days][org].add(asset_perm)
         else:
-            org_perm_remain_day_mapper[remain_days][org] = set()
+            org_perm_remain_day_mapper[remain_days][org] = {asset_perm, }
 
         # 计算每个用户即将过期的资产
         users = asset_perm.get_all_users()
@@ -90,7 +90,7 @@ def check_asset_permission_will_expired():
             if u in user_asset_remain_day_mapper[remain_days]:
                 user_asset_remain_day_mapper[remain_days][u].update(assets)
             else:
-                user_asset_remain_day_mapper[remain_days][u] = set()
+                user_asset_remain_day_mapper[remain_days][u] = set(assets)
 
     for day_count, user_asset_mapper in user_asset_remain_day_mapper.items():
         for user, assets in user_asset_mapper.items():
@@ -127,7 +127,7 @@ def check_app_permission_will_expired():
         if org in org_perm_remain_day_mapper[remain_days]:
             org_perm_remain_day_mapper[remain_days][org].add(app_perm)
         else:
-            org_perm_remain_day_mapper[remain_days][org] = set()
+            org_perm_remain_day_mapper[remain_days][org] = {app_perm, }
 
         users = app_perm.get_all_users()
         apps = app_perm.applications.all()
@@ -135,7 +135,7 @@ def check_app_permission_will_expired():
             if u in user_app_remain_day_mapper[remain_days]:
                 user_app_remain_day_mapper[remain_days][u].update(apps)
             else:
-                user_app_remain_day_mapper[remain_days][u] = set()
+                user_app_remain_day_mapper[remain_days][u] = set(apps)
 
     for day_count, user_app_mapper in user_app_remain_day_mapper.items():
         for user, apps in user_app_mapper.items():

apps/terminal/api/sharing.py

@@ -43,6 +43,9 @@ class SessionJoinRecordsViewSet(OrgModelViewSet):
     )
     filterset_fields = search_fields
     model = models.SessionJoinRecord
+    rbac_perms = {
+        'finished': 'terminal.change_sessionjoinrecord'
+    }
 
     def create(self, request, *args, **kwargs):
         try: