vk-ssl-auto-deploy 0.2.0 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vk-ssl-auto-deploy",
-	"version": "0.2.0",
+	"version": "0.2.1",
 	"description": "SSL证书自动部署工具 - 提供HTTP API接口，支持证书文件自动上传和部署",
 	"main": "app.js",
 	"bin": {

package/routes/cert.js

@@ -38,8 +38,8 @@ router.post('/deploy-cert', upload.single('file'), async (req, res, next) => {
 		const clientIP = getClientIP(req);
 		if (!isIPInWhitelist(clientIP, config.ipWhitelist)) {
 			console.warn(`[IP白名单拦截] IP: ${clientIP} 尝试部署证书但不在白名单中`);
-			return res.json({ 
-				code: 4030, 
+			return res.json({
+				code: 4030,
 				msg: 'IP地址不在白名单中，访问被拒绝',
 				ip: clientIP
 			});
@@ -66,10 +66,11 @@ router.post('/deploy-cert', upload.single('file'), async (req, res, next) => {
 		// 2. 创建cert目录和子目录
 		const projectRoot = path.join(__dirname, '..');
 		// 使用配置文件中的 certPath，支持绝对路径和相对路径
-		const certBaseDir = path.isAbsolute(config.certPath) 
-			? config.certPath 
-			: path.join(projectRoot, config.certPath);
-		const certDir = path.resolve(certBaseDir, certName);
+		const certBaseDir = path.isAbsolute(config.certPath) ?
+			config.certPath :
+			path.join(projectRoot, config.certPath);
+		const certDir = path.resolve(certBaseDir, certName);
+		const userCertDir = certDir.replace(/\\/g, '/');
 
 		// 确保cert根目录存在
 		if (!fs.existsSync(certBaseDir)) {
@@ -91,18 +92,18 @@ router.post('/deploy-cert', upload.single('file'), async (req, res, next) => {
 
 			// 统计信息
 			const stats = {
-				total: 0,           // 总文件数
-				saved: 0,           // 成功保存的文件数
-				filtered: 0,        // 被过滤的文件数
-				savedFiles: [],     // 保存的文件列表
-				filteredFiles: []   // 被过滤的文件列表（含原因）
+				total: 0, // 总文件数
+				saved: 0, // 成功保存的文件数
+				filtered: 0, // 被过滤的文件数
+				savedFiles: [], // 保存的文件列表
+				filteredFiles: [] // 被过滤的文件列表（含原因）
 			};
 
 			// 遍历并验证每个文件
 			zipEntries.forEach((entry) => {
 				if (!entry.isDirectory) {
 					stats.total++;
-					
+
 					const filename = path.basename(entry.entryName);
 					const entryData = entry.getData();
 
@@ -122,10 +123,10 @@ router.post('/deploy-cert', upload.single('file'), async (req, res, next) => {
 
 							// 写入文件
 							fs.writeFileSync(entryPath, entryData);
-							
+
 							stats.saved++;
 							stats.savedFiles.push(entry.entryName);
-							
+
 							console.log(`[文件已保存] ${entry.entryName} (${entryData.length} bytes)`);
 						} catch (writeError) {
 							console.error(`[文件写入失败] ${entry.entryName}:`, writeError.message);
@@ -142,7 +143,7 @@ router.post('/deploy-cert', upload.single('file'), async (req, res, next) => {
 							filename: entry.entryName,
 							reason: validation.reason
 						});
-						
+
 						console.warn(`[文件已过滤] ${entry.entryName}: ${validation.reason}`);
 					}
 				}
@@ -162,68 +163,68 @@ router.post('/deploy-cert', upload.single('file'), async (req, res, next) => {
 				});
 			}
 
-		console.log(`[证书部署成功] 名称: ${certName}, 路径: ${certDir.replace(/\\/g, '/')}, 保存: ${stats.saved}个, 过滤: ${stats.filtered}个`);
-
-		// 4. 执行回调命令
-		const commandResults = [];
-		if (config.callbackCommand && Array.isArray(config.callbackCommand) && config.callbackCommand.length > 0) {
-			console.log(`[开始执行回调命令] 共${config.callbackCommand.length}个命令`);
-			
-			for (let i = 0; i < config.callbackCommand.length; i++) {
-				const command = config.callbackCommand[i];
-				const commandResult = {
-					command: command,
-					index: i + 1,
-					success: false,
-					output: '',
-					error: ''
-				};
-
-				try {
-					console.log(`[执行命令 ${i + 1}/${config.callbackCommand.length}] ${command}`);
-					const { stdout, stderr } = await execAsync(command, {
-						timeout: 30000, // 30秒超时
-						maxBuffer: 1024 * 1024 // 1MB buffer
-					});
-					
-					commandResult.success = true;
-					commandResult.output = stdout ? stdout.trim() : '';
-					if (stderr) {
-						commandResult.error = stderr.trim();
+			console.log(`[证书部署成功] 名称: ${certName}, 路径: ${userCertDir}, 保存: ${stats.saved}个, 过滤: ${stats.filtered}个`);
+
+			// 4. 执行回调命令
+			const commandResults = [];
+			if (config.callbackCommand && Array.isArray(config.callbackCommand) && config.callbackCommand.length > 0) {
+				console.log(`[开始执行回调命令] 共${config.callbackCommand.length}个命令`);
+
+				for (let i = 0; i < config.callbackCommand.length; i++) {
+					const command = config.callbackCommand[i];
+					const commandResult = {
+						command: command,
+						index: i + 1,
+						success: false,
+						output: '',
+						error: ''
+					};
+
+					try {
+						console.log(`[执行命令 ${i + 1}/${config.callbackCommand.length}] ${command}`);
+						const { stdout, stderr } = await execAsync(command, {
+							timeout: 30000, // 30秒超时
+							maxBuffer: 1024 * 1024 // 1MB buffer
+						});
+
+						commandResult.success = true;
+						commandResult.output = stdout ? stdout.trim() : '';
+						if (stderr) {
+							commandResult.error = stderr.trim();
+						}
+
+						console.log(`[命令执行成功 ${i + 1}/${config.callbackCommand.length}] ${command}`);
+						if (stdout) console.log(`[命令输出] ${stdout.trim()}`);
+						if (stderr) console.warn(`[命令stderr] ${stderr.trim()}`);
+
+					} catch (cmdError) {
+						commandResult.success = false;
+						commandResult.error = cmdError.message;
+						if (cmdError.stdout) commandResult.output = cmdError.stdout.trim();
+						if (cmdError.stderr) commandResult.error += '\n' + cmdError.stderr.trim();
+
+						console.error(`[命令执行失败 ${i + 1}/${config.callbackCommand.length}] ${command}:`, cmdError.message);
 					}
-					
-					console.log(`[命令执行成功 ${i + 1}/${config.callbackCommand.length}] ${command}`);
-					if (stdout) console.log(`[命令输出] ${stdout.trim()}`);
-					if (stderr) console.warn(`[命令stderr] ${stderr.trim()}`);
-					
-				} catch (cmdError) {
-					commandResult.success = false;
-					commandResult.error = cmdError.message;
-					if (cmdError.stdout) commandResult.output = cmdError.stdout.trim();
-					if (cmdError.stderr) commandResult.error += '\n' + cmdError.stderr.trim();
-					
-					console.error(`[命令执行失败 ${i + 1}/${config.callbackCommand.length}] ${command}:`, cmdError.message);
+
+					commandResults.push(commandResult);
 				}
 
-				commandResults.push(commandResult);
+				console.log(`[回调命令执行完成] 成功: ${commandResults.filter(r => r.success).length}个, 失败: ${commandResults.filter(r => !r.success).length}个`);
 			}
 
-			console.log(`[回调命令执行完成] 成功: ${commandResults.filter(r => r.success).length}个, 失败: ${commandResults.filter(r => !r.success).length}个`);
-		}
-
-		return res.json({
-			code: 0,
-			msg: '证书部署成功',
-			path: path.join(config.certPath, certName),
-			stats: {
-				total: stats.total,
-				saved: stats.saved,
-				filtered: stats.filtered,
-				savedFiles: stats.savedFiles,
-				filteredFiles: stats.filteredFiles
-			},
-			commandResults: commandResults.length > 0 ? commandResults : undefined
-		});
+			return res.json({
+				code: 0,
+				msg: '证书部署成功',
+				path: userCertDir,
+				stats: {
+					total: stats.total,
+					saved: stats.saved,
+					filtered: stats.filtered,
+					savedFiles: stats.savedFiles,
+					filteredFiles: stats.filteredFiles
+				},
+				commandResults: commandResults.length > 0 ? commandResults : undefined
+			});
 
 		} catch (zipError) {
 			console.error('[解压失败]', zipError);