From 2e944c68984fdcb1ad23eeb86102d1a808660606 Mon Sep 17 00:00:00 2001 From: feng626 <1304903146@qq.com> Date: Thu, 11 Aug 2022 14:52:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/templates/resource_download.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/templates/resource_download.html b/apps/templates/resource_download.html index 4b60e1e09..9938d60a4 100644 --- a/apps/templates/resource_download.html +++ b/apps/templates/resource_download.html @@ -15,7 +15,7 @@ p {
-

JumpServer {% trans 'Client' %} v1.1.6

+

JumpServer {% trans 'Client' %} v1.1.7

{% trans 'JumpServer Client, currently used to launch the client, now only support launch RDP SSH client, The Telnet client will next' %}

From 1ed388459b0229d38ae5e6349e28f82a3d21a39d Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Fri, 12 Aug 2022 14:29:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E5=B7=A5=E5=8D=95=E6=B5=81=20?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E7=BB=84=E7=BB=87=E4=B8=8D=E8=83=BD=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=20(#8735)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: feng626 <1304903146@qq.com> --- apps/tickets/serializers/flow.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/tickets/serializers/flow.py b/apps/tickets/serializers/flow.py index 42c7bed15..e8c066100 100644 --- a/apps/tickets/serializers/flow.py +++ b/apps/tickets/serializers/flow.py @@ -3,6 +3,7 @@ from django.utils.translation import ugettext_lazy as _ from rest_framework import serializers from orgs.models import Organization +from orgs.utils import get_current_org_id from orgs.mixins.serializers import OrgResourceModelSerializerMixin from tickets.models import TicketFlow, ApprovalRule from tickets.const import TicketApprovalStrategy @@ -96,7 +97,9 @@ class TicketFlowSerializer(OrgResourceModelSerializerMixin): @atomic def update(self, instance, validated_data): - if instance.org_id == Organization.ROOT_ID: + current_org_id = get_current_org_id() + root_org_id = Organization.ROOT_ID + if instance.org_id == root_org_id and current_org_id != root_org_id: instance = self.create(validated_data) else: instance = self.create_or_update('update', validated_data, instance) From 18af5e8c4a2ddceef89ff315a159729f00be551e Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Fri, 12 Aug 2022 18:01:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E3=80=90=E7=99=BB=E5=BD=95=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E3=80=91=E7=99=BB=E5=BD=95=E5=A4=8D=E6=A0=B8=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=A2=AB=E6=8B=92=E7=BB=9D=EF=BC=8C=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=97=A0=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E3=80=91=20(#8739)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 【登录】第三方用户登录复核，拒绝状态，未真正拦截 * fix: 【登录日志】登录复核用户被拒绝，登录日志无登录日志记录】 * fix: 【登录日志】用户设置登录复核，登录。此时不处理工单，管理员全局组织下查看登录日志，日志无限新增，且无记录用户名】 Co-authored-by: huangzhiwen --- apps/authentication/api/login_confirm.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/authentication/api/login_confirm.py b/apps/authentication/api/login_confirm.py index 71613348c..5bddda4e3 100644 --- a/apps/authentication/api/login_confirm.py +++ b/apps/authentication/api/login_confirm.py @@ -6,6 +6,8 @@ from rest_framework.permissions import AllowAny from common.utils import get_logger from .. import errors, mixins +from django.contrib.auth import logout as auth_logout + __all__ = ['TicketStatusApi'] logger = get_logger(__name__) @@ -19,8 +21,11 @@ class TicketStatusApi(mixins.AuthMixin, APIView): self.check_user_login_confirm() self.request.session['auth_third_party_done'] = 1 return Response({"msg": "ok"}) + except errors.LoginConfirmOtherError as e: + self.send_auth_signal(success=False, user=request.user, username=request.user.name, reason=e.as_data().get('msg')) + auth_logout(request) + return Response(e.as_data(), status=200) except errors.NeedMoreInfoError as e: - self.send_auth_signal(success=False, reason=e.as_data().get('msg')) return Response(e.as_data(), status=200) def delete(self, request, *args, **kwargs):