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

fix(接口测试): 修复同场景加载多证书问题 

Signed-off-by: fit2-zhao <yong.zhao@fit2cloud.com>
This commit is contained in:
fit2-zhao 2023-11-22 11:08:07 +08:00 committed by Craftsman
parent 98e345db30
commit 04abe38601
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
framework/sdk-parent/jmeter/src/main/java/org/apache/jmeter/config/KeystoreConfig.java
View File

@ -123,10 +123,11 @@ public class KeystoreConfig extends ConfigTestElement implements TestBean, TestS
dto.setPath(path); dto.setPath(path);
SSLManager.keyMap.put(resourceId, dto); SSLManager.keyMap.put(resourceId, dto);
} }
SSLManager.getInstance().configureKeystore(Boolean.parseBoolean(preload),
/*SSLManager.getInstance().configureKeystore(Boolean.parseBoolean(preload),
startIndexAsInt, startIndexAsInt,
endIndexAsInt, endIndexAsInt,
clientCertAliasVarName, in, password); clientCertAliasVarName, in, password);*/
} }

26
framework/sdk-parent/jmeter/src/main/java/org/apache/jmeter/util/SSLManager.java
View File

@ -146,7 +146,23 @@ public abstract class SSLManager {
} else { } else {
log.warn("Keystore file not found, loading empty keystore"); log.warn("Keystore file not found, loading empty keystore");
this.defaultpw = ""; // Ensure not null this.defaultpw = ""; // Ensure not null
this.keyStore.load(null, ""); try {
// 重新加载认证文件
JMeterContext threadContext = JMeterContextService.getContext();
if (threadContext != null && threadContext.getCurrentSampler() != null) {
String resourceId = threadContext.getCurrentSampler().getPropertyAsString("MS-RESOURCE-ID");
log.info("重新加载认证文件{}", resourceId);
if (StringUtils.isNotBlank(resourceId) && keyMap.containsKey(resourceId)) {
KeystoreDTO dto = keyMap.get(resourceId);
// 加载认证文件
InputStream in = new FileInputStream(new File(dto.getPath()));
this.keyStore.load(in, dto.getPwd());
}
}
} catch (Exception e) {
log.error("证书处理失败{}", e.getMessage());
}
} }
} }
} catch (Exception e) { } catch (Exception e) {
@ -357,18 +373,18 @@ public abstract class SSLManager {
try { try {
// 重新加载认证文件 // 重新加载认证文件
JMeterContext threadContext = JMeterContextService.getContext(); JMeterContext threadContext = JMeterContextService.getContext();
if (SSLManager.manager.keyStore == null && threadContext != null && threadContext.getCurrentSampler() != null) { if (threadContext != null && threadContext.getCurrentSampler() != null) {
String resourceId = threadContext.getCurrentSampler().getPropertyAsString("MS-RESOURCE-ID"); String resourceId = threadContext.getCurrentSampler().getPropertyAsString("MS-RESOURCE-ID");
log.info("重新加载认证文件{}", resourceId); log.info("重新加载认证文件{}", resourceId);
if (StringUtils.isNotBlank(resourceId) && keyMap.containsKey(resourceId)) { if (StringUtils.isNotBlank(resourceId) && keyMap.containsKey(resourceId)) {
KeystoreDTO dto = keyMap.get(resourceId); KeystoreDTO dto = keyMap.get(resourceId);
SSLManager.manager = new JsseSSLManager(null);
SSLManager.manager.keyStore = null;
// 加载认证文件 // 加载认证文件
InputStream in = new FileInputStream(new File(dto.getPath())); InputStream in = new FileInputStream(new File(dto.getPath()));
SSLManager.manager.configureKeystore(Boolean.parseBoolean(dto.getPreload()), dto.getStartIndex(), SSLManager.manager.configureKeystore(Boolean.parseBoolean(dto.getPreload()), dto.getStartIndex(),
dto.getEndIndex(), dto.getClientCertAliasVarName(), in, dto.getPwd()); dto.getEndIndex(), dto.getClientCertAliasVarName(), in, dto.getPwd());
keyMap.remove(resourceId); log.info("加载认证文件完成 {}", resourceId);
log.info("移除认证文件{}", resourceId);
} }
} }
} catch (Exception e) { } catch (Exception e) {