【MindIE MS】删除Motor KMC相关编译安装代码-MindIE-Motor-CPP-AtomGit

Mci/install/install.sh+0-3

	@@ -116,12 +116,9 @@ function chmod_authority() {
116	# mindie-server bin目录文件权限	116	# mindie-server bin目录文件权限
117	chmod -R 550 ${install_dir}/bin	117	chmod -R 550 ${install_dir}/bin
118	chmod_file ${install_dir}/bin	118	chmod_file ${install_dir}/bin
119	- chmod 500 ${install_dir}/bin/seceasy_encrypt
120	- chmod 500 ${install_dir}/bin/gen_cert
121	# mindie-server lib目录文件权限	119	# mindie-server lib目录文件权限
122	chmod 550 ${install_dir}/lib	120	chmod 550 ${install_dir}/lib
123	chmod 550 ${install_dir}/lib/grpc	121	chmod 550 ${install_dir}/lib/grpc
124	- chmod 440 ${install_dir}/lib/libsec_easy_utils.a
125	chmod_recursion ${install_dir}/lib "440" "file" ".so"	122	chmod_recursion ${install_dir}/lib "440" "file" ".so"
126	# mindie-server include目录权限	123	# mindie-server include目录权限
127	chmod 500 ${install_dir}/include	124	chmod 500 ${install_dir}/include

Mmindie_service/management_service/CMakeLists.txt+0-2

	@@ -56,14 +56,12 @@ include_directories(
56	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/libboundscheck/include	56	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/libboundscheck/include
57	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/nlohmann-json/include	57	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/nlohmann-json/include
58	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/openssl/include	58	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/openssl/include
59	- ${BUILD_MIES_3RDPARTY_INSTALL_DIR}/hseceasy/include
60	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/grpc/include	59	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/grpc/include
61	$ENV{ASCEND_HOME_PATH}/include	60	$ENV{ASCEND_HOME_PATH}/include
62	)	61	)
63		62
64	link_directories(	63	link_directories(
65	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/libboundscheck/lib	64	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/libboundscheck/lib
66	- ${BUILD_MIES_3RDPARTY_INSTALL_DIR}/hseceasy/lib
67	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/openssl/lib	65	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/openssl/lib
68	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/grpc/lib	66	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/grpc/lib
69	)	67	)

Mmindie_service/management_service/adapter/om_adapter/common/cert_util.py+2-18

	@@ -72,23 +72,7 @@ class AdapterCertUtil:
72	SSL_MUST_KEYS.append(TLS_CRL)	72	SSL_MUST_KEYS.append(TLS_CRL)
73	_check_invalid_ssl_path(config)	73	_check_invalid_ssl_path(config)
74	_check_invalid_ssl_filesize(config)	74	_check_invalid_ssl_filesize(config)
75	- libhse_cryption_so_path = os.path.join(os.getenv("MIES_INSTALL_PATH"), "lib", "libhse_cryption.so")
76	- if not PathCheck.check_path_full(libhse_cryption_so_path):
77	- raise RuntimeError("Failed to check libhse_cryption.so.")
78	- if not PathCheck.check_path_full(config["tls_passwd"]):
79	- raise RuntimeError("Failed to check ccae tls_passwd")
80		75
81	with safe_open(config["tls_passwd"]) as f:	76	with safe_open(config["tls_passwd"]) as f:
82	- cipher_text = f.read().strip()	77	+ return f.read().strip()
83	-	78	+ return None
84	- lib = ctypes.CDLL(libhse_cryption_so_path)
85	- lib.Decrypt.argtypes = [c_char_p, c_char_p, c_char_p, c_char_p]
86	- lib.Decrypt.restype = None
87	-
88	- plain_text = ctypes.create_string_buffer(33)
89	- lib.Decrypt(cipher_text.encode(), plain_text, config["kmc_ksf_master"].encode(),
90	- config["kmc_ksf_standby"].encode())
91	- password = plain_text.value.decode()
92	- ctypes.memset(plain_text, 0, len(plain_text))
93	- del plain_text
94	- return password

Mmindie_service/management_service/config/ms_controller.json+0-16

	@@ -86,8 +86,6 @@
86	"tls_cert": "./security/request_coordinator/security/certs/cert.pem",	86	"tls_cert": "./security/request_coordinator/security/certs/cert.pem",
87	"tls_key": "./security/request_coordinator/security/keys/cert.key.pem",	87	"tls_key": "./security/request_coordinator/security/keys/cert.key.pem",
88	"tls_passwd": "./security/request_coordinator/security/pass/key_pwd.txt",	88	"tls_passwd": "./security/request_coordinator/security/pass/key_pwd.txt",
89	- "kmc_ksf_master": "./security/request_coordinator/tools/pmt/master/ksfa",
90	- "kmc_ksf_standby": "./security/request_coordinator/tools/pmt/standby/ksfb",
91	"tls_crl": ""	89	"tls_crl": ""
92	},	90	},
93	"request_server_tls_enable": true,	91	"request_server_tls_enable": true,
	@@ -96,8 +94,6 @@
96	"tls_cert": "./security/request_server/security/certs/cert.pem",	94	"tls_cert": "./security/request_server/security/certs/cert.pem",
97	"tls_key": "./security/request_server/security/keys/cert.key.pem",	95	"tls_key": "./security/request_server/security/keys/cert.key.pem",
98	"tls_passwd": "./security/request_server/security/pass/key_pwd.txt",	96	"tls_passwd": "./security/request_server/security/pass/key_pwd.txt",
99	- "kmc_ksf_master": "./security/request_server/tools/pmt/master/ksfa",
100	- "kmc_ksf_standby": "./security/request_server/tools/pmt/standby/ksfb",
101	"tls_crl": ""	97	"tls_crl": ""
102	},	98	},
103	"http_server_tls_enable": true,	99	"http_server_tls_enable": true,
	@@ -106,8 +102,6 @@
106	"tls_cert": "./security/http_server/security/certs/cert.pem",	102	"tls_cert": "./security/http_server/security/certs/cert.pem",
107	"tls_key": "./security/http_server/security/keys/cert.key.pem",	103	"tls_key": "./security/http_server/security/keys/cert.key.pem",
108	"tls_passwd": "./security/http_server/security/pass/key_pwd.txt",	104	"tls_passwd": "./security/http_server/security/pass/key_pwd.txt",
109	- "kmc_ksf_master": "./security/http_server/tools/pmt/master/ksfa",
110	- "kmc_ksf_standby": "./security/http_server/tools/pmt/standby/ksfb",
111	"tls_crl": ""	105	"tls_crl": ""
112	},	106	},
113	"cluster_tls_enable": true,	107	"cluster_tls_enable": true,
	@@ -116,8 +110,6 @@
116	"tls_cert": "./security/cluster/security/certs/cert.pem",	110	"tls_cert": "./security/cluster/security/certs/cert.pem",
117	"tls_key": "./security/cluster/security/keys/cert.key.pem",	111	"tls_key": "./security/cluster/security/keys/cert.key.pem",
118	"tls_passwd": "./security/cluster/security/pass/key_pwd.txt",	112	"tls_passwd": "./security/cluster/security/pass/key_pwd.txt",
119	- "kmc_ksf_master": "./security/cluster/tools/pmt/master/ksfa",
120	- "kmc_ksf_standby": "./security/cluster/tools/pmt/standby/ksfb",
121	"tls_crl": ""	113	"tls_crl": ""
122	},	114	},
123	"etcd_server_tls_enable": true,	115	"etcd_server_tls_enable": true,
	@@ -126,8 +118,6 @@
126	"tls_cert": "./security/etcd_server/security/certs/cert.pem",	118	"tls_cert": "./security/etcd_server/security/certs/cert.pem",
127	"tls_key": "./security/etcd_server/security/keys/cert.key.pem",	119	"tls_key": "./security/etcd_server/security/keys/cert.key.pem",
128	"tls_passwd": "./security/etcd_server/security/pass/key_pwd.txt",	120	"tls_passwd": "./security/etcd_server/security/pass/key_pwd.txt",
129	- "kmc_ksf_master": "./security/etcd_server/tools/pmt/master/ksfa",
130	- "kmc_ksf_standby": "./security/etcd_server/tools/pmt/standby/ksfb",
131	"tls_crl": ""	121	"tls_crl": ""
132	},	122	},
133	"ccae_tls_enable": true,	123	"ccae_tls_enable": true,
	@@ -136,8 +126,6 @@
136	"tls_cert": "./security/ccae/security/certs/cert.pem",	126	"tls_cert": "./security/ccae/security/certs/cert.pem",
137	"tls_key": "./security/ccae/security/keys/cert.key.pem",	127	"tls_key": "./security/ccae/security/keys/cert.key.pem",
138	"tls_passwd": "./security/ccae/security/pass/key_pwd.txt",	128	"tls_passwd": "./security/ccae/security/pass/key_pwd.txt",
139	- "kmc_ksf_master": "./security/ccae/tools/pmt/master/ksfa",
140	- "kmc_ksf_standby": "./security/ccae/tools/pmt/standby/ksfb",
141	"tls_crl": ""	129	"tls_crl": ""
142	},	130	},
143	"alarm_tls_enable": true,	131	"alarm_tls_enable": true,
	@@ -146,8 +134,6 @@
146	"tls_cert": "./security/alarm_server/security/certs/cert.pem",	134	"tls_cert": "./security/alarm_server/security/certs/cert.pem",
147	"tls_key": "./security/alarm_server/security/keys/cert.key.pem",	135	"tls_key": "./security/alarm_server/security/keys/cert.key.pem",
148	"tls_passwd": "./security/alarm_server/security/pass/key_pwd.txt",	136	"tls_passwd": "./security/alarm_server/security/pass/key_pwd.txt",
149	- "kmc_ksf_master": "./security/alarm_server/tools/pmt/master/ksfa",
150	- "kmc_ksf_standby": "./security/alarm_server/tools/pmt/standby/ksfb",
151	"tls_crl": ""	137	"tls_crl": ""
152	},	138	},
153	"external_coordinator_tls_enable": true,	139	"external_coordinator_tls_enable": true,
	@@ -156,8 +142,6 @@
156	"tls_cert": "./security/external_coordinator/security/certs/cert.pem",	142	"tls_cert": "./security/external_coordinator/security/certs/cert.pem",
157	"tls_key": "./security/external_coordinator/security/keys/cert.key.pem",	143	"tls_key": "./security/external_coordinator/security/keys/cert.key.pem",
158	"tls_passwd": "./security/external_coordinator/security/pass/key_pwd.txt",	144	"tls_passwd": "./security/external_coordinator/security/pass/key_pwd.txt",
159	- "kmc_ksf_master": "./security/external_coordinator/tools/pmt/master/ksfa",
160	- "kmc_ksf_standby": "./security/external_coordinator/tools/pmt/standby/ksfb",
161	"tls_crl": ""	145	"tls_crl": ""
162	}	146	}
163	},	147	},

Mmindie_service/management_service/config/ms_coordinator.json+0-16

	@@ -67,8 +67,6 @@
67	"tls_cert": "./security/controller/security/certs/cert.pem",	67	"tls_cert": "./security/controller/security/certs/cert.pem",
68	"tls_key": "./security/controller/security/keys/cert.key.pem",	68	"tls_key": "./security/controller/security/keys/cert.key.pem",
69	"tls_passwd": "./security/controller/security/pass/key_pwd.txt",	69	"tls_passwd": "./security/controller/security/pass/key_pwd.txt",
70	- "kmcKsfMaster": "./security/controller/tools/pmt/master/ksfa",
71	- "kmcKsfStandby": "./security/controller/tools/pmt/standby/ksfb",
72	"tls_crl": ""	70	"tls_crl": ""
73	},	71	},
74	"request_server_tls_enable": true,	72	"request_server_tls_enable": true,
	@@ -77,8 +75,6 @@
77	"tls_cert": "./security/request/security/certs/cert.pem",	75	"tls_cert": "./security/request/security/certs/cert.pem",
78	"tls_key": "./security/request/security/keys/cert.key.pem",	76	"tls_key": "./security/request/security/keys/cert.key.pem",
79	"tls_passwd": "./security/request/security/pass/key_pwd.txt",	77	"tls_passwd": "./security/request/security/pass/key_pwd.txt",
80	- "kmcKsfMaster": "./security/request/tools/pmt/master/ksfa",
81	- "kmcKsfStandby": "./security/request/tools/pmt/standby/ksfb",
82	"tls_crl": ""	78	"tls_crl": ""
83	},	79	},
84	"mindie_client_tls_enable": true,	80	"mindie_client_tls_enable": true,
	@@ -87,8 +83,6 @@
87	"tls_cert": "./security/mindie/security/certs/cert.pem",	83	"tls_cert": "./security/mindie/security/certs/cert.pem",
88	"tls_key": "./security/mindie/security/keys/cert.key.pem",	84	"tls_key": "./security/mindie/security/keys/cert.key.pem",
89	"tls_passwd": "./security/mindie/security/pass/key_pwd.txt",	85	"tls_passwd": "./security/mindie/security/pass/key_pwd.txt",
90	- "kmcKsfMaster": "./security/mindie/tools/pmt/master/ksfa",
91	- "kmcKsfStandby": "./security/mindie/tools/pmt/standby/ksfb",
92	"tls_crl": ""	86	"tls_crl": ""
93	},	87	},
94	"mindie_mangment_tls_enable": true,	88	"mindie_mangment_tls_enable": true,
	@@ -97,8 +91,6 @@
97	"tls_cert": "./security/mindie_mgmt/security/certs/cert.pem",	91	"tls_cert": "./security/mindie_mgmt/security/certs/cert.pem",
98	"tls_key": "./security/mindie_mgmt/security/keys/cert.key.pem",	92	"tls_key": "./security/mindie_mgmt/security/keys/cert.key.pem",
99	"tls_passwd": "./security/mindie_mgmt/security/pass/key_pwd.txt",	93	"tls_passwd": "./security/mindie_mgmt/security/pass/key_pwd.txt",
100	- "kmcKsfMaster": "./security/mindie_mgmt/tools/pmt/master/ksfa",
101	- "kmcKsfStandby": "./security/mindie_mgmt/tools/pmt/standby/ksfb",
102	"tls_crl": ""	94	"tls_crl": ""
103	},	95	},
104	"external_tls_enable": true,	96	"external_tls_enable": true,
	@@ -107,8 +99,6 @@
107	"tls_cert": "./security/external/security/certs/cert.pem",	99	"tls_cert": "./security/external/security/certs/cert.pem",
108	"tls_key": "./security/external/security/keys/cert.key.pem",	100	"tls_key": "./security/external/security/keys/cert.key.pem",
109	"tls_passwd": "./security/external/security/pass/key_pwd.txt",	101	"tls_passwd": "./security/external/security/pass/key_pwd.txt",
110	- "kmcKsfMaster": "./security/external/tools/pmt/master/ksfa",
111	- "kmcKsfStandby": "./security/external/tools/pmt/standby/ksfb",
112	"tls_crl": ""	102	"tls_crl": ""
113	},	103	},
114	"status_tls_enable": true,	104	"status_tls_enable": true,
	@@ -117,8 +107,6 @@
117	"tls_cert": "./security/status/security/certs/cert.pem",	107	"tls_cert": "./security/status/security/certs/cert.pem",
118	"tls_key": "./security/status/security/keys/cert.key.pem",	108	"tls_key": "./security/status/security/keys/cert.key.pem",
119	"tls_passwd": "./security/status/security/pass/key_pwd.txt",	109	"tls_passwd": "./security/status/security/pass/key_pwd.txt",
120	- "kmcKsfMaster": "./security/status/tools/pmt/master/ksfa",
121	- "kmcKsfStandby": "./security/status/tools/pmt/standby/ksfb",
122	"tls_crl": ""	110	"tls_crl": ""
123	},	111	},
124	"etcd_server_tls_enable": true,	112	"etcd_server_tls_enable": true,
	@@ -127,8 +115,6 @@
127	"tls_cert": "./security/etcd_server/security/certs/cert.pem",	115	"tls_cert": "./security/etcd_server/security/certs/cert.pem",
128	"tls_key": "./security/etcd_server/security/keys/cert.key.pem",	116	"tls_key": "./security/etcd_server/security/keys/cert.key.pem",
129	"tls_passwd": "./security/etcd_server/security/pass/key_pwd.txt",	117	"tls_passwd": "./security/etcd_server/security/pass/key_pwd.txt",
130	- "kmcKsfMaster": "./security/etcd_server/tools/pmt/master/ksfa",
131	- "kmcKsfStandby": "./security/etcd_server/tools/pmt/standby/ksfb",
132	"tls_crl": ""	118	"tls_crl": ""
133	},	119	},
134	"alarm_client_tls_enable": true,	120	"alarm_client_tls_enable": true,
	@@ -137,8 +123,6 @@
137	"tls_cert": "./security/alarm/security/certs/cert.pem",	123	"tls_cert": "./security/alarm/security/certs/cert.pem",
138	"tls_key": "./security/alarm/security/keys/cert.key.pem",	124	"tls_key": "./security/alarm/security/keys/cert.key.pem",
139	"tls_passwd": "./security/alarm/security/pass/key_pwd.txt",	125	"tls_passwd": "./security/alarm/security/pass/key_pwd.txt",
140	- "kmcKsfMaster": "./security/alarm/tools/pmt/master/ksfa",
141	- "kmcKsfStandby": "./security/alarm/tools/pmt/standby/ksfb",
142	"tls_crl": ""	126	"tls_crl": ""
143	}	127	}
144	},	128	},

Mmindie_service/management_service/config/ms_server.json+0-6

	@@ -14,8 +14,6 @@
14	"tls_cert": "./security/msserver/security/certs/cert.pem",	14	"tls_cert": "./security/msserver/security/certs/cert.pem",
15	"tls_key": "./security/msserver/security/keys/cert.key.pem",	15	"tls_key": "./security/msserver/security/keys/cert.key.pem",
16	"tls_passwd": "./security/msserver/security/pass/key_pwd.txt",	16	"tls_passwd": "./security/msserver/security/pass/key_pwd.txt",
17	- "kmcKsfMaster": "./security/msserver/tools/pmt/master/ksfa",
18	- "kmcKsfStandby": "./security/msserver/tools/pmt/standby/ksfb",
19	"tls_crl": ""	17	"tls_crl": ""
20	},	18	},
21	"client_k8s_tls_enable": true,	19	"client_k8s_tls_enable": true,
	@@ -24,8 +22,6 @@
24	"tls_cert": "./security/kubeclient/security/certs/cert.pem",	22	"tls_cert": "./security/kubeclient/security/certs/cert.pem",
25	"tls_key": "./security/kubeclient/security/keys/cert.key.pem",	23	"tls_key": "./security/kubeclient/security/keys/cert.key.pem",
26	"tls_passwd": "./security/kubeclient/security/pass/key_pwd.txt",	24	"tls_passwd": "./security/kubeclient/security/pass/key_pwd.txt",
27	- "kmcKsfMaster": "./security/kubeclient/tools/pmt/master/ksfa",
28	- "kmcKsfStandby": "./security/kubeclient/tools/pmt/standby/ksfb",
29	"tls_crl": ""	25	"tls_crl": ""
30	},	26	},
31	"client_mindie_server_tls_enable": true,	27	"client_mindie_server_tls_enable": true,
	@@ -34,8 +30,6 @@
34	"tls_cert": "./security/mindieclient/security/certs/cert.pem",	30	"tls_cert": "./security/mindieclient/security/certs/cert.pem",
35	"tls_key": "./security/mindieclient/security/keys/cert.key.pem",	31	"tls_key": "./security/mindieclient/security/keys/cert.key.pem",
36	"tls_passwd": "./security/mindieclient/security/pass/key_pwd.txt",	32	"tls_passwd": "./security/mindieclient/security/pass/key_pwd.txt",
37	- "kmcKsfMaster": "./security/mindieclient/tools/pmt/master/ksfa",
38	- "kmcKsfStandby": "./security/mindieclient/tools/pmt/standby/ksfb",
39	"tls_crl": ""	33	"tls_crl": ""
40	}	34	}
41	}	35	}

Mmindie_service/management_service/config/node_manager.json+0-4

	@@ -10,8 +10,6 @@
10	"tls_cert": "./security/node_manager/security/certs/cert.pem",	10	"tls_cert": "./security/node_manager/security/certs/cert.pem",
11	"tls_key": "./security/node_manager/security/keys/cert.key.pem",	11	"tls_key": "./security/node_manager/security/keys/cert.key.pem",
12	"tls_passwd": "./security/node_manager/security/pass/key_pwd.txt",	12	"tls_passwd": "./security/node_manager/security/pass/key_pwd.txt",
13	- "kmcKsfMaster": "./security/node_manager/tools/pmt/master/ksfa",
14	- "kmcKsfStandby": "./security/node_manager/tools/pmt/standby/ksfb",
15	"tls_crl": ""	13	"tls_crl": ""
16	},	14	},
17	"client_tls_enable": true,	15	"client_tls_enable": true,
	@@ -20,8 +18,6 @@
20	"tls_cert": "./security/node_manager/security/certs/cert.pem",	18	"tls_cert": "./security/node_manager/security/certs/cert.pem",
21	"tls_key": "./security/node_manager/security/keys/cert.key.pem",	19	"tls_key": "./security/node_manager/security/keys/cert.key.pem",
22	"tls_passwd": "./security/node_manager/security/pass/key_pwd.txt",	20	"tls_passwd": "./security/node_manager/security/pass/key_pwd.txt",
23	- "kmcKsfMaster": "./security/node_manager/tools/pmt/master/ksfa",
24	- "kmcKsfStandby": "./security/node_manager/tools/pmt/standby/ksfb",
25	"tls_crl": ""	21	"tls_crl": ""
26	}	22	}
27	}	23	}

Mmindie_service/management_service/controller/CMakeLists.txt+1-1

	@@ -103,7 +103,7 @@ set(_REFLECTION gRPC::grpc++_reflection)
103	set(_GRPC_GRPCPP gRPC::grpc++)	103	set(_GRPC_GRPCPP gRPC::grpc++)
104		104
105	add_executable(ms_controller ${MS_CONTROLLER_SOURCE})	105	add_executable(ms_controller ${MS_CONTROLLER_SOURCE})
106	-target_link_libraries(ms_controller crypto ssl boundscheck pthread hse_cryption -ldl ${_REFLECTION} ${_GRPC_GRPCPP} ${_PROTOBUF_LIBPROTOBUF})	106	+target_link_libraries(ms_controller crypto ssl boundscheck pthread -ldl ${_REFLECTION} ${_GRPC_GRPCPP} ${_PROTOBUF_LIBPROTOBUF})
107		107
108	install(TARGETS ms_controller DESTINATION bin)	108	install(TARGETS ms_controller DESTINATION bin)
109		109

Mmindie_service/management_service/controller/constant/ControllerConfig.cpp+3-5

	@@ -139,11 +139,11 @@ static bool IsTlsConfigJsonStringValid(const nlohmann::json &config, const std::
139	if (!tlsEnable) {	139	if (!tlsEnable) {
140	return true;	140	return true;
141	}	141	}
		142	+ int tlsCrlNameMaxLen = 4096;
142	if (!IsJsonObjValid(config, certName) \|\| !IsJsonStringValid(config[certName], "ca_cert") \|\|	143	if (!IsJsonObjValid(config, certName) \|\| !IsJsonStringValid(config[certName], "ca_cert") \|\|
143	!IsJsonStringValid(config[certName], "tls_cert") \|\| !IsJsonStringValid(config[certName], "tls_key") \|\|	144	!IsJsonStringValid(config[certName], "tls_cert") \|\| !IsJsonStringValid(config[certName], "tls_key") \|\|
144	- !IsJsonStringValid(config[certName], "tls_passwd") \|\| !IsJsonStringValid(config[certName], "kmc_ksf_master") \|\|	145	+ !IsJsonStringValid(config[certName], "tls_passwd") \|\|
145	- !IsJsonStringValid(config[certName], "kmc_ksf_standby") \|\|	146	+ !IsJsonStringValid(config[certName], "tls_crl", 0, tlsCrlNameMaxLen)) { // tls_crl有效长度为0~4096
146	- !IsJsonStringValid(config[certName], "tls_crl", 0, 4096)) { // tls_crl有效长度为0~4096
147	return false;	147	return false;
148	}	148	}
149	return true;	149	return true;
	@@ -673,8 +673,6 @@ TlsItems ControllerConfig::GetInitTlsItems(const nlohmann::json &rawConfig, cons
673	tlsItems.tlsCert = rawConfig[certName].at("tls_cert").get<std::string>();	673	tlsItems.tlsCert = rawConfig[certName].at("tls_cert").get<std::string>();
674	tlsItems.tlsKey = rawConfig[certName].at("tls_key").get<std::string>();	674	tlsItems.tlsKey = rawConfig[certName].at("tls_key").get<std::string>();
675	tlsItems.tlsPasswd = rawConfig[certName].at("tls_passwd").get<std::string>();	675	tlsItems.tlsPasswd = rawConfig[certName].at("tls_passwd").get<std::string>();
676	- tlsItems.kmcKsfMaster = rawConfig[certName].at("kmc_ksf_master").get<std::string>();
677	- tlsItems.kmcKsfStandby = rawConfig[certName].at("kmc_ksf_standby").get<std::string>();
678	tlsItems.tlsCrl = rawConfig[certName].at("tls_crl").get<std::string>();	676	tlsItems.tlsCrl = rawConfig[certName].at("tls_crl").get<std::string>();
679	tlsItems.checkFiles = mCheckMountedFiles;	677	tlsItems.checkFiles = mCheckMountedFiles;
680	return tlsItems;	678	return tlsItems;

Mmindie_service/management_service/coordinator/CMakeLists.txt+1-1

	@@ -128,7 +128,7 @@ set(_REFLECTION gRPC::grpc++_reflection)
128	set(_GRPC_GRPCPP gRPC::grpc++)	128	set(_GRPC_GRPCPP gRPC::grpc++)
129		129
130	add_executable(ms_coordinator ${MS_COORDINATOR_SOURCE})	130	add_executable(ms_coordinator ${MS_COORDINATOR_SOURCE})
131	-target_link_libraries(ms_coordinator crypto ssl boundscheck rt pthread hse_cryption -ldl ${_REFLECTION} ${_GRPC_GRPCPP} ${_PROTOBUF_LIBPROTOBUF})	131	+target_link_libraries(ms_coordinator crypto ssl boundscheck rt pthread -ldl ${_REFLECTION} ${_GRPC_GRPCPP} ${_PROTOBUF_LIBPROTOBUF})
132		132
133	install(TARGETS ms_coordinator DESTINATION bin)	133	install(TARGETS ms_coordinator DESTINATION bin)
134	install(FILES ${ROOT_PATH}/config/ms_coordinator.json DESTINATION config)	134	install(FILES ${ROOT_PATH}/config/ms_coordinator.json DESTINATION config)

Mmindie_service/management_service/coordinator/configure/Configure.cpp+1-5

	@@ -484,9 +484,7 @@ static bool IsTlsValid(const nlohmann::json &mainObj, const std::string &tlsEnab
484	!IsJsonStringValid(mainObj[tlsItemName], "tls_cert") \|\|	484	!IsJsonStringValid(mainObj[tlsItemName], "tls_cert") \|\|
485	!IsJsonStringValid(mainObj[tlsItemName], "tls_key") \|\|	485	!IsJsonStringValid(mainObj[tlsItemName], "tls_key") \|\|
486	!IsJsonStringValid(mainObj[tlsItemName], "tls_passwd") \|\|	486	!IsJsonStringValid(mainObj[tlsItemName], "tls_passwd") \|\|
487	- !IsJsonStringValid(mainObj[tlsItemName], "tls_crl", 0) \|\|	487	+ !IsJsonStringValid(mainObj[tlsItemName], "tls_crl", 0)) {
488	- !IsJsonStringValid(mainObj[tlsItemName], "kmcKsfMaster") \|\|
489	- !IsJsonStringValid(mainObj[tlsItemName], "kmcKsfStandby")) {
490	return false;	488	return false;
491	}	489	}
492	}	490	}
	@@ -512,8 +510,6 @@ static void ReadTlsItems(const nlohmann::json &config, std::string itemsStr, Tls
512	items.tlsKey = config[itemsStr]["tls_key"];	510	items.tlsKey = config[itemsStr]["tls_key"];
513	items.tlsCrl = config[itemsStr]["tls_crl"];	511	items.tlsCrl = config[itemsStr]["tls_crl"];
514	items.tlsPasswd = config[itemsStr]["tls_passwd"];	512	items.tlsPasswd = config[itemsStr]["tls_passwd"];
515	- items.kmcKsfMaster = config[itemsStr]["kmcKsfMaster"];
516	- items.kmcKsfStandby = config[itemsStr]["kmcKsfStandby"];
517	}	513	}
518		514
519	int32_t Configure::ReadTlsConfig(const nlohmann::json &config)	515	int32_t Configure::ReadTlsConfig(const nlohmann::json &config)

Mmindie_service/management_service/deployer/CMakeLists.txt+2-2

	@@ -24,7 +24,7 @@ file(GLOB ms_server_source_files
24	set(MS_SERVER_SOURCE ${ms_server_source_files} ${CMAKE_CURRENT_SOURCE_DIR}/server/main.cpp)	24	set(MS_SERVER_SOURCE ${ms_server_source_files} ${CMAKE_CURRENT_SOURCE_DIR}/server/main.cpp)
25		25
26	add_executable(ms_server ${MS_SERVER_SOURCE})	26	add_executable(ms_server ${MS_SERVER_SOURCE})
27	-target_link_libraries(ms_server crypto ssl boundscheck pthread hse_cryption -ldl)	27	+target_link_libraries(ms_server crypto ssl boundscheck pthread -ldl)
28		28
29	file(GLOB msctl_source_files	29	file(GLOB msctl_source_files
30	${CMAKE_CURRENT_SOURCE_DIR}/msctl/main.cpp	30	${CMAKE_CURRENT_SOURCE_DIR}/msctl/main.cpp
	@@ -36,7 +36,7 @@ file(GLOB msctl_source_files
36		36
37	set(MS_CTL_SOURCE ${msctl_source_files})	37	set(MS_CTL_SOURCE ${msctl_source_files})
38	add_executable(msctl ${MS_CTL_SOURCE})	38	add_executable(msctl ${MS_CTL_SOURCE})
39	-target_link_libraries(msctl crypto ssl boundscheck pthread hse_cryption -ldl)	39	+target_link_libraries(msctl crypto ssl boundscheck pthread -ldl)
40		40
41	install(TARGETS msctl DESTINATION bin)	41	install(TARGETS msctl DESTINATION bin)
42	install(TARGETS ms_server DESTINATION bin)	42	install(TARGETS ms_server DESTINATION bin)

Mmindie_service/management_service/deployer/server/main.cpp+2-12

	@@ -32,9 +32,7 @@ static bool IsTlsItemsValid(const nlohmann::json &mainObj, const std::string &tl
32	!IsJsonStringValid(mainObj[tlsItemName], "tls_cert") \|\|	32	!IsJsonStringValid(mainObj[tlsItemName], "tls_cert") \|\|
33	!IsJsonStringValid(mainObj[tlsItemName], "tls_key") \|\|	33	!IsJsonStringValid(mainObj[tlsItemName], "tls_key") \|\|
34	!IsJsonStringValid(mainObj[tlsItemName], "tls_passwd", 0) \|\|	34	!IsJsonStringValid(mainObj[tlsItemName], "tls_passwd", 0) \|\|
35	- !IsJsonStringValid(mainObj[tlsItemName], "tls_crl", 0) \|\|	35	+ !IsJsonStringValid(mainObj[tlsItemName], "tls_crl", 0)) {
36	- !IsJsonStringValid(mainObj[tlsItemName], "kmcKsfMaster") \|\|
37	- !IsJsonStringValid(mainObj[tlsItemName], "kmcKsfStandby")) {
38	return false;	36	return false;
39	}	37	}
40	}	38	}
	@@ -54,9 +52,7 @@ static bool IsJsonValid(const nlohmann::json &mainObj)
54	!IsJsonStringValid(mainObj[tlsItemName], "tls_cert") \|\|	52	!IsJsonStringValid(mainObj[tlsItemName], "tls_cert") \|\|
55	!IsJsonStringValid(mainObj[tlsItemName], "tls_key") \|\|	53	!IsJsonStringValid(mainObj[tlsItemName], "tls_key") \|\|
56	!IsJsonStringValid(mainObj[tlsItemName], "tls_passwd", 0) \|\|	54	!IsJsonStringValid(mainObj[tlsItemName], "tls_passwd", 0) \|\|
57	- !IsJsonStringValid(mainObj[tlsItemName], "tls_crl", 0) \|\|	55	+ !IsJsonStringValid(mainObj[tlsItemName], "tls_crl", 0)) {
58	- !IsJsonStringValid(mainObj[tlsItemName], "kmcKsfMaster") \|\|
59	- !IsJsonStringValid(mainObj[tlsItemName], "kmcKsfStandby")) {
60	return false;	56	return false;
61	}	57	}
62	if (!IsTlsItemsValid(mainObj, "client_k8s_tls_enable", "client_k8s_tls_items")) {	58	if (!IsTlsItemsValid(mainObj, "client_k8s_tls_enable", "client_k8s_tls_items")) {
	@@ -86,8 +82,6 @@ static int32_t ObtainJsonValue(nlohmann::json mainObj, HttpClientParams &clientP
86	httpServerParams.serverTlsItems.tlsKey = mainObj["server_tls_items"]["tls_key"];	82	httpServerParams.serverTlsItems.tlsKey = mainObj["server_tls_items"]["tls_key"];
87	httpServerParams.serverTlsItems.tlsPasswd = mainObj["server_tls_items"]["tls_passwd"];	83	httpServerParams.serverTlsItems.tlsPasswd = mainObj["server_tls_items"]["tls_passwd"];
88	httpServerParams.serverTlsItems.tlsCrl = mainObj["server_tls_items"]["tls_crl"];	84	httpServerParams.serverTlsItems.tlsCrl = mainObj["server_tls_items"]["tls_crl"];
89	- httpServerParams.serverTlsItems.kmcKsfMaster = mainObj["server_tls_items"]["kmcKsfMaster"];
90	- httpServerParams.serverTlsItems.kmcKsfStandby = mainObj["server_tls_items"]["kmcKsfStandby"];
91	}	85	}
92	clientParams.k8sIP = mainObj["k8s_apiserver_ip"];	86	clientParams.k8sIP = mainObj["k8s_apiserver_ip"];
93	clientParams.k8sPort = mainObj["k8s_apiserver_port"];	87	clientParams.k8sPort = mainObj["k8s_apiserver_port"];
	@@ -103,8 +97,6 @@ static int32_t ObtainJsonValue(nlohmann::json mainObj, HttpClientParams &clientP
103	clientParams.k8sClientTlsItems.tlsKey = mainObj["client_k8s_tls_items"]["tls_key"];	97	clientParams.k8sClientTlsItems.tlsKey = mainObj["client_k8s_tls_items"]["tls_key"];
104	clientParams.k8sClientTlsItems.tlsCrl = mainObj["client_k8s_tls_items"]["tls_crl"];	98	clientParams.k8sClientTlsItems.tlsCrl = mainObj["client_k8s_tls_items"]["tls_crl"];
105	clientParams.k8sClientTlsItems.tlsPasswd = mainObj["client_k8s_tls_items"]["tls_passwd"];	99	clientParams.k8sClientTlsItems.tlsPasswd = mainObj["client_k8s_tls_items"]["tls_passwd"];
106	- clientParams.k8sClientTlsItems.kmcKsfMaster = mainObj["client_k8s_tls_items"]["kmcKsfMaster"];
107	- clientParams.k8sClientTlsItems.kmcKsfStandby = mainObj["client_k8s_tls_items"]["kmcKsfStandby"];
108	}	100	}
109	clientParams.mindieClientTlsItems.tlsEnable = mainObj["client_mindie_server_tls_enable"];	101	clientParams.mindieClientTlsItems.tlsEnable = mainObj["client_mindie_server_tls_enable"];
110	if (mainObj["client_mindie_server_tls_enable"]) {	102	if (mainObj["client_mindie_server_tls_enable"]) {
	@@ -113,8 +105,6 @@ static int32_t ObtainJsonValue(nlohmann::json mainObj, HttpClientParams &clientP
113	clientParams.mindieClientTlsItems.tlsKey = mainObj["client_mindie_tls_items"]["tls_key"];	105	clientParams.mindieClientTlsItems.tlsKey = mainObj["client_mindie_tls_items"]["tls_key"];
114	clientParams.mindieClientTlsItems.tlsCrl = mainObj["client_mindie_tls_items"]["tls_crl"];	106	clientParams.mindieClientTlsItems.tlsCrl = mainObj["client_mindie_tls_items"]["tls_crl"];
115	clientParams.mindieClientTlsItems.tlsPasswd = mainObj["client_mindie_tls_items"]["tls_passwd"];	107	clientParams.mindieClientTlsItems.tlsPasswd = mainObj["client_mindie_tls_items"]["tls_passwd"];
116	- clientParams.mindieClientTlsItems.kmcKsfMaster = mainObj["client_mindie_tls_items"]["kmcKsfMaster"];
117	- clientParams.mindieClientTlsItems.kmcKsfStandby = mainObj["client_mindie_tls_items"]["kmcKsfStandby"];
118	}	108	}
119	return 0;	109	return 0;
120	}	110	}

Mmindie_service/management_service/example/deploy_scripts/deploy_ac_job.py+0-13

	@@ -136,8 +136,6 @@ TLS_CONFIG = "tls_config"
136	TLS_KEY = "tls_key"	136	TLS_KEY = "tls_key"
137	TLS_PASSWD = "tls_passwd"	137	TLS_PASSWD = "tls_passwd"
138	TLS_CRL = "tls_crl"	138	TLS_CRL = "tls_crl"
139	-KMC_KSF_STANDBY = "kmc_ksf_standby"
140	-KMC_KSF_MASTER = "kmc_ksf_master"
141	MANAGEMENT_TLS_ITEMS = "management_tls_items"	139	MANAGEMENT_TLS_ITEMS = "management_tls_items"
142	MANAGEMENT_TLS_ENABLE = "management_tls_enable"	140	MANAGEMENT_TLS_ENABLE = "management_tls_enable"
143	CLUSTER_TLS_ENABLE = "cluster_tls_enable"	141	CLUSTER_TLS_ENABLE = "cluster_tls_enable"
	@@ -1117,7 +1115,6 @@ def assign_cert_files(ms_tls_config, deploy_config_tls_config, cert_type, is_con
1117	:param ms_tls_config: ms config dict	1115	:param ms_tls_config: ms config dict
1118	:param deploy_config_tls_config: deploy_config	1116	:param deploy_config_tls_config: deploy_config
1119	:param cert_type: "infer"/"management"	1117	:param cert_type: "infer"/"management"
1120	- :param is_controller: controller format, kmc_ksf_master, kmc_ksf_standby. coordinator, kmcKsfMaster, kmcKsfStandby
1121	:return: none	1118	:return: none
1122	"""	1119	"""
1123	enable = deploy_config_tls_config[TLS_ENABLE]	1120	enable = deploy_config_tls_config[TLS_ENABLE]
	@@ -1130,12 +1127,6 @@ def assign_cert_files(ms_tls_config, deploy_config_tls_config, cert_type, is_con
1130	ms_tls_config[TLS_KEY] = deploy_config_tls_config[type_key][TLS_KEY]	1127	ms_tls_config[TLS_KEY] = deploy_config_tls_config[type_key][TLS_KEY]
1131	ms_tls_config[TLS_PASSWD] = deploy_config_tls_config[type_key][TLS_PASSWD]	1128	ms_tls_config[TLS_PASSWD] = deploy_config_tls_config[type_key][TLS_PASSWD]
1132	ms_tls_config[TLS_CRL] = deploy_config_tls_config[type_key][TLS_CRL]	1129	ms_tls_config[TLS_CRL] = deploy_config_tls_config[type_key][TLS_CRL]
1133	- if is_controller:
1134	- ms_tls_config[KMC_KSF_MASTER] = deploy_config_tls_config[KMC_KSF_MASTER]
1135	- ms_tls_config[KMC_KSF_STANDBY] = deploy_config_tls_config[KMC_KSF_STANDBY]
1136	- else:
1137	- ms_tls_config["kmcKsfMaster"] = deploy_config_tls_config[KMC_KSF_MASTER]
1138	- ms_tls_config["kmcKsfStandby"] = deploy_config_tls_config[KMC_KSF_STANDBY]
1139		1130
1140		1131
1141	def update_controller_tls_info(modify_result_dict, deploy_config):	1132	def update_controller_tls_info(modify_result_dict, deploy_config):
	@@ -1272,8 +1263,6 @@ def update_server_tls_info(modify_result_dict, deploy_config):
1272	modify_result_dict[SERVER_CONFIG]["tlsPkPwd"] = deploy_config[TLS_CONFIG][key][TLS_PASSWD]	1263	modify_result_dict[SERVER_CONFIG]["tlsPkPwd"] = deploy_config[TLS_CONFIG][key][TLS_PASSWD]
1273	modify_result_dict[SERVER_CONFIG]["tlsCrlPath"] = get_path_with_separator(deploy_config[TLS_CONFIG][key][TLS_CRL])	1264	modify_result_dict[SERVER_CONFIG]["tlsCrlPath"] = get_path_with_separator(deploy_config[TLS_CONFIG][key][TLS_CRL])
1274	modify_result_dict[SERVER_CONFIG]["tlsCrlFiles"] = get_crl_files(deploy_config[TLS_CONFIG][key][TLS_CRL])	1265	modify_result_dict[SERVER_CONFIG]["tlsCrlFiles"] = get_crl_files(deploy_config[TLS_CONFIG][key][TLS_CRL])
1275	- modify_result_dict[SERVER_CONFIG]["kmcKsfMaster"] = deploy_config[TLS_CONFIG]["kmc_ksf_master"]
1276	- modify_result_dict[SERVER_CONFIG]["kmcKsfStandby"] = deploy_config[TLS_CONFIG]["kmc_ksf_standby"]
1277	modify_result_dict[SERVER_CONFIG]["httpsEnabled"] = deploy_config[TLS_CONFIG][TLS_ENABLE] \	1266	modify_result_dict[SERVER_CONFIG]["httpsEnabled"] = deploy_config[TLS_CONFIG][TLS_ENABLE] \
1278	if deploy_config[TLS_CONFIG][TLS_ENABLE] is not None else deploy_config[TLS_CONFIG][INFER_TLS_ENABLE]	1267	if deploy_config[TLS_CONFIG][TLS_ENABLE] is not None else deploy_config[TLS_CONFIG][INFER_TLS_ENABLE]
1279	# assign management TLS	1268	# assign management TLS
	@@ -1326,8 +1315,6 @@ def update_server_tls_info(modify_result_dict, deploy_config):
1326	modify_result_dict[BACKEND_CONFIG]["interNodeTlsCrlPath"] = get_path_with_separator(	1315	modify_result_dict[BACKEND_CONFIG]["interNodeTlsCrlPath"] = get_path_with_separator(
1327	deploy_config[TLS_CONFIG][key][TLS_CRL])	1316	deploy_config[TLS_CONFIG][key][TLS_CRL])
1328	modify_result_dict[BACKEND_CONFIG]["interNodeTlsCrlFiles"] = get_crl_files(deploy_config[TLS_CONFIG][key][TLS_CRL])	1317	modify_result_dict[BACKEND_CONFIG]["interNodeTlsCrlFiles"] = get_crl_files(deploy_config[TLS_CONFIG][key][TLS_CRL])
1329	- modify_result_dict[BACKEND_CONFIG]["interNodeKmcKsfMaster"] = deploy_config[TLS_CONFIG]["kmc_ksf_master"]
1330	- modify_result_dict[BACKEND_CONFIG]["interNodeKmcKsfStandby"] = deploy_config[TLS_CONFIG]["kmc_ksf_standby"]
1331	modify_result_dict[BACKEND_CONFIG]["interNodeTLSEnabled"] = deploy_config[TLS_CONFIG][TLS_ENABLE] \	1318	modify_result_dict[BACKEND_CONFIG]["interNodeTLSEnabled"] = deploy_config[TLS_CONFIG][TLS_ENABLE] \
1332	if deploy_config[TLS_CONFIG][TLS_ENABLE] is not None else deploy_config[TLS_CONFIG][MANAGEMENT_TLS_ENABLE]	1319	if deploy_config[TLS_CONFIG][TLS_ENABLE] is not None else deploy_config[TLS_CONFIG][MANAGEMENT_TLS_ENABLE]
1333		1320

Mmindie_service/management_service/example/deploy_scripts/user_config.json+0-4

	@@ -43,8 +43,6 @@
43	},	43	},
44	"tls_config": {	44	"tls_config": {
45	"tls_enable": true,	45	"tls_enable": true,
46	- "kmc_ksf_master": "./security/master/tools/pmt/master/ksfa",
47	- "kmc_ksf_standby": "./security/standby/tools/pmt/standby/ksfb",
48	"infer_tls_enable": true,	46	"infer_tls_enable": true,
49	"infer_tls_items": {	47	"infer_tls_items": {
50	"ca_cert": "./security/infer/security/certs/ca.pem",	48	"ca_cert": "./security/infer/security/certs/ca.pem",
	@@ -83,8 +81,6 @@
83	"tls_cert": "./security/etcd_server/security/certs/cert.pem",	81	"tls_cert": "./security/etcd_server/security/certs/cert.pem",
84	"tls_key": "./security/etcd_server/security/keys/cert.key.pem",	82	"tls_key": "./security/etcd_server/security/keys/cert.key.pem",
85	"tls_passwd": "./security/etcd_server/security/pass/key_pwd.txt",	83	"tls_passwd": "./security/etcd_server/security/pass/key_pwd.txt",
86	- "kmc_ksf_master": "./security/etcd_server/tools/pmt/master/ksfa",
87	- "kmc_ksf_standby": "./security/etcd_server/tools/pmt/standby/ksfb",
88	"tls_crl": ""	84	"tls_crl": ""
89	}	85	}
90	}	86	}

Mmindie_service/management_service/example/deploy_scripts/user_config_base_A3.json+0-4

	@@ -46,8 +46,6 @@
46	},	46	},
47	"tls_config": {	47	"tls_config": {
48	"tls_enable": true,	48	"tls_enable": true,
49	- "kmc_ksf_master": "./security/master/tools/pmt/master/ksfa",
50	- "kmc_ksf_standby": "./security/standby/tools/pmt/standby/ksfb",
51	"infer_tls_enable": true,	49	"infer_tls_enable": true,
52	"infer_tls_items": {	50	"infer_tls_items": {
53	"ca_cert": "./security/infer/security/certs/ca.pem",	51	"ca_cert": "./security/infer/security/certs/ca.pem",
	@@ -94,8 +92,6 @@
94	"tls_cert": "./security/etcd_server/security/certs/cert.pem",	92	"tls_cert": "./security/etcd_server/security/certs/cert.pem",
95	"tls_key": "./security/etcd_server/security/keys/cert.key.pem",	93	"tls_key": "./security/etcd_server/security/keys/cert.key.pem",
96	"tls_passwd": "./security/etcd_server/security/pass/key_pwd.txt",	94	"tls_passwd": "./security/etcd_server/security/pass/key_pwd.txt",
97	- "kmc_ksf_master": "./security/etcd_server/tools/pmt/master/ksfa",
98	- "kmc_ksf_standby": "./security/etcd_server/tools/pmt/standby/ksfb",
99	"tls_crl": ""	95	"tls_crl": ""
100	}	96	}
101	}	97	}

Mmindie_service/management_service/example/deploy_scripts/utils/validate_config.py+0-7

	@@ -24,8 +24,6 @@ TLS_KEY = "tls_key"
24	TLS_CRL = "tls_crl"	24	TLS_CRL = "tls_crl"
25	TLS_PASSWD = "tls_passwd"	25	TLS_PASSWD = "tls_passwd"
26	TLS_ENABLE = "tls_enable"	26	TLS_ENABLE = "tls_enable"
27	-KMC_KSF_MASTER = "kmc_ksf_master"
28	-KMC_KSF_STANDBY = "kmc_ksf_standby"
29	CA_CERT = "ca_cert"	27	CA_CERT = "ca_cert"
30	CLUSTER_TLS_ITEMS = "cluster_tls_items"	28	CLUSTER_TLS_ITEMS = "cluster_tls_items"
31	MANAGEMENT_TLS_ITEMS = "management_tls_items"	29	MANAGEMENT_TLS_ITEMS = "management_tls_items"
	@@ -78,9 +76,6 @@ def validate_deploy_config(config_dict):
78	is_valid_bool("infer_tls_enable", deploy_config[TLS_CONFIG]["infer_tls_enable"])	76	is_valid_bool("infer_tls_enable", deploy_config[TLS_CONFIG]["infer_tls_enable"])
79	is_valid_bool("management_tls_enable", deploy_config[TLS_CONFIG]["management_tls_enable"])	77	is_valid_bool("management_tls_enable", deploy_config[TLS_CONFIG]["management_tls_enable"])
80		78
81	- is_valid_path("tls_config_kmc_ksf_master", deploy_config[TLS_CONFIG][KMC_KSF_MASTER])
82	- is_valid_path("tls_config_kmc_ksf_standby", deploy_config[TLS_CONFIG][KMC_KSF_STANDBY])
83	-
84	is_valid_path("infer_ca_cert", deploy_config[TLS_CONFIG][INFER_TLS_ITEMS][CA_CERT])	79	is_valid_path("infer_ca_cert", deploy_config[TLS_CONFIG][INFER_TLS_ITEMS][CA_CERT])
85	is_valid_path("infer_tls_cert", deploy_config[TLS_CONFIG][INFER_TLS_ITEMS][TLS_CERT])	80	is_valid_path("infer_tls_cert", deploy_config[TLS_CONFIG][INFER_TLS_ITEMS][TLS_CERT])
86	is_valid_path("infer_tls_key", deploy_config[TLS_CONFIG][INFER_TLS_ITEMS][TLS_KEY])	81	is_valid_path("infer_tls_key", deploy_config[TLS_CONFIG][INFER_TLS_ITEMS][TLS_KEY])
	@@ -103,8 +98,6 @@ def validate_deploy_config(config_dict):
103	is_valid_path("etcd_server_tls_cert", deploy_config[TLS_CONFIG][ETCD_SERVER_TLS_ITEMS][TLS_CERT])	98	is_valid_path("etcd_server_tls_cert", deploy_config[TLS_CONFIG][ETCD_SERVER_TLS_ITEMS][TLS_CERT])
104	is_valid_path("etcd_server_tls_key", deploy_config[TLS_CONFIG][ETCD_SERVER_TLS_ITEMS][TLS_KEY])	99	is_valid_path("etcd_server_tls_key", deploy_config[TLS_CONFIG][ETCD_SERVER_TLS_ITEMS][TLS_KEY])
105	is_valid_path("etcd_server_tls_passwd", deploy_config[TLS_CONFIG][ETCD_SERVER_TLS_ITEMS][TLS_PASSWD])	100	is_valid_path("etcd_server_tls_passwd", deploy_config[TLS_CONFIG][ETCD_SERVER_TLS_ITEMS][TLS_PASSWD])
106	- is_valid_path("etcd_server_kmc_ksf_master", deploy_config[TLS_CONFIG][ETCD_SERVER_TLS_ITEMS][KMC_KSF_MASTER])
107	- is_valid_path("etcd_server_kmc_ksf_standby", deploy_config[TLS_CONFIG][ETCD_SERVER_TLS_ITEMS][KMC_KSF_STANDBY])
108	is_valid_str("etcd_server_tls_crl", deploy_config[TLS_CONFIG][ETCD_SERVER_TLS_ITEMS][TLS_CRL], 0, 128)	101	is_valid_str("etcd_server_tls_crl", deploy_config[TLS_CONFIG][ETCD_SERVER_TLS_ITEMS][TLS_CRL], 0, 128)
109		102
110		103

Mmindie_service/management_service/node_health_management/node_manager/framework/utils/cert_utils.py+2-18

	@@ -147,23 +147,7 @@ class CertUtil:
147	SSL_MUST_KEYS.append(TLS_CRL)	147	SSL_MUST_KEYS.append(TLS_CRL)
148	_check_invalid_ssl_path(config)	148	_check_invalid_ssl_path(config)
149	_check_invalid_ssl_filesize(config)	149	_check_invalid_ssl_filesize(config)
150	- libhse_cryption_so_path = os.path.join(os.getenv("MIES_INSTALL_PATH"), "lib", "libhse_cryption.so")
151	- if not PathCheck.check_path_full(libhse_cryption_so_path):
152	- raise RuntimeError("Failed to check libhse_cryption.so.")
153	- if not PathCheck.check_path_full(config["tls_passwd"]):
154	- raise RuntimeError("Failed to check ccae tls_passwd")
155		150
156	with safe_open(config["tls_passwd"]) as f:	151	with safe_open(config["tls_passwd"]) as f:
157	- cipher_text = f.read().strip()	152	+ return f.read().strip()
158	-	153	+ return None
159	- lib = ctypes.CDLL(libhse_cryption_so_path)
160	- lib.Decrypt.argtypes = [c_char_p, c_char_p, c_char_p, c_char_p]
161	- lib.Decrypt.restype = None
162	-
163	- plain_text = ctypes.create_string_buffer(33)
164	- lib.Decrypt(cipher_text.encode(), plain_text, config["kmcKsfMaster"].encode(),
165	- config["kmcKsfStandby"].encode())
166	- password = plain_text.value.decode()
167	- ctypes.memset(plain_text, 0, len(plain_text))
168	- del plain_text
169	- return password

Mmindie_service/management_service/test/llt/CMakeLists.txt+0-4

	@@ -16,8 +16,6 @@ include_directories(
16	# ${EMOCK_DIR}/include	16	# ${EMOCK_DIR}/include
17	# ${CPPFREEMOCK_DIR}/include	17	# ${CPPFREEMOCK_DIR}/include
18	${CPP_STUB_DIR}/src	18	${CPP_STUB_DIR}/src
19	- #changes
20	- ${MINDIE_MS_SRC_ROOT}/build/open_source/kmc/include
21	)	19	)
22		20
23	add_subdirectory(${GOOGLT_TEST_DIR} gtest)	21	add_subdirectory(${GOOGLT_TEST_DIR} gtest)
	@@ -26,8 +24,6 @@ add_subdirectory(${GOOGLT_TEST_DIR} gtest)
26	link_directories(	24	link_directories(
27	${MINDIE_MS_SRC_ROOT}/build/open_source/securec/lib	25	${MINDIE_MS_SRC_ROOT}/build/open_source/securec/lib
28	${MINDIE_MS_SRC_ROOT}/build/open_source/openssl	26	${MINDIE_MS_SRC_ROOT}/build/open_source/openssl
29	- #changes
30	- ${MINDIE_MS_SRC_ROOT}/build/open_source/kmc/lib
31	)	27	)
32		28
33	if("${BUILDING_STAGE}" STREQUAL "gcov")	29	if("${BUILDING_STAGE}" STREQUAL "gcov")

Mmindie_service/management_service/test/llt/testcase/Helper.cpp+0-6

	@@ -270,17 +270,11 @@ std::string SetMSServerJsonDefault(const std::string& jsonPath)
270	CreateFile(tls_key, "tls_key");	270	CreateFile(tls_key, "tls_key");
271	auto tls_crl = JoinPathComponents({exeDir, "cert_dir", items + "_tls_crl.crl"});	271	auto tls_crl = JoinPathComponents({exeDir, "cert_dir", items + "_tls_crl.crl"});
272	CreateFile(tls_crl, "tls_crl");	272	CreateFile(tls_crl, "tls_crl");
273	- auto kmcKsfMaster = JoinPathComponents({exeDir, "cert_dir", items + "_kmcKsfMaster"});
274	- CreateFile(kmcKsfMaster, "kmcKsfMaster");
275	- auto kmcKsfStandby = JoinPathComponents({exeDir, "cert_dir", items + "_kmcKsfStandby"});
276	- CreateFile(kmcKsfStandby, "kmcKsfStandby");
277	manager.SetList({items, "ca_cert"}, ca_cert);	273	manager.SetList({items, "ca_cert"}, ca_cert);
278	manager.SetList({items, "tls_cert"}, tls_cert);	274	manager.SetList({items, "tls_cert"}, tls_cert);
279	manager.SetList({items, "tls_key"}, tls_key);	275	manager.SetList({items, "tls_key"}, tls_key);
280	manager.SetList({items, "tls_passwd"}, "aaaa");	276	manager.SetList({items, "tls_passwd"}, "aaaa");
281	manager.SetList({items, "tls_crl"}, tls_crl);	277	manager.SetList({items, "tls_crl"}, tls_crl);
282	- manager.SetList({items, "kmcKsfMaster"}, kmcKsfMaster);
283	- manager.SetList({items, "kmcKsfStandby"}, kmcKsfStandby);
284	};	278	};
285		279
286	mode_t oldMask = umask(0277);	280	mode_t oldMask = umask(0277);

Mmindie_service/management_service/test/nodemanager_test/conf/nodemanager_config.json+0-4

	@@ -10,8 +10,6 @@
10	"tls_cert": "./security/node_manager/cert/server_cert/server.pem",	10	"tls_cert": "./security/node_manager/cert/server_cert/server.pem",
11	"tls_key": "./security/node_manager/cert/server_cert/server.key.pem",	11	"tls_key": "./security/node_manager/cert/server_cert/server.key.pem",
12	"tls_passwd": "./security/node_manager/cert/server_cert/server_pwd.txt",	12	"tls_passwd": "./security/node_manager/cert/server_cert/server_pwd.txt",
13	- "kmcKsfMaster": "./security/node_manager/cert/server_cert/tools/pmt/master/ksfa",
14	- "kmcKsfStandby": "./security/node_manager/cert/server_cert/tools/pmt/standby/ksfb",
15	"tls_crl": ""	13	"tls_crl": ""
16	},	14	},
17	"client_tls_enable": false,	15	"client_tls_enable": false,
	@@ -20,8 +18,6 @@
20	"tls_cert": "./security/node_manager/cert/server_cert/server.pem",	18	"tls_cert": "./security/node_manager/cert/server_cert/server.pem",
21	"tls_key": "./security/node_manager/cert/server_cert/server.key.pem",	19	"tls_key": "./security/node_manager/cert/server_cert/server.key.pem",
22	"tls_passwd": "./security/node_manager/cert/server_cert/server_pwd.txt",	20	"tls_passwd": "./security/node_manager/cert/server_cert/server_pwd.txt",
23	- "kmcKsfMaster": "./security/node_manager/cert/server_cert/tools/pmt/master/ksfa",
24	- "kmcKsfStandby": "./security/node_manager/cert/server_cert/tools/pmt/standby/ksfb",
25	"tls_crl": ""	21	"tls_crl": ""
26	}	22	}
27	}	23	}

Mmindie_service/utils/http_client_ctl/CMakeLists.txt+1-3

	@@ -27,12 +27,10 @@ include_directories(
27	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/libboundscheck/include	27	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/libboundscheck/include
28	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/nlohmann-json/include	28	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/nlohmann-json/include
29	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/openssl/include	29	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/openssl/include
30	- ${BUILD_MIES_3RDPARTY_INSTALL_DIR}/hseceasy/include
31	)	30	)
32		31
33	link_directories(	32	link_directories(
34	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/libboundscheck/lib	33	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/libboundscheck/lib
35	- ${BUILD_MIES_3RDPARTY_INSTALL_DIR}/hseceasy/lib
36	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/openssl/lib	34	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/openssl/lib
37	)	35	)
38		36
	@@ -52,7 +50,7 @@ file(GLOB util_http_client_ctl_files
52	)	50	)
53		51
54	add_executable(http_client_ctl ${util_http_client_ctl_files})	52	add_executable(http_client_ctl ${util_http_client_ctl_files})
55	-target_link_libraries(http_client_ctl crypto ssl boundscheck pthread hse_cryption -ldl)	53	+target_link_libraries(http_client_ctl crypto ssl boundscheck pthread -ldl)
56		54
57	install(TARGETS http_client_ctl DESTINATION bin)	55	install(TARGETS http_client_ctl DESTINATION bin)
58	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config/http_client_ctl.json DESTINATION config)	56	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config/http_client_ctl.json DESTINATION config)

Mmindie_service/utils/http_client_ctl/config/http_client_ctl.json+0-2

	@@ -5,8 +5,6 @@
5	"tls_cert": "./security/http_client/certs/cert.pem",	5	"tls_cert": "./security/http_client/certs/cert.pem",
6	"tls_key": "./security/http_client/keys/cert.key.pem",	6	"tls_key": "./security/http_client/keys/cert.key.pem",
7	"tls_passwd": "./security/http_client/pass/key_pwd.txt",	7	"tls_passwd": "./security/http_client/pass/key_pwd.txt",
8	- "kmc_ksf_master": "./tools/pmt/master/ksfa",
9	- "kmc_ksf_standby": "./tools/pmt/standby/ksfb",
10	"tls_crl": ""	8	"tls_crl": ""
11	},	9	},
12	"log_info": {	10	"log_info": {

Mmindie_service/utils/http_client_ctl/log/Logger.cpp+0-29

	@@ -27,10 +27,8 @@
27	#include <securec.h>	27	#include <securec.h>
28	#include <pwd.h>	28	#include <pwd.h>
29	#include "Util.h"	29	#include "Util.h"
30	-#include "hse_cryptor.h"
31	namespace MINDIE {	30	namespace MINDIE {
32	namespace MS {	31	namespace MS {
33	-using namespace ock::hse;
34	constexpr const char* ENV_LEVEL = "MINDIE_LOG_LEVEL";	32	constexpr const char* ENV_LEVEL = "MINDIE_LOG_LEVEL";
35	constexpr const char* ENV_FILE = "MINDIE_LOG_TO_FILE";	33	constexpr const char* ENV_FILE = "MINDIE_LOG_TO_FILE";
36	constexpr const char* ENV_STDOUT = "MINDIE_LOG_TO_STDOUT";	34	constexpr const char* ENV_STDOUT = "MINDIE_LOG_TO_STDOUT";
	@@ -636,28 +634,6 @@ int32_t Logger::InitLogFile(LogType type, const std::string &logPath)
636	return 0;	634	return 0;
637	}	635	}
638		636
639	-static std::vector<LogLevel> g_HseLogToMSLogLevel { LogLevel::MINDIE_LOG_DEBUG,
640	- LogLevel::MINDIE_LOG_DEBUG,
641	- LogLevel::MINDIE_LOG_INFO,
642	- LogLevel::MINDIE_LOG_WARN,
643	- LogLevel::MINDIE_LOG_ERROR };
644	-
645	-static LogLevel SeceasyLogToUlogLevel(uint32_t level)
646	-{
647	- if (level >= g_HseLogToMSLogLevel.size()) {
648	- return LogLevel::MINDIE_LOG_ERROR;
649	- }
650	-
651	- return g_HseLogToMSLogLevel[level];
652	-}
653	-
654	-static void HseSeceasyLog(int level, const char *msg)
655	-{
656	- auto ulogLevel = SeceasyLogToUlogLevel(level);
657	- LOG(LogType::RUN, ulogLevel, msg);
658	-}
659	-
660	-
661	int32_t Logger::Init(DefaultLogConfig defaultLogConfig, const nlohmann::json &logFileConfig, std::string configFilePath)	637	int32_t Logger::Init(DefaultLogConfig defaultLogConfig, const nlohmann::json &logFileConfig, std::string configFilePath)
662	{	638	{
663	std::string logLevel = defaultLogConfig.logLevel;	639	std::string logLevel = defaultLogConfig.logLevel;
	@@ -678,11 +654,6 @@ int32_t Logger::Init(DefaultLogConfig defaultLogConfig, const nlohmann::json &lo
678	GetLogPath(operationLogPath, LogType::OPERATION, option.subModule, logFileConfig, configFilePath)) != 0) {	654	GetLogPath(operationLogPath, LogType::OPERATION, option.subModule, logFileConfig, configFilePath)) != 0) {
679	return -1;	655	return -1;
680	}	656	}
681	- if (HseCryptor::SetExternalLogger(HseSeceasyLog) != 0) {
682	- LOG_E("[%s] [Logger] Failed to register hse log",
683	- GetErrorCode(ErrorType::CALL_ERROR, CommonFeature::LOGGER).c_str());
684	- return -1;
685	- }
686	mIsLogFileReady = true;	657	mIsLogFileReady = true;
687	LOG_I("[Logger] Log initialize success, run log file path is %s, operation log file path is %s.",	658	LOG_I("[Logger] Log initialize success, run log file path is %s, operation log file path is %s.",
688	mLogPath[LogType::RUN].c_str(), mLogPath[LogType::OPERATION].c_str());	659	mLogPath[LogType::RUN].c_str(), mLogPath[LogType::OPERATION].c_str());

Mmindie_service/utils/http_client_ctl/main.cpp+0-4

	@@ -44,8 +44,6 @@ static void AssignParams(nlohmann::json mainObj, ProbeCtlParams &params)
44	params.clientTlsItems.tlsCert = mainObj["cert"]["tls_cert"];	44	params.clientTlsItems.tlsCert = mainObj["cert"]["tls_cert"];
45	params.clientTlsItems.tlsKey = mainObj["cert"]["tls_key"];	45	params.clientTlsItems.tlsKey = mainObj["cert"]["tls_key"];
46	params.clientTlsItems.tlsPasswd = mainObj["cert"]["tls_passwd"];	46	params.clientTlsItems.tlsPasswd = mainObj["cert"]["tls_passwd"];
47	- params.clientTlsItems.kmcKsfMaster = mainObj["cert"]["kmc_ksf_master"];
48	- params.clientTlsItems.kmcKsfStandby = mainObj["cert"]["kmc_ksf_standby"];
49	if (mainObj["cert"].count("tls_crl") > 0) {	47	if (mainObj["cert"].count("tls_crl") > 0) {
50	params.clientTlsItems.tlsCrl = mainObj["cert"]["tls_crl"];	48	params.clientTlsItems.tlsCrl = mainObj["cert"]["tls_crl"];
51	}	49	}
	@@ -61,8 +59,6 @@ static int32_t CheckConfigJsonValid(const nlohmann::json &mainObj)
61	!IsJsonStringValid(mainObj["cert"], "tls_cert") \|\|	59	!IsJsonStringValid(mainObj["cert"], "tls_cert") \|\|
62	!IsJsonStringValid(mainObj["cert"], "tls_key") \|\|	60	!IsJsonStringValid(mainObj["cert"], "tls_key") \|\|
63	!IsJsonStringValid(mainObj["cert"], "tls_passwd") \|\|	61	!IsJsonStringValid(mainObj["cert"], "tls_passwd") \|\|
64	- !IsJsonStringValid(mainObj["cert"], "kmc_ksf_master") \|\|
65	- !IsJsonStringValid(mainObj["cert"], "kmc_ksf_standby") \|\|
66	!IsJsonStringValid(mainObj["cert"], "tls_crl", 0)) {	62	!IsJsonStringValid(mainObj["cert"], "tls_crl", 0)) {
67	return -1;	63	return -1;
68	}	64	}

Mmindie_service/utils/http_client_ctl/params/ConfigParams.cpp+5-83

	@@ -19,7 +19,6 @@
19	#include <arpa/inet.h> // for inet_pton	19	#include <arpa/inet.h> // for inet_pton
20	#include "securec.h"	20	#include "securec.h"
21	#include "Logger.h"	21	#include "Logger.h"
22	-#include "hse_cryptor.h"
23	#include "ConfigParams.h"	22	#include "ConfigParams.h"
24		23
25	namespace MINDIE {	24	namespace MINDIE {
	@@ -37,8 +36,6 @@ static constexpr const char* ALLOWED_URLS[] = {
37	};	36	};
38	static constexpr size_t ALLOWED_URLS_COUNT = sizeof(ALLOWED_URLS) / sizeof(ALLOWED_URLS[0]);	37	static constexpr size_t ALLOWED_URLS_COUNT = sizeof(ALLOWED_URLS) / sizeof(ALLOWED_URLS[0]);
39		38
40	-using namespace ock::hse;
41	-
42	int32_t DumpStringToFile(const std::string &filePath, const std::string &data)	39	int32_t DumpStringToFile(const std::string &filePath, const std::string &data)
43	{	40	{
44	std::ofstream outfile(filePath, std::ios::out);	41	std::ofstream outfile(filePath, std::ios::out);
	@@ -589,34 +586,6 @@ int VerifyCallback(X509_STORE_CTX x509ctx, void arg)
589	return 1;	586	return 1;
590	}	587	}
591		588
592	-static int32_t CheckKMCFiles(std::string &kmcKsfMaster, std::string &kmcKsfStandby, bool checkFiles)
593	-{
594	- bool isFileExist = false;
595	- uint32_t mode = checkFiles ? 0600 : 0777; // KMC文件的权限要求是0600, 不校验是0777
596	- if (!PathCheck(kmcKsfMaster, isFileExist, mode, checkFiles)) { // KMC文件的权限要求是0600
597	- LOG_E("[%s] [ConfigParams] Failed to check the path of KMC master file.",
598	- GetErrorCode(ErrorType::NOT_FOUND, CommonFeature::HTTPCLIENT).c_str());
599	- return -1;
600	- } else if (!isFileExist) {
601	- LOG_E("[%s] [ConfigParams] KMC master file file is not exist.",
602	- GetErrorCode(ErrorType::NOT_FOUND, CommonFeature::HTTPCLIENT).c_str());
603	- return -1;
604	- }
605	-
606	- isFileExist = false;
607	- if (!PathCheck(kmcKsfStandby, isFileExist, mode, checkFiles)) { // KMC文件的权限要求是0600
608	- LOG_E("[%s] [ConfigParams] Failed to check the path of KMC standby file '%s'.",
609	- GetErrorCode(ErrorType::NOT_FOUND, CommonFeature::HTTPCLIENT).c_str(), kmcKsfStandby.c_str());
610	- return -1;
611	- } else if (!isFileExist) {
612	- LOG_E("[%s] [ConfigParams] KMC standby file '%s' does not exist.",
613	- GetErrorCode(ErrorType::NOT_FOUND, CommonFeature::HTTPCLIENT).c_str(), kmcKsfStandby.c_str());
614	- return -1;
615	- }
616	-
617	- return 0;
618	-}
619	-
620	void EraseDecryptedData(std::pair<char *, int32_t> &result)	589	void EraseDecryptedData(std::pair<char *, int32_t> &result)
621	{	590	{
622	if (result.first != nullptr) {	591	if (result.first != nullptr) {
	@@ -629,43 +598,6 @@ void EraseDecryptedData(std::pair<char *, int32_t> &result)
629	result.second = 0;	598	result.second = 0;
630	}	599	}
631		600
632	-bool InitKMC(const TlsItems &tlsConfig)
633	-{
634	- std::string kmcKsfMaster = tlsConfig.kmcKsfMaster;
635	- std::string kmcKsfStandby = tlsConfig.kmcKsfStandby;
636	- if (CheckKMCFiles(kmcKsfMaster, kmcKsfStandby, tlsConfig.checkFiles) != 0) {
637	- return false;
638	- }
639	-
640	- KmcCryptConfigBuilder builder;
641	- auto key = ftok(kmcKsfMaster.c_str(), 0);
642	- if (key < 0) {
643	- LOG_E("[%s] [ConfigParams] Get KMC key failed.",
644	- GetErrorCode(ErrorType::INVALID_INPUT, CommonFeature::HTTPCLIENT).c_str());
645	- return false;
646	- }
647	-
648	- auto config = builder.MasterKsfFile(kmcKsfMaster).StandByKsfFile(kmcKsfStandby)
649	- .SemKey(MIN_VALID_KEY + key % (MAX_VALID_KEY - MIN_VALID_KEY))
650	- .LogLevel(CryptLogLevel::HSE_CRYPT_LOG_INFO).Build();
651	- auto ret = HseCryptor::Initialize(config);
652	- if (ret != 0) {
653	- LOG_E("[%s] [ConfigParams] Cryptor init failed. Result is %d.",
654	- GetErrorCode(ErrorType::INVALID_INPUT, CommonFeature::HTTPCLIENT).c_str(), ret);
655	- return false;
656	- }
657	-
658	- ret = HseCryptor::RefreshMkMask();
659	- if (ret != 0) {
660	- HseCryptor::UnInitialize();
661	- LOG_E("[%s] [ConfigParams] Refresh master key mask failed: %d for file",
662	- GetErrorCode(ErrorType::INVALID_INPUT, CommonFeature::HTTPCLIENT).c_str(),
663	- ret);
664	- return false;
665	- }
666	- return true;
667	-}
668	-
669	bool DecryptPassword(int domainId, std::pair<char *, int32_t> &password, const TlsItems &tlsConfig)	601	bool DecryptPassword(int domainId, std::pair<char *, int32_t> &password, const TlsItems &tlsConfig)
670	{	602	{
671	std::string pwdPath = tlsConfig.tlsPasswd;	603	std::string pwdPath = tlsConfig.tlsPasswd;
	@@ -690,29 +622,19 @@ bool DecryptPassword(int domainId, std::pair<char *, int32_t> &password, const T
690	std::string encryptedText = fileContent.str();	622	std::string encryptedText = fileContent.str();
691	int dataLength = static_cast<int>(encryptedText.length());	623	int dataLength = static_cast<int>(encryptedText.length());
692		624
693	- if (!InitKMC(tlsConfig)) {
694	- return false;
695	- }
696	-
697	auto buffer = new (std::nothrow) char[dataLength]();	625	auto buffer = new (std::nothrow) char[dataLength]();
698	if (buffer == nullptr) {	626	if (buffer == nullptr) {
699	- HseCryptor::UnInitialize();
700	LOG_E("[%s] [ConfigParams] Allocate memory for buffer failed.",	627	LOG_E("[%s] [ConfigParams] Allocate memory for buffer failed.",
701	GetErrorCode(ErrorType::RESOURCE_EXHAUSTED, CommonFeature::HTTPCLIENT).c_str());	628	GetErrorCode(ErrorType::RESOURCE_EXHAUSTED, CommonFeature::HTTPCLIENT).c_str());
702	return false;	629	return false;
703	}	630	}
704	- auto ret = HseCryptor::Decrypt(domainId, encryptedText, buffer, dataLength);	631	+ auto copyRes = memcpy_s(buffer, dataLength, encryptedText.c_str(), dataLength);
705	- if (ret != 0) {	632	+ if (copyRes != 0) {
706	- HseCryptor::UnInitialize();	633	+ LOG_E("[%s] [ConfigParams] password memcpy_s failed.",
707	- LOG_E("[%s] [ConfigParams] Decrypt TLS key password failed. Result %d for file %s.",	634	+ GetErrorCode(ErrorType::RESOURCE_EXHAUSTED, CommonFeature::HTTPCLIENT).c_str());
708	- GetErrorCode(ErrorType::CALL_ERROR, CommonFeature::HTTPCLIENT).c_str(),
709	- ret, pwdPath.c_str());
710	- std::pair<char *, int32_t> tmpResult = std::make_pair(buffer, dataLength);
711	- EraseDecryptedData(tmpResult);
712	return false;	635	return false;
713	}	636	}
714	- HseCryptor::UnInitialize();	637	+ LOG_I("Read password in file %s success.", pwdPath.c_str());
715	- LOG_I("Decrypt password in file %s success.", pwdPath.c_str());
716	password = std::make_pair(buffer, dataLength);	638	password = std::make_pair(buffer, dataLength);
717	return true;	639	return true;
718	}	640	}

Mmindie_service/utils/http_client_ctl/params/ConfigParams.h+0-2

	@@ -44,8 +44,6 @@ struct TlsItems {
44	std::string tlsCert;	44	std::string tlsCert;
45	std::string tlsKey;	45	std::string tlsKey;
46	std::string tlsPasswd;	46	std::string tlsPasswd;
47	- std::string kmcKsfMaster;
48	- std::string kmcKsfStandby;
49	std::string tlsCrl;	47	std::string tlsCrl;
50	};	48	};
51		49

Mtests/benchmark/mockers/conf/config.json+0-4

	@@ -29,8 +29,6 @@
29	"managementTlsPk": "security/keys/management_server.key.pem",	29	"managementTlsPk": "security/keys/management_server.key.pem",
30	"managementTlsPkPwd": "security/pass/management_mindie_server_key_pwd.txt",	30	"managementTlsPkPwd": "security/pass/management_mindie_server_key_pwd.txt",
31	"managementTlsCrl": "security/certs/management_server_crl.pem",	31	"managementTlsCrl": "security/certs/management_server_crl.pem",
32	- "kmcKsfMaster": "tools/pmt/master/ksfa",
33	- "kmcKsfStandby": "tools/pmt/standby/ksfb"
34	},	32	},
35	"BackendConfig": {	33	"BackendConfig": {
36	"backendName": "mindieservice_llm_engine",	34	"backendName": "mindieservice_llm_engine",
	@@ -42,8 +40,6 @@
42	"interNodeTlsCert": "security/certs/server.pem",	40	"interNodeTlsCert": "security/certs/server.pem",
43	"interNodeTlsPk": "security/keys/server.key.pem",	41	"interNodeTlsPk": "security/keys/server.key.pem",
44	"interNodeTlsPkPwd": "security/pass/mindie_server_key_pwd.txt",	42	"interNodeTlsPkPwd": "security/pass/mindie_server_key_pwd.txt",
45	- "interNodeKmcKsfMaster": "tools/pmt/master/ksfa",
46	- "interNodeKmcKsfStandby": "tools/pmt/standby/ksfb",
47	"ModelDeployConfig": {	43	"ModelDeployConfig": {
48	"modelInstanceNumber": 1,	44	"modelInstanceNumber": 1,
49	"maxSeqLen": 2560,	45	"maxSeqLen": 2560,

Mtests/ms/dt/CMakeLists.txt+0-2

Mtests/ms/dt/common/helper/Helper.cpp+0-20

	@@ -468,21 +468,11 @@ std::string SetMSServerJsonDefault(const std::string &jsonPath)
468	CreateFile(tls_crl, "tls_crl");	468	CreateFile(tls_crl, "tls_crl");
469	ChangeCertsFileMode(tls_crl, S_IRUSR);	469	ChangeCertsFileMode(tls_crl, S_IRUSR);
470		470
471	- auto kmcKsfMaster = JoinPathComponents({ exeDir, "cert_dir", items + "_kmcKsfMaster" });
472	- CreateFile(kmcKsfMaster, "kmcKsfMaster");
473	- ChangeCertsFileMode(kmcKsfMaster, S_IRUSR);
474	-
475	- auto kmcKsfStandby = JoinPathComponents({ exeDir, "cert_dir", items + "_kmcKsfStandby" });
476	- CreateFile(kmcKsfStandby, "kmcKsfStandby");
477	- ChangeCertsFileMode(kmcKsfStandby, S_IRUSR);
478	-
479	manager.SetList({ items, "ca_cert" }, ca_cert);	471	manager.SetList({ items, "ca_cert" }, ca_cert);
480	manager.SetList({ items, "tls_cert" }, tls_cert);	472	manager.SetList({ items, "tls_cert" }, tls_cert);
481	manager.SetList({ items, "tls_key" }, tls_key);	473	manager.SetList({ items, "tls_key" }, tls_key);
482	manager.SetList({ items, "tls_passwd" }, "aaaa");	474	manager.SetList({ items, "tls_passwd" }, "aaaa");
483	manager.SetList({ items, "tls_crl" }, tls_crl);	475	manager.SetList({ items, "tls_crl" }, tls_crl);
484	- manager.SetList({ items, "kmcKsfMaster" }, kmcKsfMaster);
485	- manager.SetList({ items, "kmcKsfStandby" }, kmcKsfStandby);
486	};	476	};
487		477
488	mode_t oldMask = umask(0277);	478	mode_t oldMask = umask(0277);
	@@ -613,21 +603,11 @@ std::string SetMSControllerJsonDefault(const std::string &jsonPath)
613	CreateFile(tls_crl, "tls_crl");	603	CreateFile(tls_crl, "tls_crl");
614	ChangeCertsFileMode(tls_crl, S_IRUSR);	604	ChangeCertsFileMode(tls_crl, S_IRUSR);
615		605
616	- auto kmcKsfMaster = JoinPathComponents({ exeDir, "cert_dir", items + "_kmcKsfMaster" });
617	- CreateFile(kmcKsfMaster, "kmcKsfMaster");
618	- ChangeCertsFileMode(kmcKsfMaster, S_IRUSR);
619	-
620	- auto kmcKsfStandby = JoinPathComponents({ exeDir, "cert_dir", items + "_kmcKsfStandby" });
621	- CreateFile(kmcKsfStandby, "kmcKsfStandby");
622	- ChangeCertsFileMode(kmcKsfStandby, S_IRUSR);
623	-
624	manager.SetList({ "tls_config", items, "ca_cert" }, ca_cert);	606	manager.SetList({ "tls_config", items, "ca_cert" }, ca_cert);
625	manager.SetList({ "tls_config", items, "tls_cert" }, tls_cert);	607	manager.SetList({ "tls_config", items, "tls_cert" }, tls_cert);
626	manager.SetList({ "tls_config", items, "tls_key" }, tls_key);	608	manager.SetList({ "tls_config", items, "tls_key" }, tls_key);
627	manager.SetList({ "tls_config", items, "tls_passwd" }, "aaaa");	609	manager.SetList({ "tls_config", items, "tls_passwd" }, "aaaa");
628	manager.SetList({ "tls_config", items, "tls_crl" }, tls_crl);	610	manager.SetList({ "tls_config", items, "tls_crl" }, tls_crl);
629	- manager.SetList({ "tls_config", items, "kmcKsfMaster" }, kmcKsfMaster);
630	- manager.SetList({ "tls_config", items, "kmcKsfStandby" }, kmcKsfStandby);
631	};	611	};
632		612
633	mode_t oldMask = umask(0277);	613	mode_t oldMask = umask(0277);

Mtests/ms/dt/common/mindie_server/MindIEServer.cpp+0-13

	@@ -762,8 +762,6 @@ void CreateSSLServer(const std::string &ip1, const std::string &port1,
762	serverTlsItems.tlsCert = GetAbsolutePath(certDir, "mindie_server_to_coordinator/cert.pem");	762	serverTlsItems.tlsCert = GetAbsolutePath(certDir, "mindie_server_to_coordinator/cert.pem");
763	serverTlsItems.tlsKey = GetAbsolutePath(certDir, "mindie_server_to_coordinator/cert.key.pem");	763	serverTlsItems.tlsKey = GetAbsolutePath(certDir, "mindie_server_to_coordinator/cert.key.pem");
764	serverTlsItems.tlsPasswd = GetAbsolutePath(certDir, "mindie_server_to_coordinator/cert_passwd.txt");	764	serverTlsItems.tlsPasswd = GetAbsolutePath(certDir, "mindie_server_to_coordinator/cert_passwd.txt");
765	- serverTlsItems.kmcKsfMaster = GetAbsolutePath(certDir, "mindie_server_to_coordinator/tools/pmt/master/ksfa");
766	- serverTlsItems.kmcKsfStandby = GetAbsolutePath(certDir, "mindie_server_to_coordinator/tools/pmt/standby/ksfb");
767	HttpServer httpServer1;	765	HttpServer httpServer1;
768	httpServer1.Init(threadNum);	766	httpServer1.Init(threadNum);
769	// 设置回调函数	767	// 设置回调函数
	@@ -821,8 +819,6 @@ void CreateSSLServer(const std::string &ip1, const std::string &port1,
821	parm1.tlsItems.tlsCert = serverTlsItems.tlsCert;	819	parm1.tlsItems.tlsCert = serverTlsItems.tlsCert;
822	parm1.tlsItems.tlsKey = serverTlsItems.tlsKey;	820	parm1.tlsItems.tlsKey = serverTlsItems.tlsKey;
823	parm1.tlsItems.tlsPasswd = serverTlsItems.tlsPasswd;	821	parm1.tlsItems.tlsPasswd = serverTlsItems.tlsPasswd;
824	- parm1.tlsItems.kmcKsfMaster = serverTlsItems.kmcKsfMaster;
825	- parm1.tlsItems.kmcKsfStandby = serverTlsItems.kmcKsfStandby;
826	parm1.tlsItems.tlsCrl = "";	822	parm1.tlsItems.tlsCrl = "";
827		823
828	ServerHandler handler2;	824	ServerHandler handler2;
	@@ -850,8 +846,6 @@ void CreateSSLServer(const std::string &ip1, const std::string &port1,
850	tlsItems.tlsCert = GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/cert.pem");	846	tlsItems.tlsCert = GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/cert.pem");
851	tlsItems.tlsKey = GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/cert.key.pem");	847	tlsItems.tlsKey = GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/cert.key.pem");
852	tlsItems.tlsPasswd = GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/cert_passwd.txt");	848	tlsItems.tlsPasswd = GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/cert_passwd.txt");
853	- tlsItems.kmcKsfMaster = GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/tools/pmt/master/ksfa");
854	- tlsItems.kmcKsfStandby = GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/tools/pmt/standby/ksfb");
855	ServerHandler handler3;	849	ServerHandler handler3;
856	handler3.RegisterFun(boost::beast::http::verb::get,	850	handler3.RegisterFun(boost::beast::http::verb::get,
857	"/metrics",	851	"/metrics",
	@@ -866,8 +860,6 @@ void CreateSSLServer(const std::string &ip1, const std::string &port1,
866	parm3.tlsItems.tlsCert = tlsItems.tlsCert;	860	parm3.tlsItems.tlsCert = tlsItems.tlsCert;
867	parm3.tlsItems.tlsKey = tlsItems.tlsKey;	861	parm3.tlsItems.tlsKey = tlsItems.tlsKey;
868	parm3.tlsItems.tlsPasswd = tlsItems.tlsPasswd;	862	parm3.tlsItems.tlsPasswd = tlsItems.tlsPasswd;
869	- parm3.tlsItems.kmcKsfMaster = tlsItems.kmcKsfMaster;
870	- parm3.tlsItems.kmcKsfStandby = tlsItems.kmcKsfStandby;
871	parm3.tlsItems.tlsCrl = "";	863	parm3.tlsItems.tlsCrl = "";
872		864
873	httpServer1.Run({parm1, parm2, parm3});	865	httpServer1.Run({parm1, parm2, parm3});
	@@ -904,9 +896,6 @@ void CreateMetricsSSLServer(const std::string &ip1, const std::string &port1,
904	serverTlsItems.tlsCert = GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/cert.pem");	896	serverTlsItems.tlsCert = GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/cert.pem");
905	serverTlsItems.tlsKey = GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/cert.key.pem");	897	serverTlsItems.tlsKey = GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/cert.key.pem");
906	serverTlsItems.tlsPasswd = GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/cert_passwd.txt");	898	serverTlsItems.tlsPasswd = GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/cert_passwd.txt");
907	- serverTlsItems.kmcKsfMaster = GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/tools/pmt/master/ksfa");
908	- serverTlsItems.kmcKsfStandby = GetAbsolutePath(
909	- certDir, "mindie_server_manage_to_coordinator/tools/pmt/standby/ksfb");
910	ServerHandler handler2;	899	ServerHandler handler2;
911	handler2.RegisterFun(boost::beast::http::verb::get,	900	handler2.RegisterFun(boost::beast::http::verb::get,
912	"/metrics",	901	"/metrics",
	@@ -921,8 +910,6 @@ void CreateMetricsSSLServer(const std::string &ip1, const std::string &port1,
921	parm2.tlsItems.tlsCert = serverTlsItems.tlsCert;	910	parm2.tlsItems.tlsCert = serverTlsItems.tlsCert;
922	parm2.tlsItems.tlsKey = serverTlsItems.tlsKey;	911	parm2.tlsItems.tlsKey = serverTlsItems.tlsKey;
923	parm2.tlsItems.tlsPasswd = serverTlsItems.tlsPasswd;	912	parm2.tlsItems.tlsPasswd = serverTlsItems.tlsPasswd;
924	- parm2.tlsItems.kmcKsfMaster = serverTlsItems.kmcKsfMaster;
925	- parm2.tlsItems.kmcKsfStandby = serverTlsItems.kmcKsfStandby;
926	parm2.tlsItems.tlsCrl = "";	913	parm2.tlsItems.tlsCrl = "";
927	httpServer1.Run({parm1, parm2});	914	httpServer1.Run({parm1, parm2});
928	}	915	}

Mtests/ms/dt/coordinator/CMakeLists.txt+1-1

	@@ -85,7 +85,7 @@ set(_PROTOBUF_LIBPROTOBUF protobuf::libprotobuf)
85	set(_REFLECTION gRPC::grpc++_reflection)	85	set(_REFLECTION gRPC::grpc++_reflection)
86	set(_GRPC_GRPCPP gRPC::grpc++)	86	set(_GRPC_GRPCPP gRPC::grpc++)
87	add_library(test_coordinator SHARED ${COORDINATOR_SOURCE_DIR} ${COMMON_SOURCE_DIR})	87	add_library(test_coordinator SHARED ${COORDINATOR_SOURCE_DIR} ${COMMON_SOURCE_DIR})
88	-target_link_libraries(test_coordinator crypto ssl boundscheck pthread hse_cryption -ldl ${_REFLECTION} ${_GRPC_GRPCPP} ${_PROTOBUF_LIBPROTOBUF})	88	+target_link_libraries(test_coordinator crypto ssl boundscheck pthread -ldl ${_REFLECTION} ${_GRPC_GRPCPP} ${_PROTOBUF_LIBPROTOBUF})
89		89
90	set(COORDINATOR_TEST_DIR ${MINDIE_MS_TEST_ROOT}/dt/coordinator)	90	set(COORDINATOR_TEST_DIR ${MINDIE_MS_TEST_ROOT}/dt/coordinator)
91	file(GLOB_RECURSE COORDINATOR_TEST_SOURCE "${COORDINATOR_TEST_DIR}/.cpp" "${COORDINATOR_TEST_DIR}/.c" "${COORDINATOR_TEST_DIR}/*.cxx")	91	file(GLOB_RECURSE COORDINATOR_TEST_SOURCE "${COORDINATOR_TEST_DIR}/.cpp" "${COORDINATOR_TEST_DIR}/.c" "${COORDINATOR_TEST_DIR}/*.cxx")

Mtests/ms/dt/coordinator/config_test/TestCoordinatorConfig.cpp+0-18

	@@ -559,12 +559,6 @@ INSTANTIATE_TEST_SUITE_P(
559	ParamType{"mod", {"tls_config", "controller_server_tls_items", "tls_passwd"}, 123}, // 类型错误	559	ParamType{"mod", {"tls_config", "controller_server_tls_items", "tls_passwd"}, 123}, // 类型错误
560	ParamType{"del", {"tls_config", "controller_server_tls_items", "tls_passwd"}, 123}, // 删除tls_passwd	560	ParamType{"del", {"tls_config", "controller_server_tls_items", "tls_passwd"}, 123}, // 删除tls_passwd
561		561
562	- ParamType{"mod", {"tls_config", "controller_server_tls_items", "kmcKsfMaster"}, 123}, // 类型错误
563	- ParamType{"del", {"tls_config", "controller_server_tls_items", "kmcKsfMaster"}, 123}, // 删除kmcKsfMaster
564	-
565	- ParamType{"mod", {"tls_config", "controller_server_tls_items", "kmcKsfStandby"}, 123}, // 类型错误
566	- ParamType{"del", {"tls_config", "controller_server_tls_items", "kmcKsfStandby"}, 123}, // 删除kmcKsfMaster
567	-
568	ParamType{"mod", {"tls_config", "controller_server_tls_items", "tls_crl"}, 123}, // 类型错误	562	ParamType{"mod", {"tls_config", "controller_server_tls_items", "tls_crl"}, 123}, // 类型错误
569	ParamType{"del", {"tls_config", "controller_server_tls_items", "tls_crl"}, 123}, // 删除kmcKsfMaster	563	ParamType{"del", {"tls_config", "controller_server_tls_items", "tls_crl"}, 123}, // 删除kmcKsfMaster
570		564
	@@ -586,12 +580,6 @@ INSTANTIATE_TEST_SUITE_P(
586	ParamType{"mod", {"tls_config", "request_server_tls_items", "tls_passwd"}, 123}, // 类型错误	580	ParamType{"mod", {"tls_config", "request_server_tls_items", "tls_passwd"}, 123}, // 类型错误
587	ParamType{"del", {"tls_config", "request_server_tls_items", "tls_passwd"}, 123}, // 删除tls_passwd	581	ParamType{"del", {"tls_config", "request_server_tls_items", "tls_passwd"}, 123}, // 删除tls_passwd
588		582
589	- ParamType{"mod", {"tls_config", "request_server_tls_items", "kmcKsfMaster"}, 123}, // 类型错误
590	- ParamType{"del", {"tls_config", "request_server_tls_items", "kmcKsfMaster"}, 123}, // 删除kmcKsfMaster
591	-
592	- ParamType{"mod", {"tls_config", "request_server_tls_items", "kmcKsfStandby"}, 123}, // 类型错误
593	- ParamType{"del", {"tls_config", "request_server_tls_items", "kmcKsfStandby"}, 123}, // 删除kmcKsfMaster
594	-
595	ParamType{"mod", {"tls_config", "request_server_tls_items", "tls_crl"}, 123}, // 类型错误	583	ParamType{"mod", {"tls_config", "request_server_tls_items", "tls_crl"}, 123}, // 类型错误
596	ParamType{"del", {"tls_config", "request_server_tls_items", "tls_crl"}, 123}, // 删除kmcKsfMaster	584	ParamType{"del", {"tls_config", "request_server_tls_items", "tls_crl"}, 123}, // 删除kmcKsfMaster
597		585
	@@ -613,12 +601,6 @@ INSTANTIATE_TEST_SUITE_P(
613	ParamType{"mod", {"tls_config", "mindie_client_tls_items", "tls_passwd"}, 123}, // 类型错误	601	ParamType{"mod", {"tls_config", "mindie_client_tls_items", "tls_passwd"}, 123}, // 类型错误
614	ParamType{"del", {"tls_config", "mindie_client_tls_items", "tls_passwd"}, 123}, // 删除tls_passwd	602	ParamType{"del", {"tls_config", "mindie_client_tls_items", "tls_passwd"}, 123}, // 删除tls_passwd
615		603
616	- ParamType{"mod", {"tls_config", "mindie_client_tls_items", "kmcKsfMaster"}, 123}, // 类型错误
617	- ParamType{"del", {"tls_config", "mindie_client_tls_items", "kmcKsfMaster"}, 123}, // 删除kmcKsfMaster
618	-
619	- ParamType{"mod", {"tls_config", "mindie_client_tls_items", "kmcKsfStandby"}, 123}, // 类型错误
620	- ParamType{"del", {"tls_config", "mindie_client_tls_items", "kmcKsfStandby"}, 123}, // 删除kmcKsfMaster
621	-
622	ParamType{"mod", {"tls_config", "mindie_client_tls_items", "tls_crl"}, 123}, // 类型错误	604	ParamType{"mod", {"tls_config", "mindie_client_tls_items", "tls_crl"}, 123}, // 类型错误
623	ParamType{"del", {"tls_config", "mindie_client_tls_items", "tls_crl"}, 123}, // 删除kmcKsfMaster	605	ParamType{"del", {"tls_config", "mindie_client_tls_items", "tls_crl"}, 123}, // 删除kmcKsfMaster
624		606

Mtests/ms/dt/coordinator/request_test/TestMetricsPDSeparate.cpp+1-27

	@@ -71,10 +71,6 @@ protected:
71	GetAbsolutePath(certDir, "coordinator_manage_to_user/cert.key.pem"));	71	GetAbsolutePath(certDir, "coordinator_manage_to_user/cert.key.pem"));
72	manager.SetList({"tls_config", "controller_server_tls_items", "tls_passwd"},	72	manager.SetList({"tls_config", "controller_server_tls_items", "tls_passwd"},
73	GetAbsolutePath(certDir, "coordinator_manage_to_user/cert_passwd.txt"));	73	GetAbsolutePath(certDir, "coordinator_manage_to_user/cert_passwd.txt"));
74	- manager.SetList({"tls_config", "controller_server_tls_items", "kmcKsfMaster"},
75	- GetAbsolutePath(certDir, "coordinator_manage_to_user/tools/pmt/master/ksfa"));
76	- manager.SetList({"tls_config", "controller_server_tls_items", "kmcKsfStandby"},
77	- GetAbsolutePath(certDir, "coordinator_manage_to_user/tools/pmt/standby/ksfb"));
78		74
79	manager.SetList({"tls_config", "request_server_tls_enable"}, false);	75	manager.SetList({"tls_config", "request_server_tls_enable"}, false);
80		76
	@@ -90,11 +86,7 @@ protected:
90	manager.SetList({"tls_config", "mindie_mangment_tls_items", "tls_key"},	86	manager.SetList({"tls_config", "mindie_mangment_tls_items", "tls_key"},
91	GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/cert.key.pem"));	87	GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/cert.key.pem"));
92	manager.SetList({"tls_config", "mindie_mangment_tls_items", "tls_passwd"},	88	manager.SetList({"tls_config", "mindie_mangment_tls_items", "tls_passwd"},
93	- GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/cert_passwd.txt"));	89	+ GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/cert_passwd.txt"));\
94	- manager.SetList({"tls_config", "mindie_mangment_tls_items", "kmcKsfMaster"},
95	- GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/tools/pmt/master/ksfa"));
96	- manager.SetList({"tls_config", "mindie_mangment_tls_items", "kmcKsfStandby"},
97	- GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/tools/pmt/standby/ksfb"));
98	manager.Save();	90	manager.Save();
99	for (auto i = 0; i < numMindIEServer; i++) {	91	for (auto i = 0; i < numMindIEServer; i++) {
100	predictIPList.emplace_back("127.0.0.1");	92	predictIPList.emplace_back("127.0.0.1");
	@@ -105,37 +97,21 @@ protected:
105	ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator_manage/cert.pem"), S_IRUSR);	97	ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator_manage/cert.pem"), S_IRUSR);
106	ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator_manage/cert.key.pem"), S_IRUSR);	98	ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator_manage/cert.key.pem"), S_IRUSR);
107	ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator_manage/cert_passwd.txt"), S_IRUSR);	99	ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator_manage/cert_passwd.txt"), S_IRUSR);
108	- ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator_manage/tools/pmt/master/ksfa"),
109	- S_IRUSR \| S_IWUSR);
110	- ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator_manage/tools/pmt/standby/ksfb"),
111	- S_IRUSR \| S_IWUSR);
112		100
113	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_manage_to_user/ca.pem"), S_IRUSR);	101	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_manage_to_user/ca.pem"), S_IRUSR);
114	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_manage_to_user/cert.pem"), S_IRUSR);	102	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_manage_to_user/cert.pem"), S_IRUSR);
115	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_manage_to_user/cert.key.pem"), S_IRUSR);	103	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_manage_to_user/cert.key.pem"), S_IRUSR);
116	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_manage_to_user/cert_passwd.txt"), S_IRUSR);	104	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_manage_to_user/cert_passwd.txt"), S_IRUSR);
117	- ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_manage_to_user/tools/pmt/master/ksfa"),
118	- S_IRUSR \| S_IWUSR);
119	- ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_manage_to_user/tools/pmt/standby/ksfb"),
120	- S_IRUSR \| S_IWUSR);
121		105
122	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/ca.pem"), S_IRUSR);	106	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/ca.pem"), S_IRUSR);
123	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/cert.pem"), S_IRUSR);	107	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/cert.pem"), S_IRUSR);
124	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/cert.key.pem"), S_IRUSR);	108	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/cert.key.pem"), S_IRUSR);
125	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/cert_passwd.txt"), S_IRUSR);	109	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/cert_passwd.txt"), S_IRUSR);
126	- ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/tools/pmt/master/ksfa"),
127	- S_IRUSR \| S_IWUSR);
128	- ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/tools/pmt/standby/ksfb"),
129	- S_IRUSR \| S_IWUSR);
130		110
131	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/ca.pem"), S_IRUSR);	111	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/ca.pem"), S_IRUSR);
132	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/cert.pem"), S_IRUSR);	112	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/cert.pem"), S_IRUSR);
133	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/cert.key.pem"), S_IRUSR);	113	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/cert.key.pem"), S_IRUSR);
134	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/cert_passwd.txt"), S_IRUSR);	114	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/cert_passwd.txt"), S_IRUSR);
135	- ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/tools/pmt/master/ksfa"),
136	- S_IRUSR \| S_IWUSR);
137	- ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/tools/pmt/standby/ksfb"),
138	- S_IRUSR \| S_IWUSR);
139	}	115	}
140		116
141	void TearDown()	117	void TearDown()
	@@ -323,8 +299,6 @@ TEST_F(TestMetricsPDSeparate, TestPDSeparateMetricsTC02)
323	tlsItems.tlsCert = GetAbsolutePath(certDir, "user_to_coordinator_manage/cert.pem");	299	tlsItems.tlsCert = GetAbsolutePath(certDir, "user_to_coordinator_manage/cert.pem");
324	tlsItems.tlsKey = GetAbsolutePath(certDir, "user_to_coordinator_manage/cert.key.pem");	300	tlsItems.tlsKey = GetAbsolutePath(certDir, "user_to_coordinator_manage/cert.key.pem");
325	tlsItems.tlsPasswd = GetAbsolutePath(certDir, "user_to_coordinator_manage/cert_passwd.txt");	301	tlsItems.tlsPasswd = GetAbsolutePath(certDir, "user_to_coordinator_manage/cert_passwd.txt");
326	- tlsItems.kmcKsfMaster = GetAbsolutePath(certDir, "user_to_coordinator_manage/tools/pmt/master/ksfa");
327	- tlsItems.kmcKsfStandby = GetAbsolutePath(certDir, "user_to_coordinator_manage/tools/pmt/standby/ksfb");
328		302
329	auto lambdaFunc = [this, tlsItems, instancesInfo]() -> bool {	303	auto lambdaFunc = [this, tlsItems, instancesInfo]() -> bool {
330	std::string response;	304	std::string response;

Mtests/ms/dt/coordinator/request_test/TestSSLRequest.cpp+0-22

	@@ -64,10 +64,6 @@ protected:
64	GetAbsolutePath(certDir, "coordinator_to_user/cert.key.pem"));	64	GetAbsolutePath(certDir, "coordinator_to_user/cert.key.pem"));
65	manager.SetList({"tls_config", "request_server_tls_items", "tls_passwd"},	65	manager.SetList({"tls_config", "request_server_tls_items", "tls_passwd"},
66	GetAbsolutePath(certDir, "coordinator_to_user/cert_passwd.txt"));	66	GetAbsolutePath(certDir, "coordinator_to_user/cert_passwd.txt"));
67	- manager.SetList({"tls_config", "request_server_tls_items", "kmcKsfMaster"},
68	- GetAbsolutePath(certDir, "coordinator_to_user/tools/pmt/master/ksfa"));
69	- manager.SetList({"tls_config", "request_server_tls_items", "kmcKsfStandby"},
70	- GetAbsolutePath(certDir, "coordinator_to_user/tools/pmt/standby/ksfb"));
71		67
72	manager.SetList({"tls_config", "mindie_client_tls_enable"}, true);	68	manager.SetList({"tls_config", "mindie_client_tls_enable"}, true);
73	manager.SetList({"tls_config", "mindie_client_tls_items", "ca_cert"},	69	manager.SetList({"tls_config", "mindie_client_tls_items", "ca_cert"},
	@@ -78,10 +74,6 @@ protected:
78	GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert.key.pem"));	74	GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert.key.pem"));
79	manager.SetList({"tls_config", "mindie_client_tls_items", "tls_passwd"},	75	manager.SetList({"tls_config", "mindie_client_tls_items", "tls_passwd"},
80	GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert_passwd.txt"));	76	GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert_passwd.txt"));
81	- manager.SetList({"tls_config", "mindie_client_tls_items", "kmcKsfMaster"},
82	- GetAbsolutePath(certDir, "coordinator_to_mindie_server/tools/pmt/master/ksfa"));
83	- manager.SetList({"tls_config", "mindie_client_tls_items", "kmcKsfStandby"},
84	- GetAbsolutePath(certDir, "coordinator_to_mindie_server/tools/pmt/standby/ksfb"));
85		77
86	manager.Save();	78	manager.Save();
87		79
	@@ -90,33 +82,21 @@ protected:
90	ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator/cert.pem"), S_IRUSR);	82	ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator/cert.pem"), S_IRUSR);
91	ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator/cert.key.pem"), S_IRUSR);	83	ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator/cert.key.pem"), S_IRUSR);
92	ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator/cert_passwd.txt"), S_IRUSR);	84	ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator/cert_passwd.txt"), S_IRUSR);
93	- ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator/tools/pmt/master/ksfa"), S_IRUSR \| S_IWUSR);
94	- ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator/tools/pmt/standby/ksfb"), S_IRUSR \| S_IWUSR);
95		85
96	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/ca.pem"), S_IRUSR);	86	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/ca.pem"), S_IRUSR);
97	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/cert.pem"), S_IRUSR);	87	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/cert.pem"), S_IRUSR);
98	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/cert.key.pem"), S_IRUSR);	88	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/cert.key.pem"), S_IRUSR);
99	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/cert_passwd.txt"), S_IRUSR);	89	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/cert_passwd.txt"), S_IRUSR);
100	- ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/tools/pmt/master/ksfa"), S_IRUSR \| S_IWUSR);
101	- ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/tools/pmt/standby/ksfb"), S_IRUSR \| S_IWUSR);
102		90
103	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/ca.pem"), S_IRUSR);	91	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/ca.pem"), S_IRUSR);
104	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert.pem"), S_IRUSR);	92	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert.pem"), S_IRUSR);
105	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert.key.pem"), S_IRUSR);	93	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert.key.pem"), S_IRUSR);
106	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert_passwd.txt"), S_IRUSR);	94	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert_passwd.txt"), S_IRUSR);
107	- ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/tools/pmt/master/ksfa"),
108	- S_IRUSR \| S_IWUSR);
109	- ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/tools/pmt/standby/ksfb"),
110	- S_IRUSR \| S_IWUSR);
111		95
112	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/ca.pem"), S_IRUSR);	96	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/ca.pem"), S_IRUSR);
113	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/cert.pem"), S_IRUSR);	97	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/cert.pem"), S_IRUSR);
114	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/cert.key.pem"), S_IRUSR);	98	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/cert.key.pem"), S_IRUSR);
115	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/cert_passwd.txt"), S_IRUSR);	99	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/cert_passwd.txt"), S_IRUSR);
116	- ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/tools/pmt/master/ksfa"),
117	- S_IRUSR \| S_IWUSR);
118	- ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/tools/pmt/standby/ksfb"),
119	- S_IRUSR \| S_IWUSR);
120	}	100	}
121	uint8_t numMindIEServer = 4;	101	uint8_t numMindIEServer = 4;
122	ThreadSafeVector<std::string> predictPortList;	102	ThreadSafeVector<std::string> predictPortList;
	@@ -197,8 +177,6 @@ TEST_F(TestSSLRequest, TestSSLRequestTC01)
197	tlsItems.tlsCert = GetAbsolutePath(certDir, "user_to_coordinator/cert.pem");	177	tlsItems.tlsCert = GetAbsolutePath(certDir, "user_to_coordinator/cert.pem");
198	tlsItems.tlsKey = GetAbsolutePath(certDir, "user_to_coordinator/cert.key.pem");	178	tlsItems.tlsKey = GetAbsolutePath(certDir, "user_to_coordinator/cert.key.pem");
199	tlsItems.tlsPasswd = GetAbsolutePath(certDir, "user_to_coordinator/cert_passwd.txt");	179	tlsItems.tlsPasswd = GetAbsolutePath(certDir, "user_to_coordinator/cert_passwd.txt");
200	- tlsItems.kmcKsfMaster = GetAbsolutePath(certDir, "user_to_coordinator/tools/pmt/master/ksfa");
201	- tlsItems.kmcKsfStandby = GetAbsolutePath(certDir, "user_to_coordinator/tools/pmt/standby/ksfb");
202		180
203	std::string response;	181	std::string response;
204	auto pdInstance = SetPDRole(predictIPList, predictPortList, managePortList,	182	auto pdInstance = SetPDRole(predictIPList, predictPortList, managePortList,

Mtests/ms/dt/coordinator/stress_test/StressTestPD.cpp+0-36

	@@ -36,73 +36,41 @@ class StressTestPD : public testing::Test {
36	ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator/cert.pem"), S_IRUSR);	36	ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator/cert.pem"), S_IRUSR);
37	ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator/cert.key.pem"), S_IRUSR);	37	ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator/cert.key.pem"), S_IRUSR);
38	ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator/cert_passwd.txt"), S_IRUSR);	38	ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator/cert_passwd.txt"), S_IRUSR);
39	- ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator/tools/pmt/master/ksfa"),
40	- S_IRUSR \| S_IWUSR);
41	- ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator/tools/pmt/standby/ksfb"),
42	- S_IRUSR \| S_IWUSR);
43		39
44	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/ca.pem"), S_IRUSR);	40	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/ca.pem"), S_IRUSR);
45	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/cert.pem"), S_IRUSR);	41	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/cert.pem"), S_IRUSR);
46	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/cert.key.pem"), S_IRUSR);	42	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/cert.key.pem"), S_IRUSR);
47	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/cert_passwd.txt"), S_IRUSR);	43	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/cert_passwd.txt"), S_IRUSR);
48	- ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/tools/pmt/master/ksfa"),
49	- S_IRUSR \| S_IWUSR);
50	- ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/tools/pmt/standby/ksfb"),
51	- S_IRUSR \| S_IWUSR);
52		44
53	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/ca.pem"), S_IRUSR);	45	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/ca.pem"), S_IRUSR);
54	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert.pem"), S_IRUSR);	46	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert.pem"), S_IRUSR);
55	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert.key.pem"), S_IRUSR);	47	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert.key.pem"), S_IRUSR);
56	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert_passwd.txt"), S_IRUSR);	48	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert_passwd.txt"), S_IRUSR);
57	- ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/tools/pmt/master/ksfa"),
58	- S_IRUSR \| S_IWUSR);
59	- ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/tools/pmt/standby/ksfb"),
60	- S_IRUSR \| S_IWUSR);
61		49
62	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/ca.pem"), S_IRUSR);	50	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/ca.pem"), S_IRUSR);
63	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/cert.pem"), S_IRUSR);	51	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/cert.pem"), S_IRUSR);
64	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/cert.key.pem"), S_IRUSR);	52	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/cert.key.pem"), S_IRUSR);
65	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/cert_passwd.txt"), S_IRUSR);	53	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/cert_passwd.txt"), S_IRUSR);
66	- ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/tools/pmt/master/ksfa"),
67	- S_IRUSR \| S_IWUSR);
68	- ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/tools/pmt/standby/ksfb"),
69	- S_IRUSR \| S_IWUSR);
70		54
71	ChangeCertsFileMode(GetAbsolutePath(certDir, "controller_to_coordinator/ca.pem"), S_IRUSR);	55	ChangeCertsFileMode(GetAbsolutePath(certDir, "controller_to_coordinator/ca.pem"), S_IRUSR);
72	ChangeCertsFileMode(GetAbsolutePath(certDir, "controller_to_coordinator/cert.pem"), S_IRUSR);	56	ChangeCertsFileMode(GetAbsolutePath(certDir, "controller_to_coordinator/cert.pem"), S_IRUSR);
73	ChangeCertsFileMode(GetAbsolutePath(certDir, "controller_to_coordinator/cert.key.pem"), S_IRUSR);	57	ChangeCertsFileMode(GetAbsolutePath(certDir, "controller_to_coordinator/cert.key.pem"), S_IRUSR);
74	ChangeCertsFileMode(GetAbsolutePath(certDir, "controller_to_coordinator/cert_passwd.txt"), S_IRUSR);	58	ChangeCertsFileMode(GetAbsolutePath(certDir, "controller_to_coordinator/cert_passwd.txt"), S_IRUSR);
75	- ChangeCertsFileMode(GetAbsolutePath(certDir, "controller_to_coordinator/tools/pmt/master/ksfa"),
76	- S_IRUSR \| S_IWUSR);
77	- ChangeCertsFileMode(GetAbsolutePath(certDir, "controller_to_coordinator/tools/pmt/standby/ksfb"),
78	- S_IRUSR \| S_IWUSR);
79		59
80	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_controller/ca.pem"), S_IRUSR);	60	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_controller/ca.pem"), S_IRUSR);
81	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_controller/cert.pem"), S_IRUSR);	61	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_controller/cert.pem"), S_IRUSR);
82	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_controller/cert.key.pem"), S_IRUSR);	62	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_controller/cert.key.pem"), S_IRUSR);
83	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_controller/cert_passwd.txt"), S_IRUSR);	63	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_controller/cert_passwd.txt"), S_IRUSR);
84	- ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_controller/tools/pmt/master/ksfa"),
85	- S_IRUSR \| S_IWUSR);
86	- ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_controller/tools/pmt/standby/ksfb"),
87	- S_IRUSR \| S_IWUSR);
88		64
89	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/ca.pem"), S_IRUSR);	65	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/ca.pem"), S_IRUSR);
90	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/cert.pem"), S_IRUSR);	66	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/cert.pem"), S_IRUSR);
91	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/cert.key.pem"), S_IRUSR);	67	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/cert.key.pem"), S_IRUSR);
92	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/cert_passwd.txt"), S_IRUSR);	68	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/cert_passwd.txt"), S_IRUSR);
93	- ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/tools/pmt/master/ksfa"),
94	- S_IRUSR \| S_IWUSR);
95	- ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/tools/pmt/standby/ksfb"),
96	- S_IRUSR \| S_IWUSR);
97		69
98	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/ca.pem"), S_IRUSR);	70	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/ca.pem"), S_IRUSR);
99	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/cert.pem"), S_IRUSR);	71	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/cert.pem"), S_IRUSR);
100	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/cert.key.pem"), S_IRUSR);	72	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/cert.key.pem"), S_IRUSR);
101	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/cert_passwd.txt"), S_IRUSR);	73	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/cert_passwd.txt"), S_IRUSR);
102	- ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/tools/pmt/master/ksfa"),
103	- S_IRUSR \| S_IWUSR);
104	- ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_manage_to_coordinator/tools/pmt/standby/ksfb"),
105	- S_IRUSR \| S_IWUSR);
106	}	74	}
107	};	75	};
108		76
	@@ -228,8 +196,6 @@ static void OpenAIStaticTLS(const std::string &predictIP, const std::string &pre
228	tlsItems.tlsCert = GetAbsolutePath(certDir, "user_to_coordinator/cert.pem");	196	tlsItems.tlsCert = GetAbsolutePath(certDir, "user_to_coordinator/cert.pem");
229	tlsItems.tlsKey = GetAbsolutePath(certDir, "user_to_coordinator/cert.key.pem");	197	tlsItems.tlsKey = GetAbsolutePath(certDir, "user_to_coordinator/cert.key.pem");
230	tlsItems.tlsPasswd = GetAbsolutePath(certDir, "user_to_coordinator/cert_passwd.txt");	198	tlsItems.tlsPasswd = GetAbsolutePath(certDir, "user_to_coordinator/cert_passwd.txt");
231	- tlsItems.kmcKsfMaster = GetAbsolutePath(certDir, "user_to_coordinator/tools/pmt/master/ksfa");
232	- tlsItems.kmcKsfStandby = GetAbsolutePath(certDir, "user_to_coordinator/tools/pmt/standby/ksfb");
233	// OpenAI流式	199	// OpenAI流式
234	std::string inferString = CreateOpenAIRequest({"My name is Olivier and I", "OK"}, true);	200	std::string inferString = CreateOpenAIRequest({"My name is Olivier and I", "OK"}, true);
235	std::string outputString = "My name is Olivier and IOK";	201	std::string outputString = "My name is Olivier and IOK";
	@@ -258,8 +224,6 @@ static void MetricsSSLRequest(const std::string &manageIP, const std::string &ma
258	tlsItems.tlsCert = GetAbsolutePath(certDir, "coordinator_to_controller/cert.pem");	224	tlsItems.tlsCert = GetAbsolutePath(certDir, "coordinator_to_controller/cert.pem");
259	tlsItems.tlsKey = GetAbsolutePath(certDir, "coordinator_to_controller/cert.key.pem");	225	tlsItems.tlsKey = GetAbsolutePath(certDir, "coordinator_to_controller/cert.key.pem");
260	tlsItems.tlsPasswd = GetAbsolutePath(certDir, "coordinator_to_controller/cert_passwd.txt");	226	tlsItems.tlsPasswd = GetAbsolutePath(certDir, "coordinator_to_controller/cert_passwd.txt");
261	- tlsItems.kmcKsfMaster = GetAbsolutePath(certDir, "coordinator_to_controller/tools/pmt/master/ksfa");
262	- tlsItems.kmcKsfStandby = GetAbsolutePath(certDir, "coordinator_to_controller/tools/pmt/standby/ksfb");
263	// 发送指标查询请求，默认超时时间60，最大重复请求次数3	227	// 发送指标查询请求，默认超时时间60，最大重复请求次数3
264	auto ret = GetMetricsRequest(manageIP, managePort, tlsItems, "/metrics", response, true);	228	auto ret = GetMetricsRequest(manageIP, managePort, tlsItems, "/metrics", response, true);
265	EXPECT_EQ(ret, 200); // 返回值 200	229	EXPECT_EQ(ret, 200); // 返回值 200

Mtests/ms/dt/coordinator/stress_test/StressTestSingleNode.cpp+0-24

	@@ -34,55 +34,31 @@ class StressTestSingleNode : public testing::Test {
34	ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator/cert.pem"), S_IRUSR);	34	ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator/cert.pem"), S_IRUSR);
35	ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator/cert.key.pem"), S_IRUSR);	35	ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator/cert.key.pem"), S_IRUSR);
36	ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator/cert_passwd.txt"), S_IRUSR);	36	ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator/cert_passwd.txt"), S_IRUSR);
37	- ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator/tools/pmt/master/ksfa"),
38	- S_IRUSR \| S_IWUSR);
39	- ChangeCertsFileMode(GetAbsolutePath(certDir, "user_to_coordinator/tools/pmt/standby/ksfb"),
40	- S_IRUSR \| S_IWUSR);
41		37
42	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/ca.pem"), S_IRUSR);	38	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/ca.pem"), S_IRUSR);
43	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/cert.pem"), S_IRUSR);	39	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/cert.pem"), S_IRUSR);
44	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/cert.key.pem"), S_IRUSR);	40	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/cert.key.pem"), S_IRUSR);
45	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/cert_passwd.txt"), S_IRUSR);	41	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/cert_passwd.txt"), S_IRUSR);
46	- ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/tools/pmt/master/ksfa"),
47	- S_IRUSR \| S_IWUSR);
48	- ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_user/tools/pmt/standby/ksfb"),
49	- S_IRUSR \| S_IWUSR);
50		42
51	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/ca.pem"), S_IRUSR);	43	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/ca.pem"), S_IRUSR);
52	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert.pem"), S_IRUSR);	44	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert.pem"), S_IRUSR);
53	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert.key.pem"), S_IRUSR);	45	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert.key.pem"), S_IRUSR);
54	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert_passwd.txt"), S_IRUSR);	46	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert_passwd.txt"), S_IRUSR);
55	- ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/tools/pmt/master/ksfa"),
56	- S_IRUSR \| S_IWUSR);
57	- ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_mindie_server/tools/pmt/standby/ksfb"),
58	- S_IRUSR \| S_IWUSR);
59		47
60	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/ca.pem"), S_IRUSR);	48	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/ca.pem"), S_IRUSR);
61	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/cert.pem"), S_IRUSR);	49	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/cert.pem"), S_IRUSR);
62	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/cert.key.pem"), S_IRUSR);	50	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/cert.key.pem"), S_IRUSR);
63	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/cert_passwd.txt"), S_IRUSR);	51	ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/cert_passwd.txt"), S_IRUSR);
64	- ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/tools/pmt/master/ksfa"),
65	- S_IRUSR \| S_IWUSR);
66	- ChangeCertsFileMode(GetAbsolutePath(certDir, "mindie_server_to_coordinator/tools/pmt/standby/ksfb"),
67	- S_IRUSR \| S_IWUSR);
68		52
69	ChangeCertsFileMode(GetAbsolutePath(certDir, "controller_to_coordinator/ca.pem"), S_IRUSR);	53	ChangeCertsFileMode(GetAbsolutePath(certDir, "controller_to_coordinator/ca.pem"), S_IRUSR);
70	ChangeCertsFileMode(GetAbsolutePath(certDir, "controller_to_coordinator/cert.pem"), S_IRUSR);	54	ChangeCertsFileMode(GetAbsolutePath(certDir, "controller_to_coordinator/cert.pem"), S_IRUSR);
71	ChangeCertsFileMode(GetAbsolutePath(certDir, "controller_to_coordinator/cert.key.pem"), S_IRUSR);	55	ChangeCertsFileMode(GetAbsolutePath(certDir, "controller_to_coordinator/cert.key.pem"), S_IRUSR);
72	ChangeCertsFileMode(GetAbsolutePath(certDir, "controller_to_coordinator/cert_passwd.txt"), S_IRUSR);	56	ChangeCertsFileMode(GetAbsolutePath(certDir, "controller_to_coordinator/cert_passwd.txt"), S_IRUSR);
73	- ChangeCertsFileMode(GetAbsolutePath(certDir, "controller_to_coordinator/tools/pmt/master/ksfa"),
74	- S_IRUSR \| S_IWUSR);
75	- ChangeCertsFileMode(GetAbsolutePath(certDir, "controller_to_coordinator/tools/pmt/standby/ksfb"),
76	- S_IRUSR \| S_IWUSR);
77		57
78	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_controller/ca.pem"), S_IRUSR);	58	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_controller/ca.pem"), S_IRUSR);
79	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_controller/cert.pem"), S_IRUSR);	59	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_controller/cert.pem"), S_IRUSR);
80	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_controller/cert.key.pem"), S_IRUSR);	60	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_controller/cert.key.pem"), S_IRUSR);
81	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_controller/cert_passwd.txt"), S_IRUSR);	61	ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_controller/cert_passwd.txt"), S_IRUSR);
82	- ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_controller/tools/pmt/master/ksfa"),
83	- S_IRUSR \| S_IWUSR);
84	- ChangeCertsFileMode(GetAbsolutePath(certDir, "coordinator_to_controller/tools/pmt/standby/ksfb"),
85	- S_IRUSR \| S_IWUSR);
86	}	62	}
87	};	63	};
88		64

Mtests/ms/dt/coordinator/stress_test/StressTetsHelper.h+0-22

	@@ -264,10 +264,6 @@ void StressTetsPDTLSHelper(uint32_t numMindIEServer, ReqTestFun reqTestFun, Metr
264	GetAbsolutePath(certDir, "coordinator_to_user/cert.key.pem"));	264	GetAbsolutePath(certDir, "coordinator_to_user/cert.key.pem"));
265	manager.SetList({"tls_config", "request_server_tls_items", "tls_passwd"},	265	manager.SetList({"tls_config", "request_server_tls_items", "tls_passwd"},
266	GetAbsolutePath(certDir, "coordinator_to_user/cert_passwd.txt"));	266	GetAbsolutePath(certDir, "coordinator_to_user/cert_passwd.txt"));
267	- manager.SetList({"tls_config", "request_server_tls_items", "kmcKsfMaster"},
268	- GetAbsolutePath(certDir, "coordinator_to_user/tools/pmt/master/ksfa"));
269	- manager.SetList({"tls_config", "request_server_tls_items", "kmcKsfStandby"},
270	- GetAbsolutePath(certDir, "coordinator_to_user/tools/pmt/standby/ksfb"));
271	manager.SetList({"tls_config", "request_server_tls_items", "tls_crl"}, "");	267	manager.SetList({"tls_config", "request_server_tls_items", "tls_crl"}, "");
272		268
273	manager.SetList({"tls_config", "mindie_client_tls_enable"}, true);	269	manager.SetList({"tls_config", "mindie_client_tls_enable"}, true);
	@@ -279,10 +275,6 @@ void StressTetsPDTLSHelper(uint32_t numMindIEServer, ReqTestFun reqTestFun, Metr
279	GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert.key.pem"));	275	GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert.key.pem"));
280	manager.SetList({"tls_config", "mindie_client_tls_items", "tls_passwd"},	276	manager.SetList({"tls_config", "mindie_client_tls_items", "tls_passwd"},
281	GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert_passwd.txt"));	277	GetAbsolutePath(certDir, "coordinator_to_mindie_server/cert_passwd.txt"));
282	- manager.SetList({"tls_config", "mindie_client_tls_items", "kmcKsfMaster"},
283	- GetAbsolutePath(certDir, "coordinator_to_mindie_server/tools/pmt/master/ksfa"));
284	- manager.SetList({"tls_config", "mindie_client_tls_items", "kmcKsfStandby"},
285	- GetAbsolutePath(certDir, "coordinator_to_mindie_server/tools/pmt/standby/ksfb"));
286	manager.SetList({"tls_config", "mindie_client_tls_items", "tls_crl"}, "");	278	manager.SetList({"tls_config", "mindie_client_tls_items", "tls_crl"}, "");
287		279
288	manager.SetList({"tls_config", "controller_server_tls_enable"}, true);	280	manager.SetList({"tls_config", "controller_server_tls_enable"}, true);
	@@ -294,10 +286,6 @@ void StressTetsPDTLSHelper(uint32_t numMindIEServer, ReqTestFun reqTestFun, Metr
294	GetAbsolutePath(certDir, "coordinator_to_controller/cert.key.pem"));	286	GetAbsolutePath(certDir, "coordinator_to_controller/cert.key.pem"));
295	manager.SetList({"tls_config", "controller_server_tls_items", "tls_passwd"},	287	manager.SetList({"tls_config", "controller_server_tls_items", "tls_passwd"},
296	GetAbsolutePath(certDir, "coordinator_to_controller/cert_passwd.txt"));	288	GetAbsolutePath(certDir, "coordinator_to_controller/cert_passwd.txt"));
297	- manager.SetList({"tls_config", "controller_server_tls_items", "kmcKsfMaster"},
298	- GetAbsolutePath(certDir, "coordinator_to_controller/tools/pmt/master/ksfa"));
299	- manager.SetList({"tls_config", "controller_server_tls_items", "kmcKsfStandby"},
300	- GetAbsolutePath(certDir, "coordinator_to_controller/tools/pmt/standby/ksfb"));
301	manager.SetList({"tls_config", "controller_server_tls_items", "tls_crl"}, "");	289	manager.SetList({"tls_config", "controller_server_tls_items", "tls_crl"}, "");
302		290
303	manager.SetList({"tls_config", "mindie_mangment_tls_enable"}, true);	291	manager.SetList({"tls_config", "mindie_mangment_tls_enable"}, true);
	@@ -309,10 +297,6 @@ void StressTetsPDTLSHelper(uint32_t numMindIEServer, ReqTestFun reqTestFun, Metr
309	GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/cert.key.pem"));	297	GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/cert.key.pem"));
310	manager.SetList({"tls_config", "mindie_mangment_tls_items", "tls_passwd"},	298	manager.SetList({"tls_config", "mindie_mangment_tls_items", "tls_passwd"},
311	GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/cert_passwd.txt"));	299	GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/cert_passwd.txt"));
312	- manager.SetList({"tls_config", "mindie_mangment_tls_items", "kmcKsfMaster"},
313	- GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/tools/pmt/master/ksfa"));
314	- manager.SetList({"tls_config", "mindie_mangment_tls_items", "kmcKsfStandby"},
315	- GetAbsolutePath(certDir, "coordinator_to_mindie_server_manage/tools/pmt/standby/ksfb"));
316	manager.Save();	300	manager.Save();
317	}	301	}
318		302
	@@ -341,10 +325,6 @@ void StressTetsPDTLSHelper(uint32_t numMindIEServer, ReqTestFun reqTestFun, Metr
341	GetAbsolutePath(certDir, "controller_to_coordinator/cert.key.pem"));	325	GetAbsolutePath(certDir, "controller_to_coordinator/cert.key.pem"));
342	manager.SetList({"tls_config", "request_coordinator_tls_items", "tls_passwd"},	326	manager.SetList({"tls_config", "request_coordinator_tls_items", "tls_passwd"},
343	GetAbsolutePath(certDir, "controller_to_coordinator/cert_passwd.txt"));	327	GetAbsolutePath(certDir, "controller_to_coordinator/cert_passwd.txt"));
344	- manager.SetList({"tls_config", "request_coordinator_tls_items", "kmc_ksf_master"},
345	- GetAbsolutePath(certDir, "controller_to_coordinator/tools/pmt/master/ksfa"));
346	- manager.SetList({"tls_config", "request_coordinator_tls_items", "kmc_ksf_standby"},
347	- GetAbsolutePath(certDir, "controller_to_coordinator/tools/pmt/standby/ksfb"));
348	manager.SetList({"tls_config", "request_coordinator_tls_items", "tls_crl"}, "");	328	manager.SetList({"tls_config", "request_coordinator_tls_items", "tls_crl"}, "");
349	manager.Save();	329	manager.Save();
350	}	330	}
	@@ -395,8 +375,6 @@ void StressTetsPDTLSHelper(uint32_t numMindIEServer, ReqTestFun reqTestFun, Metr
395	tlsItems.tlsCert = GetAbsolutePath(certDir, "controller_to_coordinator/cert.pem");	375	tlsItems.tlsCert = GetAbsolutePath(certDir, "controller_to_coordinator/cert.pem");
396	tlsItems.tlsKey = GetAbsolutePath(certDir, "controller_to_coordinator/cert.key.pem");	376	tlsItems.tlsKey = GetAbsolutePath(certDir, "controller_to_coordinator/cert.key.pem");
397	tlsItems.tlsPasswd = GetAbsolutePath(certDir, "controller_to_coordinator/cert_passwd.txt");	377	tlsItems.tlsPasswd = GetAbsolutePath(certDir, "controller_to_coordinator/cert_passwd.txt");
398	- tlsItems.kmcKsfMaster = GetAbsolutePath(certDir, "controller_to_coordinator/tools/pmt/master/ksfa");
399	- tlsItems.kmcKsfStandby = GetAbsolutePath(certDir, "controller_to_coordinator/tools/pmt/standby/ksfb");
400	WaitCoordinatorReadySSL(manageIP, strManagePort, tlsItems);	378	WaitCoordinatorReadySSL(manageIP, strManagePort, tlsItems);
401		379
402	std::cout << "1111111111111111111111111111" << std::endl;	380	std::cout << "1111111111111111111111111111" << std::endl;

Mtests/ms/dt/deployer/CMakeLists.txt+1-1

	@@ -46,6 +46,6 @@ list(REMOVE_ITEM DEPLOYER_SRCS_FILES "${MINDIE_MS_SRC_ROOT}/common/ConfigParams.
46		46
47	add_executable(mindie_ms_deployer_ut ${DEPLOYER_SRCS_FILES} ${TEST_MAIN_SRC})	47	add_executable(mindie_ms_deployer_ut ${DEPLOYER_SRCS_FILES} ${TEST_MAIN_SRC})
48	target_link_libraries(mindie_ms_deployer_ut gtest)	48	target_link_libraries(mindie_ms_deployer_ut gtest)
49	-target_link_libraries(mindie_ms_deployer_ut crypto ssl boundscheck hse_cryption)	49	+target_link_libraries(mindie_ms_deployer_ut crypto ssl boundscheck)
50		50
51	target_link_libraries(mindie_ms_deployer_ut dl pthread)	51	target_link_libraries(mindie_ms_deployer_ut dl pthread)

Mtests/ms/dt/deployer/util/TestConfigParams.cpp+0-4

	@@ -32,7 +32,6 @@
32	#include "Helper.h"	32	#include "Helper.h"
33	#include "ConfigParams.h"	33	#include "ConfigParams.h"
34	#include "Logger.h"	34	#include "Logger.h"
35	-#include "hse_cryptor.h"
36		35
37	using namespace std;	36	using namespace std;
38	using namespace testing;	37	using namespace testing;
	@@ -40,7 +39,6 @@ using ::testing::_;
40	using ::testing::Return;	39	using ::testing::Return;
41	using namespace MINDIE::MS;	40	using namespace MINDIE::MS;
42	using json = nlohmann::json;	41	using json = nlohmann::json;
43	-using namespace ock::hse;
44		42
45	class ConfigParamsTest : public ::testing::Test {	43	class ConfigParamsTest : public ::testing::Test {
46	protected:	44	protected:
	@@ -427,9 +425,7 @@ TEST_F(ConfigParamsTest, DecryptPassword_DecryptFailed)
427	tlsConfig.tlsPasswd = GetAbsolutePath(parentPath, "tests/ms/common/certificate/msctl/security/pass/key_pwd.txt");	425	tlsConfig.tlsPasswd = GetAbsolutePath(parentPath, "tests/ms/common/certificate/msctl/security/pass/key_pwd.txt");
428		426
429	Stub stub;	427	Stub stub;
430	- stub.set(HseCryptor::Decrypt, ReturnOneStub);
431	EXPECT_FALSE(DecryptPassword(domainId, password, tlsConfig));	428	EXPECT_FALSE(DecryptPassword(domainId, password, tlsConfig));
432	- stub.reset(HseCryptor::Decrypt);
433	}	429	}
434		430
435	/*	431	/*

Mtests/ms/dt/deployer/util/TestLogger.cpp+0-29

	@@ -20,7 +20,6 @@
20	#include <thread>	20	#include <thread>
21	#include "gtest/gtest.h"	21	#include "gtest/gtest.h"
22	#include "Logger.h"	22	#include "Logger.h"
23	-#include "hse_cryptor.h"
24	#include "Helper.h"	23	#include "Helper.h"
25	#include "stub.h"	24	#include "stub.h"
26		25
	@@ -513,8 +512,6 @@ TEST_F(LoggerTest, LogEnvStrAbsolutePathInitSuccess)
513	const char* originalHomeEnv = std::getenv("HOME");	512	const char* originalHomeEnv = std::getenv("HOME");
514	std::string homeEnv = "/root";	513	std::string homeEnv = "/root";
515	setenv(ENV_HOME, homeEnv.c_str(), 1);	514	setenv(ENV_HOME, homeEnv.c_str(), 1);
516	- Stub stub;
517	- stub.set(ADDR(ock::hse::HseCryptor, SetExternalLogger), ReturnZeroStub);
518	{	515	{
519	std::string logPath = "~/testMsLogPath ; rt: ./";	516	std::string logPath = "~/testMsLogPath ; rt: ./";
520	setenv(ENV_PATH, logPath.c_str(), 1);	517	setenv(ENV_PATH, logPath.c_str(), 1);
	@@ -544,7 +541,6 @@ TEST_F(LoggerTest, LogEnvStrAbsolutePathInitSuccess)
544	EXPECT_EQ(logger.mLogPath[LogType::RUN].find("/root/mindie/log/debug/mindie-ms"), 0);	541	EXPECT_EQ(logger.mLogPath[LogType::RUN].find("/root/mindie/log/debug/mindie-ms"), 0);
545	EXPECT_EQ(logger.mLogPath[LogType::OPERATION].find("/root/mindie/log/security/mindie-ms"), 0);	542	EXPECT_EQ(logger.mLogPath[LogType::OPERATION].find("/root/mindie/log/security/mindie-ms"), 0);
546	}	543	}
547	- stub.reset(ADDR(ock::hse::HseCryptor, SetExternalLogger));
548	if (originalHomeEnv == nullptr) {	544	if (originalHomeEnv == nullptr) {
549	unsetenv(ENV_HOME);	545	unsetenv(ENV_HOME);
550	} else {	546	} else {
	@@ -572,8 +568,6 @@ TEST_F(LoggerTest, LogEnvStrRelativePathInitSuccess)
572	std::string homeEnv = "/root";	568	std::string homeEnv = "/root";
573	unsetenv(ENV_HOME);	569	unsetenv(ENV_HOME);
574	setenv(ENV_HOME, homeEnv.c_str(), 1);	570	setenv(ENV_HOME, homeEnv.c_str(), 1);
575	- Stub stub;
576	- stub.set(ADDR(ock::hse::HseCryptor, SetExternalLogger), ReturnZeroStub);
577	{	571	{
578	std::string logPath = "testMsLogPath";	572	std::string logPath = "testMsLogPath";
579	unsetenv(ENV_PATH);	573	unsetenv(ENV_PATH);
	@@ -604,7 +598,6 @@ TEST_F(LoggerTest, LogEnvStrRelativePathInitSuccess)
604	EXPECT_EQ(logger.mLogPath[LogType::RUN].find("/root/mindie/log/debug/mindie-ms"), 0);	598	EXPECT_EQ(logger.mLogPath[LogType::RUN].find("/root/mindie/log/debug/mindie-ms"), 0);
605	EXPECT_EQ(logger.mLogPath[LogType::OPERATION].find("/root/mindie/log/security/mindie-ms"), 0);	599	EXPECT_EQ(logger.mLogPath[LogType::OPERATION].find("/root/mindie/log/security/mindie-ms"), 0);
606	}	600	}
607	- stub.reset(ADDR(ock::hse::HseCryptor, SetExternalLogger));
608	if (originalHomeEnv == nullptr) {	601	if (originalHomeEnv == nullptr) {
609	unsetenv(ENV_HOME);	602	unsetenv(ENV_HOME);
610	} else {	603	} else {
	@@ -633,11 +626,8 @@ TEST_F(LoggerTest, LogEnvStrPathInitFailed)
633	unsetenv(ENV_PATH);	626	unsetenv(ENV_PATH);
634	unsetenv(ENV_HOME);	627	unsetenv(ENV_HOME);
635	setenv(ENV_PATH, logPath.c_str(), 1);	628	setenv(ENV_PATH, logPath.c_str(), 1);
636	- Stub stub;
637	- stub.set(ADDR(ock::hse::HseCryptor, SetExternalLogger), ReturnZeroStub);
638	auto result = logger.Init(defaultLogConfig, {}, "");	629	auto result = logger.Init(defaultLogConfig, {}, "");
639	EXPECT_EQ(result, -1);	630	EXPECT_EQ(result, -1);
640	- stub.reset(ADDR(ock::hse::HseCryptor, SetExternalLogger));
641	unsetenv(ENV_PATH);	631	unsetenv(ENV_PATH);
642	}	632	}
643	{	633	{
	@@ -647,11 +637,8 @@ TEST_F(LoggerTest, LogEnvStrPathInitFailed)
647	unsetenv(ENV_HOME);	637	unsetenv(ENV_HOME);
648	setenv(ENV_PATH, logPath.c_str(), 1);	638	setenv(ENV_PATH, logPath.c_str(), 1);
649	setenv(ENV_HOME, homeEnv.c_str(), 1);	639	setenv(ENV_HOME, homeEnv.c_str(), 1);
650	- Stub stub;
651	- stub.set(ADDR(ock::hse::HseCryptor, SetExternalLogger), ReturnZeroStub);
652	auto result = logger.Init(defaultLogConfig, {}, "");	640	auto result = logger.Init(defaultLogConfig, {}, "");
653	EXPECT_EQ(result, -1);	641	EXPECT_EQ(result, -1);
654	- stub.reset(ADDR(ock::hse::HseCryptor, SetExternalLogger));
655	unsetenv(ENV_PATH);	642	unsetenv(ENV_PATH);
656	}	643	}
657	if (originalHomeEnv == nullptr) {	644	if (originalHomeEnv == nullptr) {
	@@ -678,10 +665,7 @@ TEST_F(LoggerTest, LogNoEnvStrPathInitFailed)
678	{	665	{
679	unsetenv(ENV_PATH);	666	unsetenv(ENV_PATH);
680	unsetenv(ENV_HOME);	667	unsetenv(ENV_HOME);
681	- Stub stub;
682	- stub.set(ADDR(ock::hse::HseCryptor, SetExternalLogger), ReturnZeroStub);
683	auto result = logger.Init(defaultLogConfig, {}, "");	668	auto result = logger.Init(defaultLogConfig, {}, "");
684	- stub.reset(ADDR(ock::hse::HseCryptor, SetExternalLogger));
685	EXPECT_EQ(result, -1);	669	EXPECT_EQ(result, -1);
686	}	670	}
687	if (originalHomeEnv == nullptr) {	671	if (originalHomeEnv == nullptr) {
	@@ -710,8 +694,6 @@ TEST_F(LoggerTest, LogEnvConfigFileCompatibility)
710	std::string homeEnv = "/root";	694	std::string homeEnv = "/root";
711	unsetenv(ENV_HOME);	695	unsetenv(ENV_HOME);
712	setenv(ENV_HOME, homeEnv.c_str(), 1);	696	setenv(ENV_HOME, homeEnv.c_str(), 1);
713	- Stub stub;
714	- stub.set(ADDR(ock::hse::HseCryptor, SetExternalLogger), ReturnZeroStub);
715	{	697	{
716	std::string logPath = "/root/testMsLogPathEnv";	698	std::string logPath = "/root/testMsLogPathEnv";
717	setenv(ENV_PATH, logPath.c_str(), 1);	699	setenv(ENV_PATH, logPath.c_str(), 1);
	@@ -739,7 +721,6 @@ TEST_F(LoggerTest, LogEnvConfigFileCompatibility)
739	EXPECT_EQ(logger.mLogPath[LogType::RUN].find("/root/testMsLogPathFile"), 0);	721	EXPECT_EQ(logger.mLogPath[LogType::RUN].find("/root/testMsLogPathFile"), 0);
740	EXPECT_EQ(logger.mLogPath[LogType::OPERATION].find("/root/testMsLogPathFile"), 0);	722	EXPECT_EQ(logger.mLogPath[LogType::OPERATION].find("/root/testMsLogPathFile"), 0);
741	}	723	}
742	- stub.reset(ADDR(ock::hse::HseCryptor, SetExternalLogger));
743	if (originalHomeEnv == nullptr) {	724	if (originalHomeEnv == nullptr) {
744	unsetenv(ENV_HOME);	725	unsetenv(ENV_HOME);
745	} else {	726	} else {
	@@ -1032,8 +1013,6 @@ TEST_F(LoggerTest, LogRotateWrite)
1032	std::string runLogName = "test_rotate_run_" + GetLocalTimeNow(); // 时间戳防重名	1013	std::string runLogName = "test_rotate_run_" + GetLocalTimeNow(); // 时间戳防重名
1033	std::string operationLogName = "test_rotate_operation_" + GetLocalTimeNow();	1014	std::string operationLogName = "test_rotate_operation_" + GetLocalTimeNow();
1034		1015
1035	- Stub stub;
1036	- stub.set(ADDR(ock::hse::HseCryptor, SetExternalLogger), ReturnZeroStub);
1037	defaultLogConfig.option.toFile = true;	1016	defaultLogConfig.option.toFile = true;
1038	defaultLogConfig.option.toStdout = true;	1017	defaultLogConfig.option.toStdout = true;
1039	defaultLogConfig.maxLogStrSize = 512; // 512: max string size of a log message	1018	defaultLogConfig.maxLogStrSize = 512; // 512: max string size of a log message
	@@ -1041,7 +1020,6 @@ TEST_F(LoggerTest, LogRotateWrite)
1041	defaultLogConfig.runLogPath = dirPath + "/" + runLogName + ".log";	1020	defaultLogConfig.runLogPath = dirPath + "/" + runLogName + ".log";
1042	defaultLogConfig.operationLogPath = dirPath + "/" + operationLogName + ".log";	1021	defaultLogConfig.operationLogPath = dirPath + "/" + operationLogName + ".log";
1043	auto result = logger.Init(defaultLogConfig, {}, "");	1022	auto result = logger.Init(defaultLogConfig, {}, "");
1044	- stub.reset(ADDR(ock::hse::HseCryptor, SetExternalLogger));
1045	EXPECT_EQ(result, 0);	1023	EXPECT_EQ(result, 0);
1046		1024
1047	logger.mMaxLogFileNum = mMaxLogFileNum; // 最大文件数	1025	logger.mMaxLogFileNum = mMaxLogFileNum; // 最大文件数
	@@ -1075,8 +1053,6 @@ TEST_F(LoggerTest, LogRotateWrite)
1075	*/	1053	*/
1076	TEST_F(LoggerTest, LogInitLogFileStub)	1054	TEST_F(LoggerTest, LogInitLogFileStub)
1077	{	1055	{
1078	- Stub hseStub;
1079	- hseStub.set(ADDR(ock::hse::HseCryptor, SetExternalLogger), ReturnZeroStub);
1080	std::string dirPath = GetParentPath(GetExecutablePath());	1056	std::string dirPath = GetParentPath(GetExecutablePath());
1081	defaultLogConfig.option = {true, true};	1057	defaultLogConfig.option = {true, true};
1082	defaultLogConfig.logLevel = "DEBUG";	1058	defaultLogConfig.logLevel = "DEBUG";
	@@ -1120,7 +1096,6 @@ TEST_F(LoggerTest, LogInitLogFileStub)
1120	EXPECT_EQ(result, -1);	1096	EXPECT_EQ(result, -1);
1121	stub.reset(chmod);	1097	stub.reset(chmod);
1122	}	1098	}
1123	- hseStub.reset(ADDR(ock::hse::HseCryptor, SetExternalLogger));
1124	}	1099	}
1125		1100
1126	/*	1101	/*
	@@ -1140,9 +1115,7 @@ TEST_F(LoggerTest, LogInitLogFileStub)
1140	*/	1115	*/
1141	TEST_F(LoggerTest, LogLogStub)	1116	TEST_F(LoggerTest, LogLogStub)
1142	{	1117	{
1143	- Stub hseStub;
1144	Stub stub;	1118	Stub stub;
1145	- hseStub.set(ADDR(ock::hse::HseCryptor, SetExternalLogger), ReturnZeroStub);
1146	uint32_t maxLogStrSize = 512; // 单条日志最大长度512	1119	uint32_t maxLogStrSize = 512; // 单条日志最大长度512
1147	std::string dirPath = GetParentPath(GetExecutablePath());	1120	std::string dirPath = GetParentPath(GetExecutablePath());
1148	defaultLogConfig.option.toFile = true;	1121	defaultLogConfig.option.toFile = true;
	@@ -1199,8 +1172,6 @@ TEST_F(LoggerTest, LogLogStub)
1199	auto ret5 = logger.Log(LogType::RUN, LogLevel::MINDIE_LOG_ERROR, "a message");	1172	auto ret5 = logger.Log(LogType::RUN, LogLevel::MINDIE_LOG_ERROR, "a message");
1200	EXPECT_EQ(ret5, -1);	1173	EXPECT_EQ(ret5, -1);
1201	stub.reset(chmod);	1174	stub.reset(chmod);
1202	-
1203	- hseStub.reset(ADDR(ock::hse::HseCryptor, SetExternalLogger));
1204	}	1175	}
1205		1176
1206	static std::time_t GetTimeStampAfterDay()	1177	static std::time_t GetTimeStampAfterDay()

Mtests/ms/dt/deployer/util/TestPathCheck.cpp+0-18

	@@ -279,10 +279,6 @@ TEST_F(TestPathCheck, HttpClient)
279	CreateFile(tlsConfigBak.tlsKey, "tls_key");	279	CreateFile(tlsConfigBak.tlsKey, "tls_key");
280	tlsConfigBak.tlsPasswd = JoinPathComponents({ exeDir, "cert_dir", "tls_crl.crl" });	280	tlsConfigBak.tlsPasswd = JoinPathComponents({ exeDir, "cert_dir", "tls_crl.crl" });
281	CreateFile(tlsConfigBak.tlsPasswd, "tls_crl");	281	CreateFile(tlsConfigBak.tlsPasswd, "tls_crl");
282	- tlsConfigBak.kmcKsfMaster = JoinPathComponents({ exeDir, "cert_dir", "kmcKsfMaster" });
283	- CreateFile(tlsConfigBak.kmcKsfMaster, "kmcKsfMaster");
284	- tlsConfigBak.kmcKsfStandby = JoinPathComponents({ exeDir, "cert_dir", "kmcKsfStandby" });
285	- CreateFile(tlsConfigBak.kmcKsfStandby, "kmcKsfStandby");
286		282
287	MINDIE::MS::Request req = {};	283	MINDIE::MS::Request req = {};
288	int32_t code;	284	int32_t code;
	@@ -290,11 +286,6 @@ TEST_F(TestPathCheck, HttpClient)
290		286
291	Stub stub;	287	Stub stub;
292		288
293	- // 可能存在熵不足导致随机数生成卡死，故桩掉底层依赖
294	- stub.set(HseCryptor::Initialize, ReturnZeroStub);
295	- stub.set(HseCryptor::Decrypt, ReturnZeroStub);
296	- stub.set(HseCryptor::UnInitialize, ReturnZeroStub);
297	- stub.set(HseCryptor::RefreshMkMask, ReturnZeroStub);
298	{	289	{
299	HttpClient httpClient;	290	HttpClient httpClient;
300	stub.set(SSL_CTX_set_ciphersuites, ReturnZeroStub);	291	stub.set(SSL_CTX_set_ciphersuites, ReturnZeroStub);
	@@ -389,8 +380,6 @@ TEST_F(TestPathCheck, HttpClient)
389	// kmcKsfMaster文件不存在	380	// kmcKsfMaster文件不存在
390		381
391	TlsItems tlsConfig = tlsConfigBak;	382	TlsItems tlsConfig = tlsConfigBak;
392	- tlsConfig.kmcKsfMaster =
393	- GetAbsolutePath(certDir, "msserver/tools/pmt/master/ksfa_not_exist");
394	HttpClient httpClient;	383	HttpClient httpClient;
395	httpClient.Init("127.0.0.1", "32001", tlsConfig, true);	384	httpClient.Init("127.0.0.1", "32001", tlsConfig, true);
396	auto ret = httpClient.SendRequest(req, 10, 10, responseBody, code);	385	auto ret = httpClient.SendRequest(req, 10, 10, responseBody, code);
	@@ -401,8 +390,6 @@ TEST_F(TestPathCheck, HttpClient)
401	// kmcKsfStandby文件目录不存在	390	// kmcKsfStandby文件目录不存在
402		391
403	TlsItems tlsConfig = tlsConfigBak;	392	TlsItems tlsConfig = tlsConfigBak;
404	- tlsConfig.kmcKsfStandby =
405	- GetAbsolutePath(certDir, "msserver/tools/pmt/standby/ksfb_not_exist");
406	HttpClient httpClient;	393	HttpClient httpClient;
407	httpClient.Init("127.0.0.1", "32001", tlsConfig, true);	394	httpClient.Init("127.0.0.1", "32001", tlsConfig, true);
408	auto ret = httpClient.SendRequest(req, 10, 10, responseBody, code);	395	auto ret = httpClient.SendRequest(req, 10, 10, responseBody, code);
	@@ -420,11 +407,6 @@ TEST_F(TestPathCheck, HttpClient)
420	EXPECT_EQ(ret, -1);	407	EXPECT_EQ(ret, -1);
421	stub.reset(ftok);	408	stub.reset(ftok);
422	}	409	}
423	-
424	- stub.reset(HseCryptor::Initialize);
425	- stub.reset(HseCryptor::Decrypt);
426	- stub.reset(HseCryptor::UnInitialize);
427	- stub.reset(HseCryptor::RefreshMkMask);
428	}	410	}
429		411
430	// 文件夹创建成功	412	// 文件夹创建成功

Mtests/ms/fuzz/coordinator/CMakeLists.txt+1-1

	@@ -66,7 +66,7 @@ file(GLOB COMMON_SOURCE_DIR
66	list(REMOVE_ITEM COORDINATOR_SOURCE_DIR "${MINDIE_MS_SRC_ROOT}/coordinator/main.cpp")	66	list(REMOVE_ITEM COORDINATOR_SOURCE_DIR "${MINDIE_MS_SRC_ROOT}/coordinator/main.cpp")
67		67
68	add_library(test_coordinator SHARED ${COORDINATOR_SOURCE_DIR} ${COMMON_SOURCE_DIR})	68	add_library(test_coordinator SHARED ${COORDINATOR_SOURCE_DIR} ${COMMON_SOURCE_DIR})
69	-target_link_libraries(test_coordinator crypto ssl boundscheck pthread hse_cryption -ldl)	69	+target_link_libraries(test_coordinator crypto ssl boundscheck pthread -ldl)
70		70
71	aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} COORDINATOR_SRCS_FILES)	71	aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} COORDINATOR_SRCS_FILES)
72		72

Mtests/ms/ms_test_util.sh+0-2

	@@ -71,10 +71,8 @@ _build_src()
71	_set_env()	71	_set_env()
72	{	72	{
73	export LD_LIBRARY_PATH=${BUILD_MIES_3RDPARTY_INSTALL_DIR}/openssl/lib:${LD_LIBRARY_PATH}	73	export LD_LIBRARY_PATH=${BUILD_MIES_3RDPARTY_INSTALL_DIR}/openssl/lib:${LD_LIBRARY_PATH}
74	- export LD_LIBRARY_PATH=${BUILD_MIES_3RDPARTY_INSTALL_DIR}/hseceasy/lib:${LD_LIBRARY_PATH}
75	export LD_LIBRARY_PATH=${BUILD_MINDIE_SERVICE_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}	74	export LD_LIBRARY_PATH=${BUILD_MINDIE_SERVICE_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}
76	export LD_LIBRARY_PATH=${BUILD_MIES_3RDPARTY_INSTALL_DIR}/libboundscheck/lib:${LD_LIBRARY_PATH}	75	export LD_LIBRARY_PATH=${BUILD_MIES_3RDPARTY_INSTALL_DIR}/libboundscheck/lib:${LD_LIBRARY_PATH}
77	- export HSECEASY_PATH=${BUILD_MIES_3RDPARTY_INSTALL_DIR}/hseceasy/lib
78	}	76	}
79		77
80	_build_dt()	78	_build_dt()

	@@ -53,7 +53,6 @@ include_directories(
53	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/libboundscheck/include	53	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/libboundscheck/include
54	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/nlohmann-json/include	54	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/nlohmann-json/include
55	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/openssl/include	55	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/openssl/include
56	- ${BUILD_MIES_3RDPARTY_INSTALL_DIR}/hseceasy/include
57	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/grpc/include	56	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/grpc/include
58		57
59	${HTTP_CLIENT_CTL_DIR}/log	58	${HTTP_CLIENT_CTL_DIR}/log
	@@ -78,7 +77,6 @@ endif()
78	link_directories(	77	link_directories(
79	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/googletest/lib	78	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/googletest/lib
80	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/libboundscheck/lib	79	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/libboundscheck/lib
81	- ${BUILD_MIES_3RDPARTY_INSTALL_DIR}/hseceasy/lib
82	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/openssl/lib	80	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/openssl/lib
83	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/grpc/lib	81	${BUILD_MIES_3RDPARTY_INSTALL_DIR}/grpc/lib
84	${BUILD_MINDIE_SERVICE_INSTALL_DIR}/lib	82	${BUILD_MINDIE_SERVICE_INSTALL_DIR}/lib