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

Merge remote-tracking branch 'origin/main'

This commit is contained in:
liqiang-fit2cloud 2022-10-21 15:14:26 +08:00
parent d03b076449 dbaa3297f0
commit e7f4f3fedd
45 changed files with 151 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java
View File

@ -322,8 +322,8 @@ public class MsTCPSampler extends MsTestElement {
}
private String formatMockValue(String value) {
String patten = ">@[^>@]+</?";
Pattern r = Pattern.compile(patten);
String pattern = ">@[^>@]+</?";
Pattern r = Pattern.compile(pattern);
try {
Matcher m = r.matcher(value);
while (m.find()) {

2
api-test/backend/src/main/java/io/metersphere/api/jmeter/ResourcePoolCalculation.java
View File

@ -59,7 +59,7 @@ public class ResourcePoolCalculation {
NodeDTO node = JSON.parseObject(configuration, NodeDTO.class);
String nodeIp = node.getIp();
Integer port = node.getPort();
String uri = String.format(BASE_URL + "/jmeter/getJvmInfo", nodeIp, port);
String uri = String.format(BASE_URL + "/jmeter/get-jvm-info", nodeIp, port);
JvmInfoDTO nodeJvm = this.getNodeJvmInfo(uri);
if (nodeJvm == null) {
continue;

2
api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.java
View File

@ -30,7 +30,7 @@ public interface ExtApiScenarioMapper {
int selectTrash(@Param("projectId") String projectId);
List<ApiScenarioWithBLOBs> selectByIds(@Param("ids") String ids, @Param("oderId") String oderId);
List<ApiScenarioWithBLOBs> selectByIds(@Param("ids") String ids, @Param("order") String order);
List<ApiScenario> selectReference(@Param("request") ApiScenarioRequest request);

2
api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
View File

@ -442,7 +442,7 @@
select *
from api_scenario
where id in (${ids})
ORDER BY FIND_IN_SET(id, ${oderId})
ORDER BY FIND_IN_SET(id, ${order})
</select>
<select id="selectReference" resultType="io.metersphere.base.domain.ApiScenario">

2
api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportDetailMapper.java
View File

@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface ExtApiScenarioReportDetailMapper {
List<ApiScenarioReportDetail> selectByIds(@Param("ids") String ids, @Param("oderId") String oderId);
List<ApiScenarioReportDetail> selectByIds(@Param("ids") String ids, @Param("order") String order);
}

2
api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportDetailMapper.xml
View File

@ -6,6 +6,6 @@
where ad.report_id in (select ar.id from api_scenario_report ar where ar.project_id = #{projectId,jdbcType=VARCHAR} )
</delete>
<select id="selectByIds" resultType="io.metersphere.base.domain.ApiScenarioReportDetail">
select t.* from api_scenario_report_detail t where t.report_id in (${ids}) ORDER BY FIND_IN_SET(t.report_id,${oderId})
select t.* from api_scenario_report_detail t where t.report_id in (${ids}) ORDER BY FIND_IN_SET(t.report_id,${order})
</select>
</mapper>

2
api-test/backend/src/main/java/io/metersphere/base/mapper/plan/ext/ExtTestPlanScenarioCaseMapper.java
View File

@ -25,7 +25,7 @@ public interface ExtTestPlanScenarioCaseMapper {
List<String> selectIds(@Param("request")TestPlanScenarioRequest request);
List<TestPlanApiScenario> selectByIds(@Param("ids")String ids ,@Param("oderId")String oderId );
List<TestPlanApiScenario> selectByIds(@Param("ids")String ids ,@Param("order")String order );
List<TestPlanApiScenarioInfoDTO> selectLegalDataByTestPlanId(String planId);

2
api-test/backend/src/main/java/io/metersphere/base/mapper/plan/ext/ExtTestPlanScenarioCaseMapper.xml
View File

@ -136,7 +136,7 @@
select t.*
from test_plan_api_scenario t
where t.id in (${ids})
ORDER BY FIND_IN_SET(t.id, ${oderId})
ORDER BY FIND_IN_SET(t.id, ${order})
</select>
<select id="selectIds" resultType="java.lang.String">
select

2
api-test/frontend/src/business/automation/scenario/EditApiScenario.vue
View File

@ -1880,7 +1880,7 @@ export default {
apiImport(importData) {
if (importData && importData.data) {
importData.data.forEach(item => {
this.setApiParameter(item, "API", "OT_IMPORT");
this.setApiParameter(item, "API", "TO_IMPORT");
})
this.sort();
this.reload();

4
api-test/frontend/src/business/automation/scenario/Setting.js
View File

@ -20,7 +20,7 @@ export function STEP() {
['DubboSampler', getDefaultSamplerMenu()],
['JDBCSampler', getDefaultSamplerMenu()],
['TCPSampler', getDefaultSamplerMenu()],
['OT_IMPORT', getDefaultSamplerMenu()],
['TO_IMPORT', getDefaultSamplerMenu()],
['AbstractSampler', getDefaultSamplerMenu()],
['IfController', getAll()],
['TransactionController', getAll()],
@ -48,7 +48,7 @@ export function STEP() {
export const ELEMENT_TYPE = {
scenario: 'scenario',
HTTPSamplerProxy: 'HTTPSamplerProxy',
OT_IMPORT: 'OT_IMPORT',
TO_IMPORT: 'TO_IMPORT',
IfController: 'IfController',
TransactionController: 'TransactionController',
ConstantTimer: 'ConstantTimer',

8
api-test/frontend/src/business/automation/scenario/component/ApiComponent.vue
View File

@ -339,7 +339,7 @@ export default {
return (this.request.referenced && verifies.indexOf(this.request.referenced) !== -1);
},
isExternalImport() {
return (this.request.referenced && this.request.referenced === 'OT_IMPORT');
return (this.request.referenced && this.request.referenced === 'TO_IMPORT');
},
isCustomizeReq() {
return (!this.request.referenced || this.request.referenced === 'Created');
@ -712,12 +712,6 @@ export default {
</script>
<style scoped>
.ms-api-col-ot-import-button {
background-color: #EEF5FE;
margin-right: 20px;
color: #409EFF;
}
.icon.is-active {
transform: rotate(90deg);
}

2
api-test/frontend/src/business/automation/scenario/component/PluginComponent.vue
View File

@ -226,7 +226,7 @@ export default {
return false;
},
isExternalImport() {
if (this.request.referenced && this.request.referenced === 'OT_IMPORT') {
if (this.request.referenced && this.request.referenced === 'TO_IMPORT') {
return true
}
return false;

2
api-test/frontend/src/business/automation/scenario/maximize/MaximizeScenario.vue
View File

@ -899,7 +899,7 @@ export default {
apiImport(importData) {
if (importData && importData.data) {
importData.data.forEach(item => {
this.setApiParameter(item, "API", "OT_IMPORT");
this.setApiParameter(item, "API", "TO_IMPORT");
})
this.sort();
this.reload();

4
api-test/frontend/src/business/environment/model/EnvironmentModel.js
View File

@ -22,11 +22,11 @@ export class Environment extends BaseConfig {
export class SSLConfig extends BaseConfig {
constructor(options = {}) {
super();
this.entrys = [];
this.entry = [];
this.files = [];
this.set(options);
this.sets({files: KeyValue}, options);
this.sets({entrys: KeyValue}, options);
this.sets({entry: KeyValue}, options);
}
initOptions(options = {}) {

2
api-test/frontend/src/business/home/components/card/ApiCaseCountCard.vue
View File

@ -85,7 +85,7 @@
<el-header style="height:20px;padding: 0px;margin-bottom: 5px;font-size: 14px">
<el-row>
<span style="float: left">
{{ $t('api_test.home_page.detail_card.rate.case_pase') + ":" }} &nbsp;&nbsp;
{{ $t('home.table.case_pass') + ":" }} &nbsp;&nbsp;
</span>
<span class="rows-count-number" style="font-size: 14px">
<b>

2
api-test/frontend/src/business/home/components/card/ScenarioCountCard.vue
View File

@ -58,7 +58,7 @@
<el-header style="height:20px;padding: 0px;margin-bottom: 5px;font-size: 14px">
<el-row>
<span style="float: left">
{{ $t('api_test.home_page.detail_card.rate.scenario_pase') + ":" }}&nbsp;&nbsp;
{{ $t('home.table.scenario_pass') + ":" }}&nbsp;&nbsp;
</span>
<span class="rows-count-number" style="font-size: 14px">
<b>

2
api-test/frontend/src/i18n/lang/en-US.js
View File

@ -29,6 +29,8 @@ const message = {
next_execution_time: "Next Execution Time",
create_user: "Creator",
update_time: "Update time",
case_pass: "Case pass rate",
scenario_pass: "Scenario pass rate",
},
case: {
index: "Ranking",

2
api-test/frontend/src/i18n/lang/zh-CN.js
View File

@ -29,6 +29,8 @@ const message = {
next_execution_time: "下次执行时间",
create_user: "创建人",
update_time: "更新时间",
case_pass: "用例通过率",
scenario_pass: "场景通过率",
},
case: {
index: "排名",

2
api-test/frontend/src/i18n/lang/zh-TW.js
View File

@ -29,6 +29,8 @@ const message = {
next_execution_time: "下次執行時間",
create_user: "創建人",
update_time: "更新時間",
case_pass: "用例通過率",
scenario_pass: "場景通過率",
},
case: {
index: "排名",

6
framework/gateway/src/main/java/io/metersphere/gateway/controller/LoginController.java
View File

@ -46,10 +46,12 @@ public class LoginController {
private ReactiveRedisSessionRepository reactiveRedisSessionRepository;
@GetMapping(value = "/is-login")
public Mono<ResultHolder> isLogin(@RequestHeader(name = SessionConstants.HEADER_TOKEN, required = false) String sessionId) throws Exception {
public Mono<ResultHolder> isLogin(@RequestHeader(name = SessionConstants.HEADER_TOKEN, required = false) String sessionId,
@RequestHeader(name = SessionConstants.CSRF_TOKEN, required = false) String csrfToken) throws Exception {
RsaKey rsaKey = RsaUtil.getRsaKey();
if (StringUtils.isNotBlank(sessionId)) {
if (StringUtils.isNotBlank(sessionId) && StringUtils.isNotBlank(csrfToken)) {
userLoginService.validateCsrfToken(sessionId, csrfToken);
return reactiveRedisSessionRepository.getSessionRedisOperations().opsForHash().get("spring:session:sessions:" + sessionId, "sessionAttr:user")
.switchIfEmpty(Mono.just(rsaKey))
.map(r -> {

14
framework/gateway/src/main/java/io/metersphere/gateway/controller/SSOController.java
View File

@ -2,6 +2,7 @@ package io.metersphere.gateway.controller;
import io.metersphere.commons.constants.OperLogConstants;
import io.metersphere.commons.constants.OperLogModule;
import io.metersphere.commons.user.SessionUser;
import io.metersphere.commons.utils.CodingUtil;
import io.metersphere.gateway.service.SSOService;
import io.metersphere.log.annotation.MsAuditLog;
@ -13,6 +14,7 @@ import reactor.core.publisher.Mono;
import javax.annotation.Resource;
import java.util.Locale;
import java.util.Optional;
@Controller
@RequestMapping("sso")
@ -23,24 +25,24 @@ public class SSOController {
@GetMapping("callback/{authId}")
@MsAuditLog(module = OperLogModule.AUTH_TITLE, type = OperLogConstants.LOGIN, title = "登录")
public Rendering callbackWithAuthId(@RequestParam("code") String code, @PathVariable("authId") String authId, WebSession session, Locale locale) throws Exception {
ssoService.exchangeToken(code, authId, session, locale);
return Rendering.redirectTo("/#/?_token=" + CodingUtil.base64Encoding(session.getId()))
Optional<SessionUser> sessionUser = ssoService.exchangeToken(code, authId, session, locale);
return Rendering.redirectTo("/#/?_token=" + CodingUtil.base64Encoding(session.getId()) + "&_csrf=" + sessionUser.get().getCsrfToken())
.build();
}
@GetMapping("callback")
@MsAuditLog(module = OperLogModule.AUTH_TITLE, type = OperLogConstants.LOGIN, title = "登录")
public Rendering callback(@RequestParam("code") String code, @RequestParam("state") String authId, WebSession session, Locale locale) throws Exception {
ssoService.exchangeToken(code, authId, session, locale);
return Rendering.redirectTo("/#/?_token=" + CodingUtil.base64Encoding(session.getId()))
Optional<SessionUser> sessionUser = ssoService.exchangeToken(code, authId, session, locale);
return Rendering.redirectTo("/#/?_token=" + CodingUtil.base64Encoding(session.getId()) + "&_csrf=" + sessionUser.get().getCsrfToken())
.build();
}
@GetMapping("/callback/cas/{authId}")
@MsAuditLog(module = OperLogModule.AUTH_TITLE, type = OperLogConstants.LOGIN, title = "登录")
public Rendering casCallback(@RequestParam("ticket") String ticket, @PathVariable("authId") String authId, WebSession session, Locale locale) throws Exception {
ssoService.serviceValidate(ticket, authId, session, locale);
return Rendering.redirectTo("/#/?_token=" + CodingUtil.base64Encoding(session.getId()))
Optional<SessionUser> sessionUser = ssoService.serviceValidate(ticket, authId, session, locale);
return Rendering.redirectTo("/#/?_token=" + CodingUtil.base64Encoding(session.getId()) + "&_csrf=" + sessionUser.get().getCsrfToken())
.build();
}

13
framework/gateway/src/main/java/io/metersphere/gateway/service/SSOService.java
View File

@ -2,7 +2,6 @@ package io.metersphere.gateway.service;
import io.metersphere.base.domain.AuthSource;
import io.metersphere.base.domain.User;
import io.metersphere.commons.constants.UserSource;
import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.user.SessionUser;
import io.metersphere.commons.utils.CodingUtil;
@ -61,7 +60,7 @@ public class SSOService {
@Resource
private UserLoginService userLoginService;
public void exchangeToken(String code, String authId, WebSession session, Locale locale) throws Exception {
public Optional<SessionUser> exchangeToken(String code, String authId, WebSession session, Locale locale) throws Exception {
AuthSource authSource = authSourceService.getAuthSource(authId);
Map config = JSON.parseObject(authSource.getConfiguration(), Map.class);
String tokenUrl = (String) config.get("tokenUrl");
@ -92,7 +91,7 @@ public class SSOService {
MSException.throwException(content);
}
doOICDLogin(authSource, accessToken, session, locale);
return doOICDLogin(authSource, accessToken, session, locale);
}
private RestTemplate getRestTemplateIgnoreSSL() throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException {
@ -118,7 +117,7 @@ public class SSOService {
return new RestTemplate(requestFactory);
}
private void doOICDLogin(AuthSource authSource, String accessToken, WebSession session, Locale locale) throws Exception {
private Optional<SessionUser> doOICDLogin(AuthSource authSource, String accessToken, WebSession session, Locale locale) throws Exception {
Map config = JSON.parseObject(authSource.getConfiguration(), Map.class);
String userInfoUrl = (String) config.get("userInfoUrl");
HttpHeaders headers = new HttpHeaders();
@ -157,12 +156,13 @@ public class SSOService {
session.getAttributes().put("authenticate", authSource.getType());
session.getAttributes().put("authId", authSource.getId());
session.getAttributes().put("user", userOptional.get());
return userOptional;
}
/**
* cas callback
*/
public void serviceValidate(String ticket, String authId, WebSession session, Locale locale) throws Exception {
public Optional<SessionUser> serviceValidate(String ticket, String authId, WebSession session, Locale locale) throws Exception {
AuthSource authSource = authSourceService.getAuthSource(authId);
Map config = JSON.parseObject(authSource.getConfiguration(), Map.class);
String redirectUrl = ((String) config.get("redirectUrl")).replace("${authId}", authId);
@ -196,9 +196,12 @@ public class SSOService {
session.getAttributes().put("authenticate", authSource.getType());
session.getAttributes().put("authId", authSource.getId());
session.getAttributes().put("user", userOptional.get());
session.getAttributes().put("casTicket", ticket);
// 记录cas对应关系
Long timeout = env.getProperty("spring.session.timeout", Long.class);
stringRedisTemplate.opsForValue().set(ticket, name, timeout, TimeUnit.SECONDS);
return userOptional;
}
public void kickOutUser(String logoutToken) {

37
framework/gateway/src/main/java/io/metersphere/gateway/service/UserLoginService.java
View File

@ -8,7 +8,6 @@ import io.metersphere.commons.constants.UserStatus;
import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.user.SessionUser;
import io.metersphere.commons.utils.CodingUtil;
import io.metersphere.commons.utils.SessionUtils;
import io.metersphere.dto.GroupResourceDTO;
import io.metersphere.dto.UserDTO;
import io.metersphere.dto.UserGroupPermissionDTO;
@ -18,6 +17,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.session.FindByIndexNameSessionRepository;
import org.springframework.stereotype.Service;
import org.springframework.web.server.WebSession;
@ -55,7 +55,7 @@ public class UserLoginService {
userDTO = loginLocalMode(request.getUsername(), request.getPassword());
break;
}
autoSwitch(userDTO);
autoSwitch(session, userDTO);
return Optional.of(SessionUser.fromUser(userDTO, session.getId()));
}
@ -84,7 +84,7 @@ public class UserLoginService {
return user;
}
public void autoSwitch(UserDTO user) {
public void autoSwitch(WebSession session, UserDTO user) {
// 用户有 last_project_id 权限
if (hasLastProjectPermission(user)) {
return;
@ -94,7 +94,7 @@ public class UserLoginService {
return;
}
// 判断其他权限
checkNewWorkspaceAndProject(user);
checkNewWorkspaceAndProject(session, user);
}
private boolean hasLastProjectPermission(UserDTO user) {
@ -162,7 +162,7 @@ public class UserLoginService {
return false;
}
private void checkNewWorkspaceAndProject(UserDTO user) {
private void checkNewWorkspaceAndProject(WebSession session, UserDTO user) {
List<UserGroup> userGroups = user.getUserGroups();
List<String> projectGroupIds = user.getGroups()
.stream().filter(ug -> StringUtils.equals(ug.getType(), UserGroupType.PROJECT))
@ -180,7 +180,7 @@ public class UserLoginService {
.collect(Collectors.toList());
if (workspaces.size() > 0) {
String wsId = workspaces.get(0).getSourceId();
switchUserResource("workspace", wsId, user);
switchUserResource(session, "workspace", wsId, user);
} else {
// 用户登录之后没有项目和工作空间的权限就把值清空
user.setLastWorkspaceId("");
@ -200,7 +200,7 @@ public class UserLoginService {
}
}
public void switchUserResource(String sign, String sourceId, UserDTO sessionUser) {
public void switchUserResource(WebSession session, String sign, String sourceId, UserDTO sessionUser) {
// 获取最新UserDTO
UserDTO user = getUserDTO(sessionUser.getId());
User newUser = new User();
@ -217,9 +217,11 @@ public class UserLoginService {
}
BeanUtils.copyProperties(user, newUser);
// 切换工作空间或组织之后更新 session 里的 user
SessionUtils.putUser(SessionUser.fromUser(user, SessionUtils.getSessionId()));
session.getAttributes().put("user", SessionUser.fromUser(user, session.getId()));
session.getAttributes().put(FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME, sessionUser.getId());
userMapper.updateByPrimaryKeySelective(newUser);
}
public UserDTO getLoginUser(String userId, List<String> list) {
UserExample example = new UserExample();
example.createCriteria().andIdEqualTo(userId).andSourceIn(list);
@ -381,9 +383,6 @@ public class UserLoginService {
}
// 执行变更
userMapper.updateByPrimaryKeySelective(user);
if (StringUtils.equals(user.getStatus(), UserStatus.DISABLED)) {
SessionUtils.kickOutUser(user.getId());
}
}
private List<Project> getProjectListByWsAndUserId(String userId, String workspaceId) {
@ -404,4 +403,20 @@ public class UserLoginService {
}));
return projectList;
}
public void validateCsrfToken(String sessionId, String csrfToken) {
if (StringUtils.isBlank(csrfToken)) {
throw new RuntimeException("csrf token is empty");
}
csrfToken = CodingUtil.aesDecrypt(csrfToken, SessionUser.secret, SessionUser.iv);
String[] signatureArray = StringUtils.split(StringUtils.trimToNull(csrfToken), "|");
if (signatureArray.length != 4) {
throw new RuntimeException("invalid token");
}
if (!StringUtils.equals(sessionId, signatureArray[2])) {
throw new RuntimeException("Please check csrf token.");
}
}
}

16
framework/sdk-parent/frontend/src/components/environment/EnvironmentSSLConfig.vue
View File

@ -38,7 +38,7 @@
</div>
<p class="tip">{{ this.$t('commons.ssl.entry') }} </p>
<div class="ms-border">
<el-table :data="sslConfig.entrys" highlight-current-row v-if="!loading">
<el-table :data="sslConfig.entry" highlight-current-row v-if="!loading">
<el-table-column prop="originalAsName" :label="$t('commons.ssl.original_as_name')" show-overflow-tooltip
width="180"/>
<el-table-column prop="newAsName" :label="$t('commons.ssl.new_as_name')" show-overflow-tooltip
@ -145,7 +145,7 @@ export default {
item.password = "";
item.default = false;
this.sslConfig.entrys.unshift(item);
this.sslConfig.entry.unshift(item);
})
this.sslConfig.files.unshift(sslFile);
} else {
@ -159,7 +159,7 @@ export default {
}
item.password = "";
item.default = false;
this.sslConfig.entrys.unshift(item);
this.sslConfig.entry.unshift(item);
})
this.sslConfig.files.unshift(sslFile);
}
@ -170,24 +170,24 @@ export default {
const index = this.sslConfig.files.findIndex((d) => d.id === row.id);
this.sslConfig.files.splice(index, 1);
// 同时删除条目
if (this.sslConfig.entrys) {
if (this.sslConfig.entry) {
let removeKeys = [];
this.sslConfig.entrys.forEach(item => {
this.sslConfig.entry.forEach(item => {
if (item && item.sourceId === row.id) {
const index = this.sslConfig.entrys.findIndex((d) => d.sourceId === row.id);
const index = this.sslConfig.entry.findIndex((d) => d.sourceId === row.id);
removeKeys.push(index);
}
});
removeKeys.forEach(index => {
if (index !== -1) {
this.sslConfig.entrys.splice(index, 1);
this.sslConfig.entry.splice(index, 1);
}
})
}
},
changeCheck(row) {
if (row.default) {
this.sslConfig.entrys.forEach(item => {
this.sslConfig.entry.forEach(item => {
if (item && item.sourceId !== row.id) {
item.default = false;
}

2
framework/sdk-parent/frontend/src/components/environment/commons/ApiScenarioVariables.vue
View File

@ -2,7 +2,7 @@
<div>
<div>
<div style="padding-bottom: 10px;float: left">
<el-input :placeholder="$t('commons.search_by_name')" size="mini" v-model="selectVariable"
<el-input :placeholder="$t('api_test.search_by_variables')" size="mini" v-model="selectVariable"
@change="filter"
@keyup.enter="filter">
</el-input>

1
framework/sdk-parent/frontend/src/i18n/lang/en-US.js
View File

@ -1217,6 +1217,7 @@ const message = {
buttons: {
to_xml: "To xml",
},
search_by_variables: "Search by variable",
case_jump_message: "The jump use case has been removed！",
scenario_jump_message: "The jumped scene has been deleted！",
is_continue: "Is continue",

1
framework/sdk-parent/frontend/src/i18n/lang/zh-CN.js
View File

@ -1227,6 +1227,7 @@ const message = {
buttons: {
to_xml: "转xml结构",
},
search_by_variables: "根据变量名搜索",
case_jump_message: "跳转的用例已经删除！",
scenario_jump_message: "跳转的场景已经删除！",
is_continue: "是否继续",

1
framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js
View File

@ -1224,6 +1224,7 @@ const message = {
buttons: {
to_xml: "轉xml結構",
},
search_by_variables: "根據變量名搜索",
case_jump_message: "跳轉的用例已經刪除！",
scenario_jump_message: "跳轉的場景已經刪除！",
is_continue: "是否繼續",

4
framework/sdk-parent/frontend/src/model/EnvironmentModel.js
View File

@ -23,11 +23,11 @@ export class Environment extends BaseConfig {
export class SSLConfig extends BaseConfig {
constructor(options = {}) {
super();
this.entrys = [];
this.entry = [];
this.files = [];
this.set(options);
this.sets({files: KeyValue}, options);
this.sets({entrys: KeyValue}, options);
this.sets({entry: KeyValue}, options);
}
initOptions(options = {}) {

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

@ -3,7 +3,7 @@ import {$error} from "./message"
import {getCurrentProjectID, getCurrentWorkspaceId} from "../utils/token";
import {PROJECT_ID, TokenKey, WORKSPACE_ID} from "../utils/constants";
import packageJSON from '@/../package.json'
import {getUUID} from "../utils";
import {getUrlParams, getUUID} from "../utils";
import {Base64} from "js-base64";
// baseURL 根据是否是独立运行修改
@ -21,6 +21,8 @@ if (window.location.pathname.startsWith('/' + packageJSON.name)) {
}
}
let urlParams = getUrlParams(window.location.href);
const instance = axios.create({
baseURL, // url = base url + request url
withCredentials: true,
@ -39,12 +41,18 @@ instance.interceptors.request.use(
}
// sso callback 过来的会有sessionId在url上
if (!config.headers['X-AUTH-TOKEN']) {
const paramsStr = window.location.href
let sessionId = paramsStr.split('_token=')[1]
let sessionId = urlParams['_token']
if (sessionId) {
config.headers['X-AUTH-TOKEN'] = Base64.decode(sessionId);
}
}
// sso callback 过来的会有csrf在url上
if (!config.headers['CSRF-TOKEN']) {
let csrf = urlParams['_csrf']
if (csrf) {
config.headers['CSRF-TOKEN'] = csrf;
}
}
// 包含 工作空间 项目的标识
config.headers['WORKSPACE'] = getCurrentWorkspaceId();
config.headers['PROJECT'] = getCurrentProjectID();

11
framework/sdk-parent/frontend/src/utils/index.js
View File

@ -328,3 +328,14 @@ function _resizeTextarea(i, size, textareaList) {
export function checkMicroMode() {
return sessionStorage.getItem("MICRO_MODE");
}
export function getUrlParams(url) {
const arrSearch = url.split('?').pop().split('#').shift().split('&');
let obj = {};
arrSearch.forEach((item) => {
const [k, v] = item.split('=');
obj[k] = v;
return obj;
});
return obj;
}

5
framework/sdk-parent/sdk/src/main/java/io/metersphere/commons/utils/SessionUtils.java
View File

@ -59,7 +59,10 @@ public class SessionUtils {
}
Map<String, ?> users = sessionRepository.findByPrincipalName(username);
if (MapUtils.isNotEmpty(users)) {
users.keySet().forEach(sessionRepository::deleteById);
users.keySet().forEach(k -> {
sessionRepository.deleteById(k);
sessionRepository.getSessionRedisOperations().delete("spring:session:sessions:" + k);
});
}
}

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

@ -87,7 +87,7 @@ 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();
ssoLogoutService.logout(SecurityUtils.getSubject().getSession());
SecurityUtils.getSubject().logout();
return ResultHolder.success(StringUtils.EMPTY);
}

4
framework/sdk-parent/sdk/src/main/java/io/metersphere/environment/service/CommandService.java
View File

@ -101,8 +101,8 @@ public class CommandService {
this.createKeyStore("ms-run", newKeyStore);
// 修改别名
Map<String, List<KeyStoreEntry>> entryMap = new HashMap<>();
if (sslConfig != null && CollectionUtils.isNotEmpty(sslConfig.getEntrys())) {
sslConfig.getEntrys().forEach(item -> {
if (sslConfig != null && CollectionUtils.isNotEmpty(sslConfig.getEntry())) {
sslConfig.getEntry().forEach(item -> {
if (entryMap.containsKey(item.getSourceId())) {
entryMap.get(item.getSourceId()).add(item);
} else {

10
framework/sdk-parent/sdk/src/main/java/io/metersphere/environment/ssl/KeyStoreConfig.java
View File

@ -9,12 +9,12 @@ import java.util.stream.Collectors;
@Data
public class KeyStoreConfig {
private List<KeyStoreEntry> entrys;
private List<KeyStoreEntry> entry;
private List<KeyStoreFile> files;
public String getDefaultAlias() {
if (CollectionUtils.isNotEmpty(entrys)) {
List<KeyStoreEntry> entryList = this.entrys.stream().filter(KeyStoreEntry::isDefault).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(entry)) {
List<KeyStoreEntry> entryList = this.entry.stream().filter(KeyStoreEntry::isDefault).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(entryList)) {
if (StringUtils.isNotEmpty(entryList.get(0).getNewAsName())) {
return entryList.get(0).getNewAsName();
@ -27,8 +27,8 @@ public class KeyStoreConfig {
}
public String getAlias(String asName) {
if (CollectionUtils.isNotEmpty(entrys)) {
List<KeyStoreEntry> entryList = this.entrys.stream().filter(ks -> StringUtils.equals(asName, ks.getNewAsName())).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(entry)) {
List<KeyStoreEntry> entryList = this.entry.stream().filter(ks -> StringUtils.equals(asName, ks.getNewAsName())).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(entryList) && CollectionUtils.isNotEmpty(files) && files.size() == 1) {
return entryList.get(0).getOriginalAsName();
}

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

@ -8,6 +8,7 @@ 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.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
@ -27,7 +28,7 @@ public class SSOLogoutService {
/**
* oidc logout
*/
public void logout() throws Exception {
public void logout(Session session) throws Exception {
String authId = (String) SecurityUtils.getSubject().getSession().getAttribute("authId");
AuthSource authSource = authSourceMapper.selectByPrimaryKey(authId);
if (authSource != null) {
@ -38,6 +39,12 @@ public class SSOLogoutService {
restTemplate.getForEntity(logoutUrl + "?id_token_hint=" + idToken, String.class);
}
if (StringUtils.equals(UserSource.CAS.name(), authSource.getType())) {
String casTicket = (String) session.getAttribute("casTicket");
if (StringUtils.isNotEmpty(casTicket)) {
stringRedisTemplate.delete(casTicket);
}
}
}
}

6
system-setting/frontend/src/business/workspace/environment/EnvironmentList.vue
View File

@ -4,7 +4,7 @@
<!-- 表头 -->
<template v-slot:header>
<ms-table-header :create-permission="['WORKSPACE_PROJECT_ENVIRONMENT:READ+CREATE']"
:create-tip="btnTips"
:create-tip="btnTips" :tip="$t('system.search_by_environment_name')"
:condition.sync="condition" @search="search" @create="createEnv">
<template v-slot:button>
<ms-table-button v-permission="['WORKSPACE_PROJECT_ENVIRONMENT:READ+IMPORT']" icon="el-icon-box"
@ -27,14 +27,14 @@
<show-more-btn :is-show="scope.row.showMore" :buttons="buttons" :size="selectDataCounts"/>
</template>
</el-table-column>
<el-table-column :label="$t('api_test.environment.name')" prop="name" show-overflow-tooltip>
</el-table-column>
<el-table-column :label="$t('commons.project')" width="250" :filters="projectFilters" column-key="projectId"
show-overflow-tooltip>
<template v-slot="scope">
<span>{{ idNameMap.get(scope.row.projectId) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('api_test.environment.name')" prop="name" show-overflow-tooltip>
</el-table-column>
<el-table-column :label="$t('api_test.environment.socket')" show-overflow-tooltip>
<template v-slot="scope">
<span v-if="parseDomainName(scope.row)!=='SHOW_INFO'">{{ parseDomainName(scope.row) }}</span>

3
system-setting/frontend/src/i18n/lang/en-US.js
View File

@ -7,7 +7,8 @@ const message = {
search_get_more_tip: 'Search for other options'
},
system: {
environment_import_repeat_tip: "(Environment configuration with the same name filtered {0})"
environment_import_repeat_tip: "(Environment configuration with the same name filtered {0})",
search_by_environment_name: "search by environment name",
},
display: {
title: 'Theme',

3
system-setting/frontend/src/i18n/lang/zh-CN.js
View File

@ -7,7 +7,8 @@ const message = {
search_get_more_tip: '搜索获取其他选项'
},
system: {
environment_import_repeat_tip: "(已过滤同名称的环境配置 {0})"
environment_import_repeat_tip: "(已过滤同名称的环境配置 {0})",
search_by_environment_name: "根据环境的名称搜索",
},
display: {
title: '显示设置',

3
system-setting/frontend/src/i18n/lang/zh-TW.js
View File

@ -7,7 +7,8 @@ const message = {
search_get_more_tip: '搜索獲取其他選項'
},
system: {
environment_import_repeat_tip: "(已過濾同名稱的環境配置 {0})"
environment_import_repeat_tip: "(已過濾同名稱的環境配置 {0})",
search_by_environment_name: "根據環境的名稱搜索",
},
display: {
title: '顯示設置',

6
test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanTestCaseService.java
View File

@ -520,8 +520,10 @@ public class TestPlanTestCaseService {
if (CollectionUtils.isNotEmpty(cases)) {
Map<String, Project> projectMap = ServiceUtils.getProjectMap(
cases.stream().map(TestPlanCaseDTO::getProjectId).collect(Collectors.toList()));
Map<String, String> userNameMap = ServiceUtils.getUserNameMap(
cases.stream().map(TestPlanCaseDTO::getExecutor).collect(Collectors.toList()));
List<String> userIds = new ArrayList();
userIds.addAll(cases.stream().map(TestPlanCaseDTO::getExecutor).collect(Collectors.toList()));
userIds.addAll(cases.stream().map(TestPlanCaseDTO::getMaintainer).collect(Collectors.toList()));
Map<String, String> userNameMap = ServiceUtils.getUserNameMap(userIds);
cases.forEach(item -> {
if (projectMap.containsKey(item.getProjectId())) {
item.setProjectName(projectMap.get(item.getProjectId()).getName());

6
test-track/backend/src/main/java/io/metersphere/service/issue/client/ZentaoGetClient.java
View File

@ -16,14 +16,16 @@ public class ZentaoGetClient extends ZentaoClient {
private static final String STORY_GET="&module=story&methodName=getProductStories&params=productID={key}&t=json&zentaosid=";
private static final String USER_GET="&module=user&methodName=getList&t=json&zentaosid=";
private static final String BUILDS_GET="&module=build&methodName=getProductBuildPairs&productID={0}&zentaosid={1}";
private static final String FILE_UPLOAD="&module=file&methodName=saveUpload&params=objectType={1},objectID={2},zentaosid={3}";
private static final String FILE_UPLOAD="&module=file&methodName=saveUpload&params=objectType=bug&zentaosid={1}";
private static final String FILE_DELETE="/?m=file&f=delete&t=json&fileID={1}&confirm=yes&zentaosid={2}";
private static final String FILE_DOWNLOAD="/?m=file&f=download&t=json&fileID={1}&mouse=click&zentaosid={2}";
private static final String CREATE_META_DATA="?m=bug&f=create&productID={0}&t=json&zentaosid={1}";
private static final String REPLACE_IMG_URL="<img src=\"%s/index.php?m=file&f=read&fileID=$1\"/>";
private static final Pattern IMG_PATTERN = Pattern.compile("m=file&f=read&fileID=(.*?)\"/>");
private static final String PRODUCT_GET = "&module=product&methodName=getById&params=productID={0}&zentaosid={1}";
// 注意 recTotal={1}&recPerPage={2}&pageID={3} 顺序不能调换，有点恶心
/**
* 注意 recTotal={1}&recPerPage={2}&pageID={3} 顺序不能调换，有点恶心
*/
private static final String BUG_LIST_URL = "/?m=bug&f=browse&productID={0}&branch=&browseType=all&param=0&orderBy=&recTotal={1}&recPerPage={2}&pageID={3}&t=json&zentaosid={4}";
RequestUrl request = new RequestUrl();

2
test-track/backend/src/main/java/io/metersphere/service/issue/client/ZentaoPathInfoClient.java
View File

@ -16,7 +16,7 @@ public class ZentaoPathInfoClient extends ZentaoClient {
private static final String USER_GET = "/api-getModel-user-getList?zentaosid=";
private static final String BUILDS_GET = "/api-getModel-build-getProductBuildPairs-productID={0}?zentaosid={1}";
private static final String CREATE_META_DATA="/bug-create-{0}.json?zentaosid={1}";
private static final String FILE_UPLOAD = "/api-getModel-file-saveUpload-objectType={1},objectID={2}?zentaosid={3}";
private static final String FILE_UPLOAD = "/api-getModel-file-saveUpload-objectType=bug?zentaosid={1}";
private static final String FILE_DELETE = "/file-delete-{1}-.yes.json?zentaosid={2}";
private static final String FILE_DOWNLOAD="/file-download-{1}-.click.json?zentaosid={2}";
private static final String REPLACE_IMG_URL = "<img src=\"%s/file-read-$1\"/>";

8
test-track/backend/src/main/java/io/metersphere/service/issue/platform/ZentaoPlatform.java
View File

@ -26,6 +26,8 @@ import io.metersphere.service.issue.domain.zentao.ZentaoConfig;
import io.metersphere.xpack.track.dto.PlatformStatusDTO;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.entity.mime.MultipartEntity;
import org.apache.http.entity.mime.content.FileBody;
import org.apache.logging.log4j.util.Strings;
import org.springframework.core.io.FileSystemResource;
import org.springframework.http.HttpEntity;
@ -437,16 +439,16 @@ public class ZentaoPlatform extends AbstractIssuePlatform {
String session = zentaoClient.login();
HttpHeaders httpHeaders = new HttpHeaders();
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(paramMap, httpHeaders);
paramMap.add("files", resource);
HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(paramMap, httpHeaders);
RestTemplate restTemplate = new RestTemplate();
try {
String fileUpload = zentaoClient.requestUrl.getFileUpload();
ResponseEntity<String> responseEntity = restTemplate.exchange(fileUpload, HttpMethod.POST, requestEntity,
String.class, "bug", null, session);
String.class, session);
String body = responseEntity.getBody();
Map obj = JSON.parseMap(body);
Map data = (Map) obj.get("data");
Map data = (Map) JSON.parseObject(obj.get("data").toString());
Set<String> set = data.keySet();
if (!set.isEmpty()) {
id = (String) set.toArray()[0];

2
test-track/frontend/src/business/plan/view/comonents/report/detail/component/FunctionalIssueList.vue
View File

@ -95,7 +95,7 @@ export default {
if (values.indexOf(status) == -1) {
statusFilter.push({
value: status,
text: ISSUE_STATUS_MAP[status] ? ISSUE_STATUS_MAP[status] : status
text: ISSUE_STATUS_MAP[status] && item.platform === 'Local' ? ISSUE_STATUS_MAP[status] : status
});
}
}