cwx/op-packages
1
0 Fork 0
mirror of https://github.com/kiddin9/op-packages.git synced 2026-11-14 20:48:17 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

🐶 Sync 2026-11-13 02:35:39

Browse Source
This commit is contained in:
github-actions[bot] committed 2026-11-13 02:35:39 +08:00
1 parent ba3675b9f3
commit 900ce0fdde
88 files changed
+2145 -1509
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

luci-app-flowproxy/htdocs/luci-static/resources/view/flowproxy/flowproxy.js
+90 -23
View File
@@ -200,6 +200,24 @@ return L.view.extend({
o.default = '0';
o.rmempty = false;
o = s.taboption('settings', form.Value, 'monitor_interval', _('Probe interval (seconds)'));
o.datatype = 'and(uinteger,min(2))';
o.default = '5';
o.rmempty = false;
o.depends('monitor_enabled', '1');
o = s.taboption('settings', form.Value, 'monitor_fail_threshold', _('Failure threshold'));
o.datatype = 'and(uinteger,min(1))';
o.default = '3';
o.rmempty = false;
o.depends('monitor_enabled', '1');
o = s.taboption('settings', form.Value, 'monitor_recover_threshold', _('Recovery threshold'));
o.datatype = 'and(uinteger,min(1))';
o.default = '2';
o.rmempty = false;
o.depends('monitor_enabled', '1');
o = s.taboption('settings', form.Value, 'proxy_server_ip_addr', _('Proxy server IP address'));
o.datatype = 'ip4addr'; o.rmempty = true;
o.placeholder = '192.168.1.254';
@@ -208,9 +226,9 @@ return L.view.extend({
var enabled = s.formvalue('global', 'enabled') || uci.get('flowproxy', 'global', 'enabled');
if (enabled === '1') {
var ipVal = s.formvalue('global', 'proxy_server_ip_addr') || uci.get('flowproxy', 'global', 'proxy_server_ip_addr');
var ifaceVal = s.formvalue('global', 'interface') || uci.get('flowproxy', 'global', 'interface');
var ifaceVal = s.formvalue('global', 'interface') || uci.get('flowproxy', 'global', 'interface') || 'auto';
if (ipVal && ifaceVal) {
if (ipVal) {
var ipInCidr = function(ipStr, cidrStr) {
if (!cidrStr || cidrStr.indexOf(':') !== -1 || !ipStr || ipStr.indexOf(':') !== -1) return false;
var parts = cidrStr.split('/');
@@ -231,30 +249,69 @@ return L.view.extend({
return (ipNum & mask) === (cidrNum & mask);
};
var target_iface = null;
for (var i = 0; i < ifaces.length; i++) {
var dev = ifaces[i].getL3Device() || ifaces[i].getDevice();
if ((dev && dev.getName() === ifaceVal) || ifaces[i].getName() === ifaceVal) {
target_iface = ifaces[i];
break;
if (ifaceVal === 'auto') {
var allIps = [];
for (var i = 0; i < ifaces.length; i++) {
if (ifaces[i].getName() === 'loopback') continue;
var netIps = ifaces[i].getIPAddrs ? ifaces[i].getIPAddrs() : [];
for (var k = 0; k < netIps.length; k++) {
if (allIps.indexOf(netIps[k]) === -1) allIps.push(netIps[k]);
}
}
}
if (target_iface) {
var ips = target_iface.getIPAddrs();
if (ips && ips.length > 0) {
var inSubnet = false;
for (var j = 0; j < ips.length; j++) {
if (ipInCidr(ipVal, ips[j])) {
inSubnet = true;
for (var dIdx = 0; dIdx < devices.length; dIdx++) {
if (devices[dIdx].getName() === 'lo') continue;
var devIps = devices[dIdx].getIPAddrs ? devices[dIdx].getIPAddrs() : [];
for (var dk = 0; dk < devIps.length; dk++) {
if (allIps.indexOf(devIps[dk]) === -1) allIps.push(devIps[dk]);
}
}
if (allIps.length > 0) {
var matchedAny = false;
for (var mIdx = 0; mIdx < allIps.length; mIdx++) {
if (ipInCidr(ipVal, allIps[mIdx])) {
matchedAny = true;
break;
}
}
if (!inSubnet) {
ui.addNotification(null, E('p', _('The proxy server IP address must be within the subnet of the selected interface (%s).').format(ips.join(', '))), 'danger');
if (!matchedAny) {
ui.addNotification(null, E('p', _('The proxy server IP address must be within a local interface subnet (%s).').format(allIps.join(', '))), 'danger');
return Promise.reject(new Error('Proxy IP subnet mismatch'));
}
}
} else {
var target_iface = null;
for (var i = 0; i < ifaces.length; i++) {
var dev = ifaces[i].getL3Device() || ifaces[i].getDevice();
if ((dev && dev.getName() === ifaceVal) || ifaces[i].getName() === ifaceVal) {
target_iface = ifaces[i];
break;
}
}
if (!target_iface) {
for (var dIdx2 = 0; dIdx2 < devices.length; dIdx2++) {
if (devices[dIdx2].getName() === ifaceVal) {
target_iface = devices[dIdx2];
break;
}
}
}
if (target_iface && target_iface.getIPAddrs) {
var ips = target_iface.getIPAddrs();
if (ips && ips.length > 0) {
var inSubnet = false;
for (var j = 0; j < ips.length; j++) {
if (ipInCidr(ipVal, ips[j])) {
inSubnet = true;
break;
}
}
if (!inSubnet) {
ui.addNotification(null, E('p', _('The proxy server IP address must be within the subnet of the selected interface (%s).').format(ips.join(', '))), 'danger');
return Promise.reject(new Error('Proxy IP subnet mismatch'));
}
}
}
}
}
}
@@ -265,12 +322,22 @@ return L.view.extend({
o.datatype = 'port'; o.default = '5353'; o.rmempty = false;
o = s.taboption('settings', form.ListValue, 'interface', _('Proxy server interface'));
o.value('auto', _('Auto detect'));
devices.forEach(function(d) { o.value(d.getName(), d.getName()); });
o.default = 'br-lan';
o.default = 'auto';
o.rmempty = false;
s.taboption('settings', form.Value, 'traffic_mark', _('Traffic Mark')).datatype = 'or(uinteger, hex)';
s.taboption('settings', form.Value, 'routing_table', _('Routing Table ID')).datatype = 'and(uinteger,range(1, 4294967295))';
s.taboption('settings', form.Value, 'rule_priority', _('Rule Priority')).datatype = 'and(uinteger,range(0, 4294967295))';
o = s.taboption('settings', form.Value, 'traffic_mark', _('Traffic Mark'));
o.datatype = 'or(uinteger, hex)';
o.default = '0x666';
o = s.taboption('settings', form.Value, 'routing_table', _('Routing Table ID'));
o.datatype = 'and(uinteger,range(1, 4294967295))';
o.default = '888';
o = s.taboption('settings', form.Value, 'rule_priority', _('Rule Priority'));
o.datatype = 'and(uinteger,range(0, 4294967295))';
o.default = '10000';
// --- Rules ---
var nftsets = uci.sections('flowproxy', 'nftset').map(function(ss) { return '@' + ss['.name']; });