zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-homeproxy: sync upstream

Browse Source 
last commit: c0982121f4
This commit is contained in:
sbwml 2024-09-05 00:30:06 +08:00
parent 44a77873ee
commit 354fa04644
7 changed files with 592 additions and 579 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
luci-app-homeproxy/Makefile
View File

@ -20,7 +20,6 @@ define Package/luci-app-homeproxy/conffiles
/etc/homeproxy/ruleset/ /etc/homeproxy/ruleset/
/etc/homeproxy/resources/direct_list.txt /etc/homeproxy/resources/direct_list.txt
/etc/homeproxy/resources/proxy_list.txt /etc/homeproxy/resources/proxy_list.txt
/etc/homeproxy/cache.db
endef endef
include $(TOPDIR)/feeds/luci/luci.mk include $(TOPDIR)/feeds/luci/luci.mk

5
luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js
View File

@ -324,6 +324,11 @@ return view.extend({
so.default = so.disabled; so.default = so.disabled;
so.rmempty = false; so.rmempty = false;
so = ss.option(form.ListValue, 'domain_strategy', _('Domain strategy'),
_('If set, the requested domain name will be resolved to IP before routing.'));
for (var i in hp.dns_strategy)
so.value(i, hp.dns_strategy[i])
so = ss.option(form.Flag, 'sniff_override', _('Override destination'), so = ss.option(form.Flag, 'sniff_override', _('Override destination'),
_('Override the connection destination address with the sniffed domain.')); _('Override the connection destination address with the sniffed domain.'));
so.default = so.enabled; so.default = so.enabled;

2
luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/node.js
View File

@ -1286,7 +1286,7 @@ return view.extend({
s.tab('subscription', _('Subscriptions')); s.tab('subscription', _('Subscriptions'));
o = s.taboption('subscription', form.Flag, 'auto_update', _('Auto update'), o = s.taboption('subscription', form.Flag, 'auto_update', _('Auto update'),
_('Auto update subscriptions.')); _('Auto update subscriptions and geodata.'));
o.default = o.disabled; o.default = o.disabled;
o.rmempty = false; o.rmempty = false;

604
luci-app-homeproxy/po/templates/homeproxy.pot
View File

File diff suppressed because it is too large Load Diff

544
luci-app-homeproxy/po/zh_Hans/homeproxy.po
View File

File diff suppressed because it is too large Load Diff

2
luci-app-homeproxy/root/etc/homeproxy/scripts/firewall_post.ut
View File

@ -380,7 +380,7 @@ chain homeproxy_mangle_lanac {
{% if (control_info.listen_interfaces): %} {% if (control_info.listen_interfaces): %}
meta iifname != {{ array_to_nftarr(split(join(' ', control_info.listen_interfaces) + ' lo', ' ')) }} counter return meta iifname != {{ array_to_nftarr(split(join(' ', control_info.listen_interfaces) + ' lo', ' ')) }} counter return
{% endif %} {% endif %}
meta iifname != io udp dport 53 counter return meta iifname != lo udp dport 53 counter return
meta mark {{ self_mark }} counter return meta mark {{ self_mark }} counter return
{% if (control_info.lan_proxy_mode === 'listed_only'): %} {% if (control_info.lan_proxy_mode === 'listed_only'): %}

13
luci-app-homeproxy/root/etc/homeproxy/scripts/generate_client.uc
View File

@ -49,7 +49,7 @@ else
const dns_port = uci.get(uciconfig, uciinfra, 'dns_port') || '5333'; const dns_port = uci.get(uciconfig, uciinfra, 'dns_port') || '5333';
let main_node, main_udp_node, dedicated_udp_node, default_outbound, sniff_override = '1', let main_node, main_udp_node, dedicated_udp_node, default_outbound, domain_strategy, sniff_override = '1',
dns_server, dns_default_strategy, dns_default_server, dns_disable_cache, dns_disable_cache_expire, dns_server, dns_default_strategy, dns_default_server, dns_disable_cache, dns_disable_cache_expire,
dns_independent_cache, dns_client_subnet, direct_domain_list, proxy_domain_list; dns_independent_cache, dns_client_subnet, direct_domain_list, proxy_domain_list;
@ -80,6 +80,7 @@ if (routing_mode !== 'custom') {
/* Routing settings */ /* Routing settings */
default_outbound = uci.get(uciconfig, uciroutingsetting, 'default_outbound') || 'nil'; default_outbound = uci.get(uciconfig, uciroutingsetting, 'default_outbound') || 'nil';
domain_strategy = uci.get(uciconfig, uciroutingsetting, 'domain_strategy');
sniff_override = uci.get(uciconfig, uciroutingsetting, 'sniff_override'); sniff_override = uci.get(uciconfig, uciroutingsetting, 'sniff_override');
} }
@ -489,6 +490,7 @@ push(config.inbounds, {
udp_timeout: udp_timeout ? (udp_timeout + 's') : null, udp_timeout: udp_timeout ? (udp_timeout + 's') : null,
sniff: true, sniff: true,
sniff_override_destination: (sniff_override === '1'), sniff_override_destination: (sniff_override === '1'),
domain_strategy: domain_strategy,
set_system_proxy: false set_system_proxy: false
}); });
@ -500,7 +502,8 @@ if (match(proxy_mode, /redirect/))
listen: '::', listen: '::',
listen_port: int(redirect_port), listen_port: int(redirect_port),
sniff: true, sniff: true,
sniff_override_destination: (sniff_override === '1') sniff_override_destination: (sniff_override === '1'),
domain_strategy: domain_strategy,
}); });
if (match(proxy_mode, /tproxy/)) if (match(proxy_mode, /tproxy/))
push(config.inbounds, { push(config.inbounds, {
@ -512,7 +515,8 @@ if (match(proxy_mode, /tproxy/))
network: 'udp', network: 'udp',
udp_timeout: udp_timeout ? (udp_timeout + 's') : null, udp_timeout: udp_timeout ? (udp_timeout + 's') : null,
sniff: true, sniff: true,
sniff_override_destination: (sniff_override === '1') sniff_override_destination: (sniff_override === '1'),
domain_strategy: domain_strategy,
}); });
if (match(proxy_mode, /tun/)) if (match(proxy_mode, /tun/))
push(config.inbounds, { push(config.inbounds, {
@ -530,6 +534,7 @@ if (match(proxy_mode, /tun/))
stack: tcpip_stack, stack: tcpip_stack,
sniff: true, sniff: true,
sniff_override_destination: (sniff_override === '1'), sniff_override_destination: (sniff_override === '1'),
domain_strategy: domain_strategy,
}); });
/* Inbound end */ /* Inbound end */
@ -668,7 +673,7 @@ if (routing_mode === 'custom') {
config.experimental = { config.experimental = {
cache_file: { cache_file: {
enabled: true, enabled: true,
path: HP_DIR + '/cache.db', path: RUN_DIR + '/cache.db',
store_rdrc: (cache_file_store_rdrc === '1') || null, store_rdrc: (cache_file_store_rdrc === '1') || null,
rdrc_timeout: cache_file_rdrc_timeout rdrc_timeout: cache_file_rdrc_timeout
} }