瀏覽代碼

Update certificate.js

MarceloLagos 5 年之前
父節點
當前提交
7ba58bdbd3
共有 1 個文件被更改,包括 6 次插入5 次删除
  1. 6 5
      backend/internal/certificate.js

+ 6 - 5
backend/internal/certificate.js

@@ -608,11 +608,12 @@ const internalCertificate = {
 	checkPrivateKey: (private_key) => {
 		return tempWrite(private_key, '/tmp')
 			.then((filepath) => {
-				return utils.exec('openssl rsa -in ' + filepath + ' -check -noout')
-					.then((result) => {
-						if (!result.toLowerCase().includes('key ok')) {
-							throw new error.ValidationError(result);
-						}
+                                let key_type = private_key.includes('-----BEGIN RSA') ? 'rsa' : 'ec';
+                                return utils.exec('openssl ' + key_type + ' -in ' + filepath + ' -check -noout 2>&1 ')
+                                        .then((result) => {
+                                                if (!result.toLowerCase().includes('key ok') && !result.toLowerCase().includes('key valid') ) {
+                                                        throw new error.ValidationError('Result Validation Error: ' + result);
+                                                }
 
 						fs.unlinkSync(filepath);
 						return true;