i11th/ruantiblock_openwrt
1
0
Fork 0
mirror of https://github.com/gSpotx2f/ruantiblock_openwrt.git synced 2026-05-15 07:00:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

v1.3. New options: full proxy mode, downloading blacklist through proxy.

Browse Source
This commit is contained in:
gSpot
2023-08-29 17:43:52 +03:00
parent c8e8832a3d
commit 46944b8c3f
14 changed files with 146 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
luci-app-ruantiblock/Makefile
+1 -1
View File
@@ -4,7 +4,7 @@
include $(TOPDIR)/rules.mk
PKG_VERSION:=1.2-3
PKG_VERSION:=1.3-0
LUCI_TITLE:=LuCI support for ruantiblock
LUCI_DEPENDS:=+ruantiblock
LUCI_PKGARCH:=all
luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/info.js
+1 -2
View File
@@ -47,7 +47,6 @@ return view.extend({
if(data.rules.nftables && data.rules.nftables.length > 1) {
for(let i of data.rules.nftables) {
if(!i.rule) continue;
let set, bytes;
i.rule.expr.forEach(e => {
if(e.match && e.match.left && e.match.left.payload) {
@@ -287,7 +286,7 @@ return view.extend({
'class' : 'td left',
'data-title': _('Match-set'),
}, set + ((set.length >= 1) ? (
' (' + set.replace(/^c/, 'CIDR').replace(/^i/, 'IP').replace(/^d/, 'dnsmasq').replace(/^bi/, 'bypass IP').replace(/^bd/, 'bypass dnsmasq') + ')'
' (' + set.replace(/^c/, 'CIDR').replace(/^i/, 'IP').replace(/^d/, 'dnsmasq').replace(/^bi/, 'bypass IP').replace(/^bd/, 'bypass dnsmasq').replace(/^fproxy/, 'full proxy') + ')'
) : '')),
E('td', {
'class' : 'td left',
luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/settings.js
+19 -1
View File
@@ -162,7 +162,18 @@ return view.extend({
// ALLOWED_HOSTS_LIST
o = s.taboption('main_settings', form.DynamicList, 'allowed_hosts_list',
_('IP addresses of hosts'));
_('IP addresses for host filter'));
o.datatype = "ip4addr";
// ENABLE_FPROXY
o = s.taboption('main_settings', form.Flag, 'enable_fproxy',
_('Enable full proxy mode'));
o.description = _('All traffic of the specified hosts passes through the proxy, without a blacklist');
o.rmempty = false;
// FPROXY_LIST
o = s.taboption('main_settings', form.DynamicList, 'fproxy_list',
_('IP addresses for full proxy mode'));
o.datatype = "ip4addr";
@@ -254,6 +265,13 @@ return view.extend({
Object.entries(this.parsers).forEach(
e => bllist_module.value(e[1], e[0]));
// ENABLE_BLLIST_PROXY
o = s.taboption('blacklist_tab', form.Flag, 'enable_bllist_proxy',
_('Downloading a blacklist via proxy'), _('Turn on if blacklist source is blocked'));
o.rmempty = false;
o.default = 0;
o.depends({ bllist_preset: '', '!reverse': true });
// ADD_USER_ENTRIES
o = s.taboption('blacklist_tab', form.Flag, 'add_user_entries',
_('Enable user entries'), _("Add user entries to the blacklist when updating"));
luci-app-ruantiblock/po/ru/ruantiblock.po
+17 -2
View File
@@ -31,6 +31,9 @@ msgstr "Все записи, кроме соответствующих шабл
msgid "All hosts except listed"
msgstr "Все хосты, кроме перечисленных"
msgid "All traffic of the specified hosts passes through the proxy, without a blacklist"
msgstr "Весь трафик указанных хостов проходит через прокси, без применения блэклиста"
msgid "Allows you to limit the hosts that are allowed to bypass blocking"
msgstr "Позволяет ограничить хосты, которым разрешено обходить блокировки"
@@ -110,6 +113,9 @@ msgstr "Ошибка загрузки"
msgid "Download log"
msgstr "Скачать лог"
msgid "Downloading a blacklist via proxy"
msgstr "Скачивать блэклист через прокси"
msgid "Edit"
msgstr "Изменить"
@@ -128,6 +134,9 @@ msgstr "Включить IP фильтр"
msgid "Enable exclusion list"
msgstr "Включить список исключений"
msgid "Enable full proxy mode"
msgstr "Включить режим полного прокси"
msgid "Enable user entries"
msgstr "Включить записи пользователя"
@@ -176,8 +185,11 @@ msgstr "Если от источника получено меньше указ
msgid "IP address"
msgstr "IP-адрес"
msgid "IP addresses of hosts"
msgstr "IP-адреса хостов"
msgid "IP addresses for full proxy mode"
msgstr "IP-адреса для режима полного прокси"
msgid "IP addresses for host filter"
msgstr "IP-адреса для фильтра хостов"
msgid "IP filter"
msgstr "Фильтр IP"
@@ -437,6 +449,9 @@ msgstr "TCP порт прозрачного прокси"
msgid "Transparent proxy UDP port"
msgstr "UDP порт прозрачного прокси"
msgid "Turn on if blacklist source is blocked"
msgstr "Включите, если источник блэклиста заблокирован"
msgid "Type an expression..."
msgstr "Введите выражение..."
luci-app-ruantiblock/po/templates/ruantiblock.pot
+17 -1
View File
@@ -19,6 +19,9 @@ msgstr ""
msgid "All hosts except listed"
msgstr ""
msgid "All traffic of the specified hosts passes through the proxy, without a blacklist"
msgstr ""
msgid "Apply"
msgstr ""
@@ -94,6 +97,10 @@ msgstr ""
msgid "Download log"
msgstr ""
msgid "Downloading a blacklist via proxy"
msgstr ""
msgid "Edit"
msgstr ""
@@ -111,6 +118,9 @@ msgstr ""
msgid "Enable exclusion list"
msgstr ""
msgid "Enable full proxy mode"
msgstr ""
msgid "Enable user entries"
msgstr ""
@@ -159,7 +169,10 @@ msgstr ""
msgid "IP address"
msgstr ""
msgid "IP addresses of hosts"
msgid "IP addresses for full proxy mode"
msgstr ""
msgid "IP addresses for host filter"
msgstr ""
msgid "IP filter"
@@ -401,6 +414,9 @@ msgstr ""
msgid "Transparent proxy UDP port"
msgstr ""
msgid "Turn on if blacklist source is blocked"
msgstr ""
msgid "Type an expression..."
msgstr ""
msgid "Unable to execute or read contents"