Skip to content

fix(flashstart): allow bypasses to elude catch all #1405

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

Merged
Tbaile merged 1 commit into from
Nov 11, 2025
Merged

fix(flashstart): allow bypasses to elude catch all #1405

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
18 changes: 1 addition & 17 deletions packages/ns-flashstart/files/ns-flashstart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,24 +243,7 @@ def __sync_pro_plus_profiles():
dhcp_instances = __fetch_local_dhcp_instances()
ip_set_instances = __fetch_instanced_services('firewall', 'ipset')
redirect_instances = __fetch_instanced_services('firewall', 'redirect')

added_redirects = []
# for each zone, generate bypass redirect rule
for zone in e_uci.get('flashstart', 'global', 'zones', default=[], list=True, dtype=str):
redirect_id = f'ns_flashstart_bypass_{zone}'
if e_uci.get('firewall', redirect_id, default=None) is None:
logging.debug(f'Creating new redirect {redirect_id}')
e_uci.set('firewall', redirect_id, 'redirect')
e_uci.set('firewall', redirect_id, 'ns_flashstart', True)
e_uci.set('firewall', redirect_id, 'ns_tag', ['automated'])
e_uci.set('firewall', redirect_id, 'name', f'Flashstart-bypass-DNS-from-{zone}')
e_uci.set('firewall', redirect_id, 'src', zone)
e_uci.set('firewall', redirect_id, 'src_dport', 53)
e_uci.set('firewall', redirect_id, 'dest_port', 53)
e_uci.set('firewall', redirect_id, 'proto', "tcp udp")
e_uci.set('firewall', redirect_id, 'target', 'DNAT')
e_uci.set('firewall', redirect_id, 'ipset', f'flashstart-bypass')
added_redirects.append(redirect_id)

# fetch config
config = __fetch_config()
Expand Down Expand Up @@ -305,6 +288,7 @@ def __sync_pro_plus_profiles():
e_uci.set('firewall', redirect_id, 'target', 'DNAT')
if profile['catch-all']:
e_uci.set('firewall', redirect_id, 'name', f'Flashstart-catch-all-{zone}-{profile["id"]}')
e_uci.set('firewall', redirect_id, 'ipset', f'!flashstart-bypass')
else:
e_uci.set('firewall', redirect_id, 'name', f'Flashstart-intercept-DNS-from-{zone}-{profile["id"]}')
e_uci.set('firewall', redirect_id, 'ipset', f'flashstart-ipset-{profile["id"]}')
Expand Down
Loading