node-red-contrib-fox-admin 1.0.0 → 1.0.2

package/README.md

@@ -24,7 +24,7 @@ Node-RED 运行时插件，提供系统管理控制台功能。
 ## 使用方法
 
 1. 启动 Node-RED
-2. 访问 `http://your-node-red-ip:port/foxcontroladmin_login/`
+2. 访问 `http://your-node-red-ip:port/foxadmin/`
 3. 使用默认密码登录：`foxcontrol@123`
 4. 修改密码：设置环境变量 `FOX_ADMIN_PASSWORD`
 
@@ -36,27 +36,27 @@ Node-RED 运行时插件，提供系统管理控制台功能。
 ## API 接口
 
 ### 认证相关
-- `POST /api/foxcontrol_admin/login`：登录
-- `POST /api/foxcontrol_admin/logout`：登出
-- `GET /api/foxcontrol_admin/check-auth`：检查认证状态
+- `POST /foxcontrol_api/admin/login`：登录
+- `POST /foxcontrol_api/admin/logout`：登出
+- `GET /foxcontrol_api/admin/check-auth`：检查认证状态
 
 ### 系统管理
-- `GET /api/foxcontrol_admin/system/info`：获取系统信息
-- `PUT /api/foxcontrol_admin/hostname`：修改主机名
+- `GET /foxcontrol_api/admin/system/info`：获取系统信息
+- `PUT /foxcontrol_api/admin/hostname`：修改主机名
 
 ### 网络管理
-- `GET /api/foxcontrol_admin/network/interfaces`：获取网络接口
-- `GET /api/foxcontrol_admin/network/connections`：获取网络连接
-- `PUT /api/foxcontrol_admin/network/config`：配置网络
+- `GET /foxcontrol_api/admin/network/interfaces`：获取网络接口
+- `GET /foxcontrol_api/admin/network/connections`：获取网络连接
+- `PUT /foxcontrol_api/admin/network/config`：配置网络
 
 ### 防火墙管理
-- `GET /api/foxcontrol_admin/firewall/status`：获取防火墙状态
-- `PUT /api/foxcontrol_admin/firewall/enable`：启用防火墙
-- `PUT /api/foxcontrol_admin/firewall/disable`：禁用防火墙
-- `POST /api/foxcontrol_admin/firewall/rule`：添加防火墙规则
+- `GET /foxcontrol_api/admin/firewall/status`：获取防火墙状态
+- `PUT /foxcontrol_api/admin/firewall/enable`：启用防火墙
+- `PUT /foxcontrol_api/admin/firewall/disable`：禁用防火墙
+- `POST /foxcontrol_api/admin/firewall/rule`：添加防火墙规则
 
 ### 站点部署
-- `POST /api/foxcontrol_admin/deploy/upload`：上传并部署站点
+- `POST /foxcontrol_api/admin/deploy/upload`：上传并部署站点
 
 ## 注意事项
 

package/index.js

@@ -234,20 +234,68 @@ module.exports = function(RED) {
             }
         });
 
+        async function getSubnetMask(ifaceName, targetIp) {
+            try {
+                const osType = getSystemType();
+                const platform = process.platform;
+                let cmd = '';
+                
+                if (osType === 'debian' || osType === 'kylin' || osType === 'openEuler' || osType === 'ubuntu') {
+                    if (targetIp) {
+                        cmd = `ip -4 addr show dev ${ifaceName} 2>/dev/null | grep "inet ${targetIp}/" | awk '{print $2}' | cut -d'/' -f2`;
+                    } else {
+                        cmd = `ip -4 addr show dev ${ifaceName} 2>/dev/null | grep 'inet ' | awk 'NR==1 {print $2}' | cut -d'/' -f2`;
+                    }
+                } else if (osType === 'unknown') {
+                    if (platform === 'win32') {
+                        cmd = `ipconfig | findstr "${ifaceName}"`;
+                    } else {
+                        return '';
+                    }
+                } else {
+                    return '';
+                }
+                
+                const result = await execCommand(cmd);
+                if (platform === 'win32') {
+                    const match = result.match(/Subnet Mask\s+:\s+(\d+\.\d+\.\d+\.\d+)/);
+                    return match ? match[1] : '';
+                }
+                const cidr = result.trim();
+                if (cidr && /^\d+$/.test(cidr)) {
+                    return cidrToDotted(cidr);
+                }
+                return '';
+            } catch (err) {
+                return '';
+            }
+        }
+
+        function cidrToDotted(cidr) {
+            const mask = ~0 << (32 - cidr);
+            return [
+                (mask >>> 24) & 255,
+                (mask >>> 16) & 255,
+                (mask >>> 8) & 255,
+                mask & 255
+            ].join('.');
+        }
+
         app.get('/foxcontrol_api/admin/network/interfaces', async (req, res) => {
             try {
                 const networkInterfaces = await si.networkInterfaces();
                 const networkStats = await si.networkStats();
                 const defaultGateway = await getDefaultGateway();
                 
-                const interfaces = networkInterfaces.map(iface => {
+                const interfaces = await Promise.all(networkInterfaces.map(async (iface) => {
                     const stats = networkStats.find(s => s.iface === iface.iface) || {};
+                    const subnet = iface.ip4_subnet || await getSubnetMask(iface.iface, iface.ip4);
                     
                     return {
                         iface: iface.iface,
                         type: iface.type,
                         ip4: iface.ip4,
-                        ip4_subnet: iface.ip4_subnet || '',
+                        ip4_subnet: subnet,
                         ip6: iface.ip6,
                         mac: iface.mac,
                         internal: iface.internal,
@@ -262,7 +310,7 @@ module.exports = function(RED) {
                         rx_sec: stats.rx_sec || 0,
                         tx_sec: stats.tx_sec || 0
                     };
-                });
+                }));
 
                 res.json({ status: 'success', data: interfaces });
             } catch (err) {
@@ -303,7 +351,14 @@ iface ${iface} inet static
                     fs.writeFileSync(configPath, config);
                     await execCommand('systemctl restart networking');
                 } else if (systemType === 'kylin' || systemType === 'openEuler') {
-                    const config = `
+                    try {
+                        await execCommand('systemctl restart network');
+                    } catch (err) {
+                        try {
+                            await execCommand(`nmcli con modify ${iface} ipv4.addresses ${ip4}/${netmask} ipv4.gateway ${gateway} ipv4.dns ${dns} ipv4.method manual`);
+                            await execCommand(`nmcli con up ${iface}`);
+                        } catch (nmcliErr) {
+                            const config = `
 TYPE=Ethernet
 BOOTPROTO=static
 DEFROUTE=yes
@@ -320,9 +375,12 @@ NETMASK=${netmask}
 GATEWAY=${gateway}
 DNS1=${dns}
 `;
-                    const configPath = `/etc/sysconfig/network-scripts/ifcfg-${iface}`;
-                    fs.writeFileSync(configPath, config);
-                    await execCommand('systemctl restart network');
+                            const configPath = `/etc/sysconfig/network-scripts/ifcfg-${iface}`;
+                            fs.writeFileSync(configPath, config);
+                            await execCommand('nmcli con reload');
+                            await execCommand(`nmcli con up ${iface}`);
+                        }
+                    }
                 }
 
                 RED.log.info(`[Fox Admin] 网络配置已更新: ${iface}`);
@@ -343,7 +401,18 @@ DNS1=${dns}
                         const ufwStatus = await execCommand('ufw status verbose');
                         status.enabled = ufwStatus.includes('Status: active');
                         const rules = ufwStatus.split('\n').filter(line => line.includes('ALLOW') || line.includes('DENY'));
-                        status.rules = rules;
+                        status.rules = rules.map(rule => {
+                            const match = rule.match(/(\d+)\/(tcp|udp)/);
+                            if (match) {
+                                return {
+                                    action: rule.includes('ALLOW') ? 'allow' : 'deny',
+                                    port: match[1],
+                                    protocol: match[2],
+                                    ip: rule.includes('from') ? rule.match(/from\s+(\d+\.\d+\.\d+\.\d+)/)?.[1] : null
+                                };
+                            }
+                            return { action: rule.includes('ALLOW') ? 'allow' : 'deny', raw: rule };
+                        });
                     } catch (err) {
                         status.enabled = false;
                     }
@@ -352,7 +421,22 @@ DNS1=${dns}
                         const fwStatus = await execCommand('firewall-cmd --state');
                         status.enabled = fwStatus === 'running';
                         const rules = await execCommand('firewall-cmd --list-all');
-                        status.rules = [rules];
+                        
+                        const portsLine = rules.split('\n').find(line => line.trim().startsWith('ports:'));
+                        if (portsLine) {
+                            const ports = portsLine.replace('ports:', '').trim();
+                            if (ports) {
+                                status.rules = ports.split(/\s+/).map(port => {
+                                    const [portNum, protocol] = port.split('/');
+                                    return {
+                                        action: 'allow',
+                                        port: portNum,
+                                        protocol: protocol || 'tcp',
+                                        ip: null
+                                    };
+                                });
+                            }
+                        }
                     } catch (err) {
                         status.enabled = false;
                     }

package/lib/dashboard.html

@@ -300,7 +300,7 @@
         async function logout() {
             if (confirm('确定要退出登录吗？')) {
                 await fetch('/foxcontrol_api/admin/logout', { method: 'POST' });
-                window.location.href = '..';
+                window.location.href = '/foxadmin';
             }
         }
 

package/lib/deploy.html

@@ -344,6 +344,18 @@
                 window.location.href = '/foxadmin';
             }
         }
+        async function checkAuth() {
+            try {
+                const res = await fetch('/foxcontrol_api/admin/check-auth');
+                const data = await res.json();
+                if (data.status === 'error' || !data.authenticated) {
+                    window.location.href = '/foxadmin';
+                }
+            } catch (err) {
+                console.error('[Fox Admin] 登录状态检查失败:', err);
+            }
+        }
+         checkAuth();
     </script>
 </body>
 </html>

package/lib/firewall.html

@@ -428,14 +428,19 @@
             }
 
             container.innerHTML = firewallStatus.rules.map((rule, index) => {
-                const isAllow = rule.action === 'allow' || rule.includes('ALLOW');
+                const isAllow = rule.action === 'allow';
+                const portInfo = rule.port ? `${rule.port}/${rule.protocol || 'tcp'}` : (rule.raw || '未知');
+                const ipInfo = rule.ip ? `来自: ${rule.ip}` : '';
+                
                 return `
                     <div class="rule-item">
                         <div class="rule-info">
                             <span class="rule-action ${isAllow ? 'rule-allow' : 'rule-deny'}">
-                                ${isAllow ? 'ALLOW' : 'DENY'}
+                                ${isAllow ? '允许' : '拒绝'}
+                            </span>
+                            <span class="rule-detail">
+                                端口: ${portInfo} ${ipInfo}
                             </span>
-                            <span class="rule-detail">${typeof rule === 'string' ? rule : JSON.stringify(rule)}</span>
                         </div>
                     </div>
                 `;
@@ -508,6 +513,24 @@
                 return;
             }
 
+            const currentPort = window.location.port || (window.location.protocol === 'https:' ? '443' : '80');
+            const currentProtocol = window.location.protocol === 'https:' ? 'tcp' : 'tcp';
+            
+            if (action === 'deny' && port == currentPort && protocol === currentProtocol) {
+                if (!ip) {
+                    if (!confirm('警告：您正在拒绝当前访问的端口（' + port + '/' + protocol + '），这将导致您无法继续访问管理界面！\n\n确定要继续吗？')) {
+                        return;
+                    }
+                } else {
+                    const currentIP = window.location.hostname;
+                    if (isValidIP(currentIP) && currentIP === ip) {
+                        if (!confirm('警告：您正在拒绝当前 IP（' + ip + '）访问端口（' + port + '/' + protocol + '），这将导致您无法继续访问管理界面！\n\n确定要继续吗？')) {
+                            return;
+                        }
+                    }
+                }
+            }
+
             btn.disabled = true;
             btn.textContent = '添加中...';
 
@@ -560,7 +583,7 @@
         async function logout() {
             if (confirm('确定要退出登录吗？')) {
                 await fetch('/foxcontrol_api/admin/logout', { method: 'POST' });
-                window.location.href = '..';
+                window.location.href = '/foxadmin';
             }
         }
 

package/lib/network.html

@@ -407,7 +407,7 @@
                 const data = await res.json();
 
                 if (data.status === 'success') {
-                    interfacesData = data.data.filter(iface => !iface.internal && !iface.virtual);
+                    interfacesData = data.data.filter(iface => !iface.internal);
                     renderInterfaces();
                     populateInterfaceSelect();
 
@@ -461,6 +461,18 @@
             const select = document.getElementById('interface-select');
             select.innerHTML = '<option value="">选择接口</option>' +
                 interfacesData.map(iface => `<option value="${iface.iface}">${iface.iface} (${iface.ip4 || '无 IP'})</option>`).join('');
+            
+            select.addEventListener('change', function() {
+                const selectedIface = this.value;
+                if (!selectedIface) return;
+                
+                const ifaceData = interfacesData.find(iface => iface.iface === selectedIface);
+                if (ifaceData) {
+                    document.getElementById('ip-address').value = ifaceData.ip4 || '';
+                    document.getElementById('netmask').value = ifaceData.ip4_subnet || '';
+                    document.getElementById('gateway').value = ifaceData.gateway || '';
+                }
+            });
         }
 
         function formatSpeed(bytes) {
@@ -491,26 +503,65 @@
             btn.disabled = true;
             btn.textContent = '配置中...';
 
-            try {
-                const res = await fetch('/foxcontrol_api/admin/network/config', {
-                    method: 'PUT',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({ iface, ip4, netmask, gateway, dns })
-                });
-
-                const data = await res.json();
+            const currentHost = window.location.hostname;
+            const currentPort = window.location.port || '1880';
+            const currentProtocol = window.location.protocol;
 
-                if (data.status === 'success') {
+            fetch('/foxcontrol_api/admin/network/config', {
+                method: 'PUT',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ iface, ip4, netmask, gateway, dns })
+            }).then(() => {
+                if (currentHost === ip4) {
                     showAlert('网络配置已更新！', 'success');
                     setTimeout(loadInterfaces, 2000);
-                } else {
-                    throw new Error(data.message || '配置失败');
+                    btn.disabled = false;
+                    btn.textContent = '应用配置';
                 }
-            } catch (err) {
-                showAlert('配置失败: ' + err.message, 'error');
-            } finally {
-                btn.disabled = false;
-                btn.textContent = '应用配置';
+            }).catch(() => {
+                if (currentHost === ip4) {
+                    showAlert('网络配置已更新！', 'success');
+                    setTimeout(loadInterfaces, 2000);
+                    btn.disabled = false;
+                    btn.textContent = '应用配置';
+                }
+            });
+
+            if (currentHost !== ip4) {
+                showAlert(`网络配置正在应用，5秒后开始检测新地址...`, 'success');
+                
+                setTimeout(async () => {
+                    showAlert(`正在检测新地址: http://${ip4}:${currentPort}/foxadmin/`, 'success');
+                    
+                    let checkCount = 0;
+                    const maxChecks = 30;
+                    const checkInterval = 2000;
+                    
+                    const checkNewIP = setInterval(async () => {
+                        checkCount++;
+                        
+                        try {
+                            const testRes = await fetch(`${currentProtocol}//${ip4}:${currentPort}/foxcontrol_api/admin/check-auth`, {
+                                mode: 'no-cors',
+                                cache: 'no-cache',
+                                signal: AbortSignal.timeout(3000)
+                            });
+                            
+                            clearInterval(checkInterval);
+                            showAlert(`新地址已可用！正在跳转到: http://${ip4}:${currentPort}/foxadmin/`, 'success');
+                            
+                            setTimeout(() => {
+                                window.location.href = `${currentProtocol}//${ip4}:${currentPort}/foxadmin/`;
+                            }, 2000);
+                            
+                        } catch (err) {
+                            if (checkCount >= maxChecks) {
+                                clearInterval(checkInterval);
+                                showAlert(`检测超时，请手动访问新地址: http://${ip4}:${currentPort}/foxadmin/`, 'success');
+                            }
+                        }
+                    }, checkInterval);
+                }, 5000);
             }
         }
 
@@ -538,7 +589,7 @@
         async function logout() {
             if (confirm('确定要退出登录吗？')) {
                 await fetch('/foxcontrol_api/admin/logout', { method: 'POST' });
-                window.location.href = '..';
+                window.location.href = '/foxadmin';
             }
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-fox-admin",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Fox Control 系统管理控制台，支持设备管理、网络配置、防火墙管理",
   "main": "index.js",
   "scripts": {