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

fix(系统设置): 修复SSL认证文件条目不显示问题；修复零时文件创建失败问题。

This commit is contained in:
fit2-zhao 2021-05-12 11:03:01 +08:00 committed by BugKing
parent c0fceed9d2
commit d41ad2d503
5 changed files with 20 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
backend/src/main/java/io/metersphere/api/service/CommandService.java
View File

@ -6,6 +6,7 @@ import io.metersphere.api.dto.ssl.KeyStoreEntry;
import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.FileUtils;
import io.metersphere.commons.utils.LogUtil;
import io.metersphere.i18n.Translator;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.jorphan.exec.SystemCommand;
@ -27,24 +28,24 @@ public class CommandService {
if (StringUtils.isNotEmpty(password)) {
password = JSON.parseObject(password, String.class);
}
String keytoolArgs[] = {"keytool", "-rfc", "-list", "-keystore", path, "-storepass", password};
Process p = new ProcessBuilder(keytoolArgs).start();
String[] args = {"keytool", "-rfc", "-list", "-keystore", path, "-storepass", password};
Process p = new ProcessBuilder(args).start();
List<KeyStoreEntry> dtoList = new LinkedList<>();
try (BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()))) {
String line = null;
KeyStoreEntry dto = null;
while ((line = br.readLine()) != null) {
if (line.contains("keystore password was incorrect")) {
MSException.throwException("认证密码错误，请重新输入密码");
MSException.throwException(Translator.get("ssl_password_error"));
}
if (line.startsWith("别名")) {
if (line.startsWith("别名") || line.startsWith("Alias name")) {
if (dto != null) {
dtoList.add(dto);
}
dto = new KeyStoreEntry();
dto.setOriginalAsName(line.split(":")[1]);
}
if (line.startsWith("条目类型")) {
if (line.startsWith("条目类型") || line.startsWith("Entry type")) {
dto.setType(line.split(":")[1]);
}
}
@ -89,7 +90,6 @@ public class CommandService {
} catch (Exception e) {
MSException.throwException(e.getMessage());
}
}
public void mergeKeyStore(String newKeyStore, KeyStoreConfig sslConfig) {
@ -158,48 +158,18 @@ public class CommandService {
}
}
public void keypasswd(File file, String storepass, String alias, String keypass) {
// 统一密码
try {
List<String> arguments = new ArrayList();
arguments.add("keytool");
arguments.add("-genkeypair");
arguments.add("-keypasswd");
arguments.add("-keystore");
arguments.add(file.getName());
arguments.add("-storepass");
arguments.add(storepass);
arguments.add("-alias");
arguments.add(alias.trim());
arguments.add("-keypass");
arguments.add(keypass);
arguments.add("-new");
arguments.add("ms123...");
SystemCommand nativeCommand = new SystemCommand(file.getParentFile(), (Map) null);
int exitVal = nativeCommand.run(arguments);
if (exitVal > 0) {
MSException.throwException("别名：【" + alias + " 】密码修改失败");
}
} catch (Exception e) {
MSException.throwException(e.getMessage());
}
}
public boolean checkKeyStore(String password, String path) {
try {
String keytoolArgs[] = {"keytool", "-rfc", "-list", "-keystore", path, "-storepass", password};
Process p = new ProcessBuilder(keytoolArgs).start();
try (BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()))) {
String line = null;
KeyStoreEntry dto = null;
while ((line = br.readLine()) != null) {
if (line.contains("keystore password was incorrect")) {
MSException.throwException("认证密码错误，请重新输入密码");
MSException.throwException(Translator.get("ssl_password_error"));
}
if (line.contains("Exception")) {
MSException.throwException("认证文件加载失败，请检查认证文件");
MSException.throwException(Translator.get("ssl_file_error"));
}
}
}

7
backend/src/main/java/io/metersphere/commons/utils/FileUtils.java
View File

@ -51,7 +51,12 @@ public class FileUtils {
}
public static String createFile(MultipartFile bodyFile) {
File file = new File("/opt/metersphere/data/body/tmp" + UUID.randomUUID().toString() + "_" + bodyFile.getOriginalFilename());
String dir = "/opt/metersphere/data/body/tmp/";
File fileDir = new File(dir);
if (!fileDir.exists()) {
fileDir.mkdirs();
}
File file = new File(dir + UUID.randomUUID().toString() + "_" + bodyFile.getOriginalFilename());
try (InputStream in = bodyFile.getInputStream(); OutputStream out = new FileOutputStream(file)) {
file.createNewFile();
FileUtil.copyStream(in, out);

2
backend/src/main/resources/i18n/messages_en_US.properties
View File

@ -220,3 +220,5 @@ mobile_phone_number_cannot_be_empty=When the receiving mode is pin and enterpris
custom_field_already=A feild already exists under this workspace:
template_already=A template already exists under this workspace:
expect_name_exists=Expect name is exists
ssl_password_error=The authentication password is wrong, please re-enter the password
ssl_file_error=Failed to load the certification file, please check the certification file

2
backend/src/main/resources/i18n/messages_zh_CN.properties
View File

@ -220,3 +220,5 @@ authsource_configuration_is_null=认证源配置不能为空
custom_field_already=工作空间下已存在该字段：
template_already=工作空间下已存在该模板：
expect_name_exists=预期名称已存在
ssl_password_error=认证密码错误，请重新输入密码
ssl_file_error=认证文件加载失败，请检查认证文件

2
backend/src/main/resources/i18n/messages_zh_TW.properties
View File

@ -221,3 +221,5 @@ authsource_configuration_is_null=認證源配置不能為空
custom_field_already=工作空間下已存在該字段：
template_already=工作空間下已存在該模板：
expect_name_exists=預期名稱已存在
ssl_password_error=認證密碼錯誤，請重新輸入密碼
ssl_file_error=認證文件加載失敗，請檢查認證文件