test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(系统设置): OAuth2登录

This commit is contained in:
shiziyuan9527 2022-11-15 14:59:55 +08:00 committed by 刘瑞斌
parent 0f8a8c06f0
commit 8cc2a53d77
7 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/sdk-parent/frontend/src/api/user.js
View File

@ -5,8 +5,8 @@ export function login(url, data) {
return post(url, data)
}
export function logout() {
return get("/signout")
export function logout(sessionId) {
return sessionId ? get("/signout?X-AUTH-TOKEN=" + sessionId) : get("/signout");
}
export function isLogin() {

6
framework/sdk-parent/frontend/src/plugins/request.js
View File

@ -102,6 +102,12 @@ instance.interceptors.response.use(response => {
}, error => {
let msg;
if (error.response) {
// 判断错误标记
if (error.response.status === 402) {
if (error.response.headers['redirect']) {
window.open(error.response.headers['redirect']);
}
}
checkAuth(error.response);
checkPermission(error.response);
msg = error.response.data.message || error.response.data;

4
framework/sdk-parent/frontend/src/store/modules/user.js
View File

@ -110,9 +110,11 @@ export default {
},
userLogout() {
let user = JSON.parse(localStorage.getItem(TokenKey));
let sessionId = user ? user.sessionId : null;
clearSessionStorage();
return new Promise((resolve, reject) => {
logout().then(() => {
logout(sessionId).then(() => {
location.href = '/#/login';
location.reload();
resolve();

2
framework/sdk-parent/sdk/src/main/java/io/metersphere/commons/constants/UserSource.java
View File

@ -1,5 +1,5 @@
package io.metersphere.commons.constants;
public enum UserSource {
LOCAL, LDAP, CAS, OIDC
LOCAL, LDAP, CAS, OIDC, OAuth2
}

6
framework/sdk-parent/sdk/src/main/java/io/metersphere/controller/LoginController.java
View File

@ -2,6 +2,7 @@ package io.metersphere.controller;
import io.metersphere.commons.constants.OperLogConstants;
import io.metersphere.commons.constants.OperLogModule;
import io.metersphere.commons.constants.SessionConstants;
import io.metersphere.commons.constants.UserSource;
import io.metersphere.commons.user.SessionUser;
import io.metersphere.commons.utils.RsaKey;
@ -26,6 +27,7 @@ import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.io.IOException;
import java.util.List;
@ -90,8 +92,8 @@ public class LoginController {
@GetMapping(value = "/signout")
@MsAuditLog(module = OperLogModule.AUTH_TITLE, beforeEvent = "#msClass.getUserId(id)", type = OperLogConstants.LOGIN, title = "登出", msClass = SessionUtils.class)
public ResultHolder logout() throws Exception {
ssoLogoutService.logout(SecurityUtils.getSubject().getSession());
public ResultHolder logout(@RequestParam(name = SessionConstants.HEADER_TOKEN, required = false) String sessionId, HttpServletResponse response) throws Exception {
ssoLogoutService.logout(sessionId, response);
SecurityUtils.getSubject().logout();
return ResultHolder.success(StringUtils.EMPTY);
}

24
framework/sdk-parent/sdk/src/main/java/io/metersphere/service/SSOLogoutService.java
View File

@ -7,13 +7,14 @@ import io.metersphere.commons.utils.CodingUtil;
import io.metersphere.commons.utils.JSON;
import io.metersphere.commons.utils.SessionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.session.Session;
import org.apache.commons.lang3.reflect.MethodUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.session.data.redis.RedisIndexedSessionRepository;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.Map;
@Service
@ -25,26 +26,35 @@ public class SSOLogoutService {
@Resource
private StringRedisTemplate stringRedisTemplate;
@Resource
private RedisIndexedSessionRepository redisIndexedSessionRepository;
/**
* oidc logout
*/
public void logout(Session session) throws Exception {
String authId = (String) SecurityUtils.getSubject().getSession().getAttribute("authId");
public void logout(String sessionId, HttpServletResponse response) throws Exception {
Object obj = redisIndexedSessionRepository.findById(sessionId);
String authId = (String) MethodUtils.invokeMethod(obj, "getAttribute", "authId");
AuthSource authSource = authSourceMapper.selectByPrimaryKey(authId);
if (authSource != null) {
Map config = JSON.parseObject(authSource.getConfiguration(), Map.class);
if (StringUtils.equals(UserSource.OIDC.name(), authSource.getType())) {
String idToken = (String) SecurityUtils.getSubject().getSession().getAttribute("idToken");
String idToken = (String) MethodUtils.invokeMethod(obj, "getAttribute", "idToken");
String logoutUrl = (String) config.get("logoutUrl");
restTemplate.getForEntity(logoutUrl + "?id_token_hint=" + idToken, String.class);
}
if (StringUtils.equals(UserSource.CAS.name(), authSource.getType())) {
String casTicket = (String) session.getAttribute("casTicket");
String casTicket = (String) MethodUtils.invokeMethod(obj, "getAttribute", "casTicket");
if (StringUtils.isNotEmpty(casTicket)) {
stringRedisTemplate.delete(casTicket);
}
}
if (StringUtils.equals(UserSource.OAuth2.name(), authSource.getType())) {
if (StringUtils.isNotBlank((String) config.get("logoutUrl"))) {
// 设置标志
response.setStatus(402);
response.setHeader("redirect", (String) config.get("logoutUrl"));
}
}
}
}

7
system-setting/frontend/src/business/system/setting/MxAuth.vue
View File

@ -247,6 +247,13 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item label="Logout Endpoint">
<el-input v-model="form.configuration.logoutUrl"/>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>