# in the first position of the line - comments on the line.128[.]199[.]0[.]0/16
34[.]217[.]90[.]52
162[.]13[.]190[.]'
-);
-
-let fqdn_filter_edit = new tools.file_edit_dialog(
- tools.fqdn_filter_file,
- _('FQDN filter'),
- _('Patterns can be strings or regular expressions. Each pattern in a separate line, the symbol # in the first position of the line - comments on the line.poker
[ck]?a[sz]ino?
[vw]ulkan
slots?'
-);
-
-let user_entries_edit = new tools.file_edit_dialog(
- tools.user_entries_file,
- _('User entries'),
- _('One entry (IP, CIDR or FQDN) per line. In the FQDN records, you can specify the DNS server for resolving this domain (separated by a space). You can also comment on lines (# is the first character of a line).#comment
domain.net
sub.domain.com 8.8.8.8
sub.domain.com 8.8.8.8#53
74.125.131.19
74.125.0.0/16'
-);
-
-let torrc_edit = new tools.file_edit_dialog(
- tools.torrc_file,
- _('Tor configuration file'),
- null,
- function(rc) {
- return fs.exec('/etc/init.d/tor', [ 'enabled' ]).then(res => {
- if(res.code === 0) {
- return fs.exec('/etc/init.d/tor', [ 'restart' ]);
- };
- }).catch(e => {
- ui.addNotification(null, E('p', _('Unable to execute or read contents')
- + ': %s# in the first position of the line - comments on the line.128[.]199[.]0[.]0/16
34[.]217[.]90[.]52
162[.]13[.]190[.]'
+ );
- // USE_LOGGER
- o = s.taboption('main_settings', form.Flag, 'use_logger',
- _('Logging events'));
- o.rmempty = false;
- o.default = 1;
+ let fqdn_filter_edit = new tools.fileEditDialog(
+ tools.fqdnFilterFile,
+ _('FQDN filter'),
+ _('Patterns can be strings or regular expressions. Each pattern in a separate line, the symbol # in the first position of the line - comments on the line.poker
[ck]?a[sz]ino?
[vw]ulkan
slots?'
+ );
- // DEF_TOTAL_PROXY
- o = s.taboption('main_settings', form.Flag, 'def_total_proxy',
- _("Enable the 'total-proxy' option at startup"));
- o.rmempty = false;
- o.default = 0;
- o.depends('proxy_local_clients', '0');
+ let user_entries_edit = new tools.fileEditDialog(
+ tools.userEntriesFile,
+ _('User entries'),
+ _('One entry (IP, CIDR or FQDN) per line. In the FQDN records, you can specify the DNS server for resolving this domain (separated by a space). You can also comment on lines (# is the first character of a line).#comment
domain.net
sub.domain.com 8.8.8.8
sub.domain.com 8.8.8.8#53
74.125.131.19
74.125.0.0/16'
+ );
- // IPSET_CLEAR_SETS
- o = s.taboption('main_settings', form.Flag, 'ipset_clear_sets',
- _('Clean up ipsets before updating blacklist'));
- o.description = _('Reduces RAM consumption during update');
- o.rmempty = false;
- o.default = 0;
+ let torrc_edit = new tools.fileEditDialog(
+ tools.torrcFile,
+ _('Tor configuration file'),
+ null,
+ function(rc) {
+ return tools.getInitStatus('tor').then(res => {
+ if(res) {
+ return tools.handleServiceAction('tor', 'restart');
+ };
+ });
+ }
+ );
+
+ let m, s, o;
+
+ m = new form.Map(tools.appName, _('Ruantiblock') + ' - ' + _('Settings'));
+
+ s = m.section(form.NamedSection, 'config');
+ s.anonymous = true;
+ s.addremove = false;
+
+ /* Main settings tab */
+
+ s.tab('main_settings', _('Main settings'));
+
+ // PROXY_MODE
+ if(this.appStatusCode == 1 || this.appStatusCode == 2) {
+ o = s.taboption('main_settings', form.ListValue, 'proxy_mode',
+ _('Proxy mode'));
+ o.value('1', 'Tor');
+ o.value('2', 'VPN');
+ };
+
+ // PROXY_LOCAL_CLIENTS
+ let proxy_local_clients = s.taboption('main_settings', form.Flag, 'proxy_local_clients',
+ _("Apply proxy rules to router application traffic"));
+ proxy_local_clients.rmempty = false;
+
+ // USE_LOGGER
+ o = s.taboption('main_settings', form.Flag, 'use_logger',
+ _('Logging events'));
+ o.rmempty = false;
+
+ // DEF_TOTAL_PROXY
+ o = s.taboption('main_settings', form.Flag, 'def_total_proxy',
+ _("Enable the 'total-proxy' option at startup"));
+ o.rmempty = false;
+ o.default = 0;
+ o.depends('proxy_local_clients', '0');
+
+ // IPSET_CLEAR_SETS
+ o = s.taboption('main_settings', form.Flag, 'ipset_clear_sets',
+ _('Clean up ipsets before updating blacklist'));
+ o.description = _('Reduces RAM consumption during update');
+ o.rmempty = false;
- if(this.app_status_code == 1 || this.app_status_code == 2) {
- /* Tor tab */
+ if(this.appStatusCode == 1 || this.appStatusCode == 2) {
+ /* Tor tab */
- s.tab('tor_settings', _('Tor mode'));
+ s.tab('tor_settings', _('Tor mode'));
- // IF_LAN
- o = s.taboption('tor_settings', widgets.DeviceSelect, 'if_lan',
- _('LAN interface'));
- o.multiple = false;
- o.noaliases = true;
- o.rmempty = false;
- o.default = lan_iface;
+ // IF_LAN
+ o = s.taboption('tor_settings', widgets.DeviceSelect, 'if_lan',
+ _('LAN interface'));
+ o.multiple = false;
+ o.noaliases = true;
+ o.rmempty = false;
+ o.default = lan_iface;
- // TOR_TRANS_PORT
- o = s.taboption('tor_settings', form.Value, 'tor_trans_port',
- _('Transparent proxy port for iptables rules'));
- o.rmempty = false;
- o.datatype = "port";
- o.default = '9040';
+ // TOR_TRANS_PORT
+ o = s.taboption('tor_settings', form.Value, 'tor_trans_port',
+ _('Transparent proxy port for iptables rules'));
+ o.rmempty = false;
+ o.datatype = "port";
- // ONION_DNS_ADDR
- o = s.taboption('tor_settings', form.Value, 'onion_dns_addr',
- _("Optional DNS resolver for '.onion' zone"), 'ipaddress#port');
- o.rmempty = false;
- o.default = '127.0.0.1#9053';
- o.validate = validate_ip_port;
+ // ONION_DNS_ADDR
+ o = s.taboption('tor_settings', form.Value, 'onion_dns_addr',
+ _("Optional DNS resolver for '.onion' zone"), 'ipaddress#port');
+ o.rmempty = false;
+ o.validate = this.validateIpPort;
- // Torrc edit dialog
- o = s.taboption('tor_settings', form.Button, '_torrc_btn',
- _('Tor configuration file'));
- o.onclick = () => torrc_edit.show();
- o.inputtitle = _('Edit');
- o.inputstyle = 'edit btn';
+ // Torrc edit dialog
+ o = s.taboption('tor_settings', form.Button, '_torrc_btn',
+ _('Tor configuration file'));
+ o.onclick = () => torrc_edit.show();
+ o.inputtitle = _('Edit');
+ o.inputstyle = 'edit btn';
- /* VPN tab */
+ /* VPN tab */
- s.tab('vpn_settings', _('VPN mode'));
+ s.tab('vpn_settings', _('VPN mode'));
- // IF_VPN
- o = s.taboption('vpn_settings', widgets.DeviceSelect, 'if_vpn',
- _('VPN interface'));
- o.multiple = false;
- o.noaliases = true;
- o.rmempty = false;
- o.default = vpn_iface;
- };
+ // IF_VPN
+ o = s.taboption('vpn_settings', widgets.DeviceSelect, 'if_vpn',
+ _('VPN interface'));
+ o.multiple = false;
+ o.noaliases = true;
+ o.rmempty = false;
+ o.default = vpn_iface;
+ };
- /* Parser settings tab */
+ /* Parser settings tab */
- s.tab('parser_settings', _('Blacklist settings'));
+ s.tab('parser_settings', _('Blacklist settings'));
- // BLLIST_MODULE
- let bllist_module = s.taboption('parser_settings', form.ListValue,
- 'bllist_module', _('Blacklist module'));
- bllist_module.value("", _("user entries only"));
- available_parsers.forEach(e => bllist_module.value(e));
+ // BLLIST_MODULE
+ let bllist_module = s.taboption('parser_settings', form.ListValue,
+ 'bllist_module', _('Blacklist module'));
+ bllist_module.value('', _('none (user entries only)'));
+ Object.entries(this.availableParsers).forEach(
+ e => bllist_module.value(e[1], e[0]));
- // BLLIST_MODE
- let bllist_mode = s.taboption('parser_settings', form.ListValue,
- 'bllist_mode', _('Module operation mode'));
- bllist_mode.value('ip');
- bllist_mode.value('fqdn');
- depends_bllist_module(bllist_mode);
+ // BLLIST_MODE
+ let bllist_mode = s.taboption('parser_settings', form.ListValue,
+ 'bllist_mode', _('Module operation mode'));
+ bllist_mode.value('ip');
+ bllist_mode.value('fqdn');
- // BLLIST_SOURCE
- let bllist_source = s.taboption('parser_settings', form.ListValue,
- 'bllist_source', _('Blacklist source'));
- bllist_source.description = _("Options") + ':';
- for(let [k, v] of Object.entries(tools.blacklist_sources)) {
- bllist_source.value(k);
- bllist_source.description += `192.168.1.';
- o.placeholder = _('e.g:') + ' 192.168.1.';
- o.default = '';
+ // OPT_EXCLUDE_NETS
+ o = s.taboption('parser_settings', form.DynamicList, 'opt_exclude_nets');
+ o.title = _('IP subnet patterns (/24) that are excluded from optimization');
+ o.description = _('e.g:') + ' 192.168.1.';
+ o.placeholder = _('e.g:') + ' 192.168.1.';
+ o.validate = (section, value) => {
+ return (/^$|^([0-9]{1,3}[.]){3}$/.test(value)) ? true : _('Expecting:')
+ + ' ' + _('net pattern') + ' (' + _('e.g:') + ' 192.168.3.)\n';
+ };
- depends_bllist_module(o);
+ // SUMMARIZE_IP
+ o = s.taboption('parser_settings', form.Flag, 'summarize_ip',
+ _("Summarize IP ranges"));
+ o.rmempty = false;
- // SUMMARIZE_IP
- o = s.taboption('parser_settings', form.Flag, 'summarize_ip',
- _("Summarize IP ranges"));
- o.rmempty = false;
- o.default = 0;
- depends_bllist_module(o);
+ // SUMMARIZE_CIDR
+ o = s.taboption('parser_settings', form.Flag, 'summarize_cidr',
+ _("Summarize '/24' networks"));
+ o.rmempty = false;
- // SUMMARIZE_CIDR
- o = s.taboption('parser_settings', form.Flag, 'summarize_cidr',
- _("Summarize '/24' networks"));
- o.rmempty = false;
- o.default = 0;
- depends_bllist_module(o);
+ o = s.taboption('parser_settings', this.CBIBlockTitle, '_dummy_fqdn');
+ o.string = _('FQDN configuration') + ':';
- o = s.taboption('parser_settings', CBIBlockTitle, '_dummy_fqdn');
- o.string = _('FQDN configuration') + ':';
- depends_bllist_module(o);
+ // SD_LIMIT
+ o = s.taboption('parser_settings', form.Value, 'sd_limit',
+ _("Subdomains limit"));
+ o.description = _('The number of subdomains in the domain, upon reaching which the entire 2nd level domain is added to the list');
+ o.rmempty = false;
+ o.datatype = 'uinteger';
- // SD_LIMIT
- o = s.taboption('parser_settings', form.Value, 'sd_limit',
- _("Subdomains limit"));
- o.description = _('The number of subdomains in the domain, upon reaching which the entire 2nd level domain is added to the list');
- o.datatype = 'uinteger';
- o.default = '16';
- depends_bllist_module(o);
+ // OPT_EXCLUDE_SLD
+ o = s.taboption('parser_settings', form.DynamicList, 'opt_exclude_sld',
+ _('2nd level domains that are excluded from optimization'));
+ o.description = _('e.g:') + ' livejournal.com';
+ o.placeholder = _('e.g:') + ' livejournal.com';
+ o.datatype = "hostname";
- // OPT_EXCLUDE_SLD
- o = s.taboption('parser_settings', form.DynamicList, 'opt_exclude_sld',
- _('2nd level domains that are excluded from optimization'));
- o.datatype = "hostname";
- o.default = [
- 'livejournal.com',
- 'facebook.com',
- 'vk.com',
- 'blog.jp',
- 'msk.ru',
- 'net.ru',
- 'org.ru',
- 'net.ua',
- 'com.ua',
- 'org.ua',
- 'co.uk',
- 'amazonaws.com',
- ];
- depends_bllist_module(o);
+ // USE_IDN
+ o = s.taboption('parser_settings', form.Flag, 'use_idn',
+ _("Convert cyrillic domains to punycode"));
+ o.rmempty = false;
- // USE_IDN
- o = s.taboption('parser_settings', form.Flag, 'use_idn',
- _("Convert cyrillic domains to punycode"));
- o.rmempty = false;
- o.default = 0;
- depends_bllist_module(o);
+ // ALT_NSLOOKUP
+ o = s.taboption('parser_settings', form.Flag, 'alt_nslookup',
+ _('Use optional DNS resolver'));
+ o.rmempty = false;
- // ALT_NSLOOKUP
- o = s.taboption('parser_settings', form.Flag, 'alt_nslookup',
- _('Use optional DNS resolver'));
- o.rmempty = false;
- o.default = 0;
- depends_bllist_module(o);
-
- // ALT_DNS_ADDR
- o = s.taboption('parser_settings', form.Value, 'alt_dns_addr',
- _("Optional DNS resolver"), 'ipaddress[#port]');
- o.rmempty = false;
- o.depends('alt_nslookup', '1');
- o.validate = validate_ip_port;
- o.default = '8.8.8.8';
+ // ALT_DNS_ADDR
+ o = s.taboption('parser_settings', form.Value, 'alt_dns_addr',
+ _("Optional DNS resolver"), 'ipaddress[#port]');
+ o.rmempty = false;
+ o.validate = this.validateIpPort;
- /* Entries filters tab */
+ /* Blacklist entry filters tab */
- s.tab('entries_filter_tab', _('Entries filters'));
+ s.tab('entries_filter_tab', _('Blacklist entry filters'));
- // IP_FILTER
- o = s.taboption('entries_filter_tab', form.Flag, 'ip_filter',
- _("Enable IP filter"));
- o.description = _('Exclude IP addresses from blacklist by IP filter patterns');
- o.rmempty = false;
- o.default = 0;
- depends_bllist_module(o);
+ // IP_FILTER
+ o = s.taboption('entries_filter_tab', form.Flag, 'ip_filter',
+ _("Enable IP filter"));
+ o.description = _('Exclude IP addresses from blacklist by IP filter patterns');
+ o.rmempty = false;
- // IP_FILTER edit dialog
- o = s.taboption('entries_filter_tab', form.Button, '_ip_filter_btn',
- _("IP filter"));
- o.onclick = () => ip_filter_edit.show();
- o.inputtitle = _('Edit');
- o.inputstyle = 'edit btn';
- depends_bllist_module(o);
+ // IP_FILTER edit dialog
+ o = s.taboption('entries_filter_tab', form.Button, '_ip_filter_btn',
+ _("IP filter"));
+ o.onclick = () => ip_filter_edit.show();
+ o.inputtitle = _('Edit');
+ o.inputstyle = 'edit btn';
- // FQDN_FILTER
- o = s.taboption('entries_filter_tab', form.Flag, 'fqdn_filter',
- _("Enable FQDN filter"));
- o.description = _('Exclude domains from blacklist by FQDN filter patterns');
- o.rmempty = false;
- o.default = 0;
- depends_bllist_module(o);
+ // FQDN_FILTER
+ o = s.taboption('entries_filter_tab', form.Flag, 'fqdn_filter',
+ _("Enable FQDN filter"));
+ o.description = _('Exclude domains from blacklist by FQDN filter patterns');
+ o.rmempty = false;
- // FQDN_FILTER edit dialog
- o = s.taboption('entries_filter_tab', form.Button, '_fqdn_filter_btn',
- _("FQDN filter"));
- o.onclick = () => fqdn_filter_edit.show();
- o.inputtitle = _('Edit');
- o.inputstyle = 'edit btn';
- depends_bllist_module(o);
+ // FQDN_FILTER edit dialog
+ o = s.taboption('entries_filter_tab', form.Button, '_fqdn_filter_btn',
+ _("FQDN filter"));
+ o.onclick = () => fqdn_filter_edit.show();
+ o.inputtitle = _('Edit');
+ o.inputstyle = 'edit btn';
- /* User entries tab */
+ /* User entries tab */
- s.tab('user_entries_tab', _('User entries'));
+ s.tab('user_entries_tab', _('User entries'));
- // ADD_USER_ENTRIES
- o = s.taboption('user_entries_tab', form.Flag, 'add_user_entries',
- _('Enable'), _("Add user entries to the blacklist when updating"));
- o.rmempty = false;
- o.default = 0;
- depends_bllist_module(o);
+ // ADD_USER_ENTRIES
+ o = s.taboption('user_entries_tab', form.Flag, 'add_user_entries',
+ _('Enable'), _("Add user entries to the blacklist when updating"));
+ o.rmempty = false;
+ o.default = 0;
+ this.dependsBllistModule(o);
- // USER_ENTRIES_DNS
- o = s.taboption('user_entries_tab', form.Value, 'user_entries_dns',
- _("DNS server that is used for FQDN entries"), 'ipaddress[#port]');
- o.validate = validate_ip_port;
+ // USER_ENTRIES_DNS
+ o = s.taboption('user_entries_tab', form.Value, 'user_entries_dns',
+ _("DNS server that is used for FQDN entries"), 'ipaddress[#port]');
+ o.validate = this.validateIpPort;
- // USER_ENTRIES edit dialog
- o = s.taboption('user_entries_tab', form.Button, '_user_entries_btn',
- _('User entries'));
- o.onclick = () => user_entries_edit.show();
- o.inputtitle = _('Edit');
- o.inputstyle = 'edit btn';
+ // USER_ENTRIES edit dialog
+ o = s.taboption('user_entries_tab', form.Button, '_user_entries_btn',
+ _('User entries'));
+ o.onclick = () => user_entries_edit.show();
+ o.inputtitle = _('Edit');
+ o.inputstyle = 'edit btn';
+ let map_promise = m.render();
+ map_promise.then(node => node.classList.add('fade-in'));
+ return map_promise;
+ },
- let map_promise = m.render();
- map_promise.then(node => node.classList.add('fade-in'));
+ handleSaveApply: function(ev, mode) {
+ return this.handleSave(ev).then(() => {
+ ui.changes.apply(mode == '0');
- return map_promise;
- },
-
- handleSaveApply: function(ev, mode) {
- return this.handleSave(ev).then(() => {
- ui.changes.apply(mode == '0');
-
- if(this.app_status_code != 1 && this.app_status_code != 2) {
- window.setTimeout(() => fs.exec(tools.init_path, [ 'restart' ]), 3000);
- };
- });
- },
+ if(this.appStatusCode != 1 && this.appStatusCode != 2) {
+ window.setTimeout(() => tools.handleServiceAction(
+ tools.appName, 'restart'), 3000);
+ };
+ });
+ },
});
diff --git a/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/tools.js b/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/tools.js
index 48444c4..bc5896c 100644
--- a/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/tools.js
+++ b/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/tools.js
@@ -1,252 +1,291 @@
'use strict';
'require fs';
+'require rpc';
'require ui';
document.head.append(E('style', {'type': 'text/css'},
`
.label-status {
- display: inline;
- margin: 0px 2px 0px 0 !important;
- padding: 1px 4px 2px 4px;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
- font-weight: bold;
- color: #fff !important;
+ display: inline;
+ margin: 0px 2px 0px 0 !important;
+ padding: 1px 4px 2px 4px;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
+ font-weight: bold;
+ color: #fff !important;
}
.starting {
- background-color: #a7b668 !important;
+ background-color: #a7b668 !important;
}
.running {
- background-color: #2ea256 !important;
+ background-color: #2ea256 !important;
}
.updating {
- background-color: #1e82ff !important;
+ background-color: #1e82ff !important;
}
.stopped {
- background-color: #acacac !important;
+ background-color: #acacac !important;
}
.error {
- background-color: #ff4e54 !important;
+ background-color: #ff4e54 !important;
}
.total-proxy {
- background-color: #ffb937 !important;
+ background-color: #ffb937 !important;
}
`));
return L.Class.extend({
- app_name: 'ruantiblock',
- exec_path: '/usr/bin/ruantiblock',
- init_path: '/etc/init.d/ruantiblock',
- token_file: '/var/run/ruantiblock.token',
- parsers_dir: '/usr/bin',
- torrc_file: '/etc/tor/torrc',
- user_entries_file: '/etc/ruantiblock/user_entries',
- fqdn_filter_file: '/etc/ruantiblock/fqdn_filter',
- ip_filter_file: '/etc/ruantiblock/ip_filter',
- crontab_file: '/etc/crontabs/root',
- info_label_starting: '' + _('Starting') + '',
- info_label_running: '' + _('Enabled') + '',
- info_label_updating: '' + _('Updating') + '',
- info_label_stopped: '' + _('Disabled') + '',
- info_label_error: '' + _('Error') + '',
+ appName : 'ruantiblock',
+ execPath : '/usr/bin/ruantiblock',
+ tokenFile : '/var/run/ruantiblock.token',
+ parsersDir : '/usr/bin',
+ torrcFile : '/etc/tor/torrc',
+ userEntriesFile : '/etc/ruantiblock/user_entries',
+ fqdnFilterFile : '/etc/ruantiblock/fqdn_filter',
+ ipFilterFile : '/etc/ruantiblock/ip_filter',
+ crontabFile : '/etc/crontabs/root',
+ infoLabelStarting: '' + _('Starting') + '',
+ infoLabelRunning : '' + _('Enabled') + '',
+ infoLabelUpdating: '' + _('Updating') + '',
+ infoLabelStopped : '' + _('Disabled') + '',
+ infoLabelError : '' + _('Error') + '',
- blacklist_sources: {
- 'rublacklist': 'https://rublacklist.net',
- 'zapret-info': 'https://github.com/zapret-info/z-i',
- 'antifilter': 'https://antifilter.download',
- },
+ blacklistSources: {
+ 'rublacklist': 'https://rublacklist.net',
+ 'zapret-info': 'https://github.com/zapret-info/z-i',
+ 'antifilter' : 'https://antifilter.download',
+ },
- normalize_value: function(v) {
- return (v && typeof(v) === 'string') ? v.trim().replace(/\r?\n/g, '') : v;
- },
+ callInitStatus: rpc.declare({
+ object: 'luci',
+ method: 'getInitList',
+ params: [ 'name' ],
+ expect: { '': {} }
+ }),
- make_status_string: function(
- app_status_code,
- proxy_mode,
- bllist_mode,
- bllist_module,
- bllist_source,
- tp_status_code,
- vpn_route_status_code) {
- let app_status_label;
- let spinning = '';
+ callInitAction: rpc.declare({
+ object: 'luci',
+ method: 'setInitAction',
+ params: [ 'name', 'action' ],
+ expect: { result: false }
+ }),
- switch(app_status_code) {
- case 0:
- app_status_label = this.info_label_running;
- break;
- case 2:
- app_status_label = this.info_label_stopped;
- break;
- case 3:
- app_status_label = this.info_label_starting;
- spinning = ' spinning';
- break;
- case 4:
- app_status_label = this.info_label_updating;
- spinning = ' spinning';
- break;
- default:
- app_status_label = this.info_label_error;
- return `