From 92596cfd36a5e9b549b325ddf3606928c079a5fa Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 8 Apr 2021 17:47:19 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=99=BB=E5=BD=95):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=90=8C=E4=B8=80=E4=B8=AA=E7=BA=BF=E7=A8=8B=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/controller/LoginController.java   | 8 +++++++-
 backend/src/main/resources/i18n/messages_en_US.properties | 1 +
 backend/src/main/resources/i18n/messages_zh_CN.properties | 1 +
 backend/src/main/resources/i18n/messages_zh_TW.properties | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/controller/LoginController.java b/backend/src/main/java/io/metersphere/controller/LoginController.java
index c040c0710f..d739240fc3 100644
--- a/backend/src/main/java/io/metersphere/controller/LoginController.java
+++ b/backend/src/main/java/io/metersphere/controller/LoginController.java
@@ -3,9 +3,9 @@ package io.metersphere.controller;
 import io.metersphere.commons.constants.UserSource;
 import io.metersphere.commons.user.SessionUser;
 import io.metersphere.commons.utils.RsaKey;
-import io.metersphere.commons.utils.RsaUtil;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.LoginRequest;
+import io.metersphere.i18n.Translator;
 import io.metersphere.service.BaseDisplayService;
 import io.metersphere.service.UserService;
 import org.apache.commons.lang3.StringUtils;
@@ -42,6 +42,12 @@ public class LoginController {
 
     @PostMapping(value = "/signin")
     public ResultHolder login(@RequestBody LoginRequest request) {
+        SessionUser sessionUser = SessionUtils.getUser();
+        if (sessionUser != null) {
+            if (!StringUtils.equals(sessionUser.getId(), request.getUsername())) {
+                return ResultHolder.error(Translator.get("please_logout_current_user"));
+            }
+        }
         SecurityUtils.getSubject().getSession().setAttribute("authenticate", UserSource.LOCAL.name());
         return userService.login(request);
     }
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index 0c20378413..a76d51021f 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -29,6 +29,7 @@ user_expires=user expires.
 not_authorized=not authorized.
 login_fail=Login fail
 user_apikey_limit=Can have up to 5 api keys
+please_logout_current_user=Please logout current user first
 #load test
 edit_load_test_not_found=Cannot edit test, test not found=
 run_load_test_not_found=Cannot run test, test not found=
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index bcb263b3c8..dc819fe383 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -29,6 +29,7 @@ user_locked=用户被锁定
 user_expires=用户过期
 not_authorized=未经授权
 user_apikey_limit=最多能有5个Api key
+please_logout_current_user=请先登出当前用户
 #load test
 edit_load_test_not_found=无法编辑测试，未找到测试：
 run_load_test_not_found=无法运行测试，未找到测试：
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index eccfd47a3a..6f0bfbefba 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -29,6 +29,7 @@ user_expires=用戶過期
 not_authorized=未經授權。
 login_fail=登入失敗
 user_apikey_limit=最多能有5個Api key
+please_logout_current_user=請先登出當前用戶
 #load test
 edit_load_test_not_found=無法編輯測試，未找到測試：
 run_load_test_not_found=無法運行測試，未找到測試：