Skip to content

fix(client): make ACL domain lists take effect reliably #641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lsr00ter wants to merge 1 commit into
base: dev
Choose a base branch
from
+22 −2
Open

fix(client): make ACL domain lists take effect reliably #641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions htdocs/luci-static/resources/view/homeproxy/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1492,12 +1492,15 @@ return view.extend({
}, {});
}
so.write = function(_section_id, value) {
uci.set('homeproxy', 'control', 'proxy_domain_list_checksum', hp.calcStringMD5(value || ''));
return callWriteDomainList('proxy_list', value);
}
so.remove = function(/* ... */) {
let routing_mode = this.section.formvalue('config', 'routing_mode');
if (routing_mode !== 'custom')
if (routing_mode !== 'custom') {
uci.set('homeproxy', 'control', 'proxy_domain_list_checksum', hp.calcStringMD5(''));
return callWriteDomainList('proxy_list', '');
}
return true;
}
so.validate = function(section_id, value) {
Expand All @@ -1524,12 +1527,15 @@ return view.extend({
}, {});
}
so.write = function(_section_id, value) {
uci.set('homeproxy', 'control', 'direct_domain_list_checksum', hp.calcStringMD5(value || ''));
return callWriteDomainList('direct_list', value);
}
so.remove = function(/* ... */) {
let routing_mode = this.section.formvalue('config', 'routing_mode');
if (routing_mode !== 'custom')
if (routing_mode !== 'custom') {
uci.set('homeproxy', 'control', 'direct_domain_list_checksum', hp.calcStringMD5(''));
return callWriteDomainList('direct_list', '');
}
return true;
}
so.validate = function(section_id, value) {
Expand Down
8 changes: 8 additions & 0 deletions root/etc/homeproxy/scripts/generate_client.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,6 +833,14 @@ if (!isEmpty(main_node)) {
outbound: 'main-udp-out'
});

/* Proxy list */
if (length(proxy_domain_list))
push(config.route.rules, {
rule_set: 'proxy-domain',
action: 'route',
outbound: 'main-out'
});

config.route.final = 'main-out';

/* Rule set */
Expand Down
6 changes: 6 additions & 0 deletions root/etc/init.d/homeproxy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,12 @@ start_service() {
sed -r -e '/^\s*$/d' -e "s/(.*)/server=\/\1\/127.0.0.1#$dns_port\nnftset=\/\1\\/4#inet#fw4#homeproxy_wan_proxy_addr_v4$wan_nftset_v6/g" \
"$HP_DIR/resources/proxy_list.txt" > "$DNSMASQ_DIR/proxy_list.conf"
fi
if [ "$routing_mode" != "custom" ] && [ -s "$HP_DIR/resources/direct_list.txt" ]; then
local wan_nftset_v6
[ "$ipv6_support" -eq "0" ] || wan_nftset_v6=",6#inet#fw4#homeproxy_wan_direct_addr_v6"
sed -r -e '/^\s*$/d' -e "s/(.*)/server=\/\1\/127.0.0.1#$dns_port\nnftset=\/\1\\/4#inet#fw4#homeproxy_wan_direct_addr_v4$wan_nftset_v6/g" \
"$HP_DIR/resources/direct_list.txt" > "$DNSMASQ_DIR/direct_list.conf"
fi
/etc/init.d/dnsmasq restart >"/dev/null" 2>&1

# Setup routing table
Expand Down