Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-banip: sync with banIP 0.8.4-3

Browse source 
* add new option 'ban_autoallowuplink'

Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken 2023-05-02 21:46:33 +02:00
parent d9629c7f4a
commit 483229c8cf
No known key found for this signature in database
GPG key ID: 9D71CD547BFAE684
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
applications/luci-app-banip/htdocs/luci-static/resources/view/banip/overview.js
View file

@ -27,13 +27,13 @@ return view.extend({
render: function (result) { render: function (result) {
let m, s, o; let m, s, o;
m = new form.Map('banip', 'banIP', _('Configuration of the banIP package to ban incoming and outgoing ip addresses/subnets via sets in nftables. \ m = new form.Map('banip', 'banIP', _('Configuration of the banIP package to ban incoming and outgoing ip addresses/subnets via Sets in nftables. \
For further information <a href="https://github.com/openwrt/packages/blob/master/net/banip/files/README.md" target="_blank" rel="noreferrer noopener" >check the online documentation</a>')); For further information <a href="https://github.com/openwrt/packages/blob/master/net/banip/files/README.md" target="_blank" rel="noreferrer noopener" >check the online documentation</a>'));
/* /*
poll runtime information poll runtime information
*/ */
let buttons, rtRes, infStat, infVer, infElements, infFeeds, infDevices, infSubnets, infSystem, nftInfos, runInfos, infFlags, last_run let buttons, rtRes, infStat, infVer, infElements, infFeeds, infDevices, infUplink, infSystem, nftInfos, runInfos, infFlags, last_run
pollData: poll.add(function () { pollData: poll.add(function () {
return L.resolveDefault(fs.stat('/var/run/banip.lock')).then(function (stat) { return L.resolveDefault(fs.stat('/var/run/banip.lock')).then(function (stat) {
@ -69,8 +69,8 @@ return view.extend({
rtRes.activeFeeds = rtRes[i].match(/^\s+\+\sactive_feeds\s+\:\s+(.*)$/)[1]; rtRes.activeFeeds = rtRes[i].match(/^\s+\+\sactive_feeds\s+\:\s+(.*)$/)[1];
} else if (rtRes[i].match(/^\s+\+\sactive_devices\s+\:\s+(.*)$/)) { } else if (rtRes[i].match(/^\s+\+\sactive_devices\s+\:\s+(.*)$/)) {
rtRes.activeDevices = rtRes[i].match(/^\s+\+\sactive_devices\s+\:\s+(.*)$/)[1]; rtRes.activeDevices = rtRes[i].match(/^\s+\+\sactive_devices\s+\:\s+(.*)$/)[1];
} else if (rtRes[i].match(/^\s+\+\sactive_subnets\s+\:\s+(.*)$/)) { } else if (rtRes[i].match(/^\s+\+\sactive_uplink\s+\:\s+(.*)$/)) {
rtRes.activeSubnets = rtRes[i].match(/^\s+\+\sactive_subnets\s+\:\s+(.*)$/)[1]; rtRes.activeUplink = rtRes[i].match(/^\s+\+\sactive_uplink\s+\:\s+(.*)$/)[1];
} else if (rtRes[i].match(/^\s+\+\snft_info\s+\:\s+(.*)$/)) { } else if (rtRes[i].match(/^\s+\+\snft_info\s+\:\s+(.*)$/)) {
rtRes.nftInfo = rtRes[i].match(/^\s+\+\snft_info\s+\:\s+(.*)$/)[1]; rtRes.nftInfo = rtRes[i].match(/^\s+\+\snft_info\s+\:\s+(.*)$/)[1];
} else if (rtRes[i].match(/^\s+\+\srun_info\s+\:\s+(.*)$/)) { } else if (rtRes[i].match(/^\s+\+\srun_info\s+\:\s+(.*)$/)) {
@ -105,9 +105,9 @@ return view.extend({
if (infDevices) { if (infDevices) {
infDevices.textContent = rtRes.activeDevices || '-'; infDevices.textContent = rtRes.activeDevices || '-';
} }
infSubnets = document.getElementById('subnets'); infUplink = document.getElementById('uplink');
if (infSubnets) { if (infUplink) {
infSubnets.textContent = rtRes.activeSubnets || '-'; infUplink.textContent = rtRes.activeUplink || '-';
} }
nftInfos = document.getElementById('nft'); nftInfos = document.getElementById('nft');
if (nftInfos) { if (nftInfos) {
@ -172,8 +172,8 @@ return view.extend({
E('div', { 'class': 'cbi-value-field', 'id': 'devices', 'style': 'color:#37c' }, '-') E('div', { 'class': 'cbi-value-field', 'id': 'devices', 'style': 'color:#37c' }, '-')
]), ]),
E('div', { 'class': 'cbi-value' }, [ E('div', { 'class': 'cbi-value' }, [
E('label', { 'class': 'cbi-value-title', 'style': 'padding-top:0rem' }, _('Active Subnets')), E('label', { 'class': 'cbi-value-title', 'style': 'padding-top:0rem' }, _('Active Uplink')),
E('div', { 'class': 'cbi-value-field', 'id': 'subnets', 'style': 'color:#37c' }, '-') E('div', { 'class': 'cbi-value-field', 'id': 'uplink', 'style': 'color:#37c' }, '-')
]), ]),
E('div', { 'class': 'cbi-value' }, [ E('div', { 'class': 'cbi-value' }, [
E('label', { 'class': 'cbi-value-title', 'style': 'padding-top:0rem' }, _('NFT Information')), E('label', { 'class': 'cbi-value-title', 'style': 'padding-top:0rem' }, _('NFT Information')),
@ -318,7 +318,7 @@ return view.extend({
o.optional = true; o.optional = true;
o.rmempty = true; o.rmempty = true;
o = s.taboption('general', form.Flag, 'ban_deduplicate', _('Deduplicate IPs'), _('Deduplicate IP addresses across all active sets and and tidy up the local blocklist.')); o = s.taboption('general', form.Flag, 'ban_deduplicate', _('Deduplicate IPs'), _('Deduplicate IP addresses across all active Sets and and tidy up the local blocklist.'));
o.default = 1 o.default = 1
o.rmempty = false; o.rmempty = false;
@ -349,7 +349,7 @@ return view.extend({
o.optional = true; o.optional = true;
o.rmempty = true; o.rmempty = true;
o = s.taboption('advanced', form.ListValue, 'ban_filelimit', _('Max Open Files'), _('Increase the maximal number of open files, e.g. to handle the amount of temporary split files while loading the sets.')); o = s.taboption('advanced', form.ListValue, 'ban_filelimit', _('Max Open Files'), _('Increase the maximal number of open files, e.g. to handle the amount of temporary split files while loading the Sets.'));
o.value('512', _('512')); o.value('512', _('512'));
o.value('1024', _('1024 (default)')); o.value('1024', _('1024 (default)'));
o.value('2048', _('2048')); o.value('2048', _('2048'));
@ -579,6 +579,14 @@ return view.extend({
o.default = 1 o.default = 1
o.rmempty = false; o.rmempty = false;
o = s.taboption('feeds', form.ListValue, 'ban_autoallowuplink', _('Auto Allow Uplink'), _('Limit the uplink autoallow function.'));
o.value('disable', _('Disable'));
o.value('subnet', _('Subnet (default)'));
o.value('ip', _('IP'));
o.optional = true;
o.rmempty = true;
o.depends('ban_autoallowlist', '1');
o = s.taboption('feeds', form.Flag, 'ban_autoblocklist', _('Auto Blocklist'), _('Automatically transfers suspicious IPs to the banIP blocklist.')); o = s.taboption('feeds', form.Flag, 'ban_autoblocklist', _('Auto Blocklist'), _('Automatically transfers suspicious IPs to the banIP blocklist.'));
o.default = 1 o.default = 1
o.rmempty = false; o.rmempty = false;