Skip to content
Snippets Groups Projects
Unverified Commit 5b068d7c authored by David Bauer's avatar David Bauer Committed by GitHub
Browse files

treewide: rename local_client zone (#2115)

This renames the local_client zone to loc_client, as local_clint exceeds
the maximum zone length allowed for firewall3, which is 11 bytes.

This worked previously due to firewall3 using unsafe string operations.
Now creation of the chain fails (latest OpenWrt master).
parent 21d1870a
No related branches found
No related tags found
No related merge requests found
...@@ -51,9 +51,9 @@ uci:section('firewall', 'zone', 'drop', { ...@@ -51,9 +51,9 @@ uci:section('firewall', 'zone', 'drop', {
forward = 'DROP', forward = 'DROP',
}) })
local networks = uci:get_list('firewall', 'local_client', 'network') local networks = uci:get_list('firewall', 'loc_client', 'network')
util.add_to_set(networks, 'local_node') util.add_to_set(networks, 'local_node')
uci:set_list('firewall', 'local_client', 'network', networks) uci:set_list('firewall', 'loc_client', 'network', networks)
local dnsmasq = uci:get_first('dhcp', 'dnsmasq') local dnsmasq = uci:get_first('dhcp', 'dnsmasq')
......
...@@ -18,7 +18,7 @@ end ...@@ -18,7 +18,7 @@ end
uci:foreach('firewall', 'zone', reject_input_on_wan) uci:foreach('firewall', 'zone', reject_input_on_wan)
for _, zone in ipairs({'mesh', 'local_client', 'wired_mesh'}) do for _, zone in ipairs({'mesh', 'loc_client', 'wired_mesh'}) do
-- Other packages assign interfaces to these zones -- Other packages assign interfaces to these zones
uci:section('firewall', 'zone', zone, { uci:section('firewall', 'zone', zone, {
name = zone, name = zone,
...@@ -57,8 +57,14 @@ for _, zone in ipairs({'mesh', 'local_client', 'wired_mesh'}) do ...@@ -57,8 +57,14 @@ for _, zone in ipairs({'mesh', 'local_client', 'wired_mesh'}) do
uci:delete('firewall', zone .. '_ICMPv6_out') uci:delete('firewall', zone .. '_ICMPv6_out')
end end
uci:section('firewall', 'rule', 'local_client_ICMPv4_in', { -- ToDo Remove in v2022.x
src = 'local_client', uci:delete('firewall', 'local_client')
uci:delete('firewall', 'local_client_ssh')
uci:delete('firewall', 'local_client_ICMPv4_in')
uci:delete('firewall', 'local_client_ICMPv6_in')
uci:section('firewall', 'rule', 'loc_client_ICMPv4_in', {
src = 'loc_client',
proto = 'icmp', proto = 'icmp',
icmp_type = { icmp_type = {
'echo-request', 'echo-request',
...@@ -67,9 +73,8 @@ uci:section('firewall', 'rule', 'local_client_ICMPv4_in', { ...@@ -67,9 +73,8 @@ uci:section('firewall', 'rule', 'local_client_ICMPv4_in', {
target = 'ACCEPT', target = 'ACCEPT',
}) })
-- allow inbound SSH from anywhere -- allow inbound SSH from anywhere
for _, zone in ipairs({ 'wan', 'local_client', 'mesh' }) do for _, zone in ipairs({ 'wan', 'loc_client', 'mesh' }) do
uci:section('firewall', 'rule', zone .. '_ssh', { uci:section('firewall', 'rule', zone .. '_ssh', {
name = zone .. '_ssh', name = zone .. '_ssh',
src = zone, src = zone,
......
...@@ -18,7 +18,7 @@ uci:delete('firewall', 'client_dns') ...@@ -18,7 +18,7 @@ uci:delete('firewall', 'client_dns')
if dns.servers then if dns.servers then
-- allow inbound traffic for dns from client zone -- allow inbound traffic for dns from client zone
uci:section('firewall', 'rule', 'client_dns', { uci:section('firewall', 'rule', 'client_dns', {
src = 'local_client', src = 'loc_client',
dest_port = '53', dest_port = '53',
proto = 'tcpudp', proto = 'tcpudp',
target = 'ACCEPT', target = 'ACCEPT',
......
...@@ -23,18 +23,18 @@ uci:section('firewall', 'zone', 'mmfd', { ...@@ -23,18 +23,18 @@ uci:section('firewall', 'zone', 'mmfd', {
-- forwardings and respective rules -- forwardings and respective rules
uci:section('firewall', 'forwarding', 'fcc', { uci:section('firewall', 'forwarding', 'fcc', {
src = 'local_client', src = 'loc_client',
dest = 'local_client', dest = 'loc_client',
}) })
uci:section('firewall', 'forwarding', 'fcm', { uci:section('firewall', 'forwarding', 'fcm', {
src = 'local_client', src = 'loc_client',
dest = 'mesh', dest = 'mesh',
}) })
uci:section('firewall', 'forwarding', 'fmc', { uci:section('firewall', 'forwarding', 'fmc', {
src = 'mesh', src = 'mesh',
dest = 'local_client', dest = 'loc_client',
}) })
uci:section('firewall', 'forwarding', 'fmm', { uci:section('firewall', 'forwarding', 'fmm', {
...@@ -44,11 +44,11 @@ uci:section('firewall', 'forwarding', 'fmm', { ...@@ -44,11 +44,11 @@ uci:section('firewall', 'forwarding', 'fmm', {
uci:section('firewall', 'forwarding', 'flc', { uci:section('firewall', 'forwarding', 'flc', {
src = 'l3roamd', src = 'l3roamd',
dest = 'local_client', dest = 'loc_client',
}) })
uci:section('firewall', 'forwarding', 'fcl', { uci:section('firewall', 'forwarding', 'fcl', {
src = 'local_client', src = 'loc_client',
dest = 'l3roamd', dest = 'l3roamd',
}) })
......
...@@ -18,7 +18,7 @@ uci:section('firewall', 'rule', 'wan_respondd', { ...@@ -18,7 +18,7 @@ uci:section('firewall', 'rule', 'wan_respondd', {
-- Allow respondd-access for local clients -- Allow respondd-access for local clients
uci:section('firewall', 'rule', 'client_respondd', { uci:section('firewall', 'rule', 'client_respondd', {
name = 'client_respondd', name = 'client_respondd',
src = 'local_client', src = 'loc_client',
src_ip = 'fe80::/64', src_ip = 'fe80::/64',
dest_port = '1001', dest_port = '1001',
proto = 'udp', proto = 'udp',
......
...@@ -27,7 +27,7 @@ uci:section('uhttpd', 'uhttpd', 'main', { ...@@ -27,7 +27,7 @@ uci:section('uhttpd', 'uhttpd', 'main', {
uci:save('uhttpd') uci:save('uhttpd')
for _, zone in ipairs({'mesh', 'local_client'}) do for _, zone in ipairs({'mesh', 'loc_client'}) do
uci:section('firewall', 'rule', zone .. '_http', { uci:section('firewall', 'rule', zone .. '_http', {
src = zone, src = zone,
dest_port = '80', dest_port = '80',
...@@ -35,4 +35,8 @@ for _, zone in ipairs({'mesh', 'local_client'}) do ...@@ -35,4 +35,8 @@ for _, zone in ipairs({'mesh', 'local_client'}) do
target = 'ACCEPT', target = 'ACCEPT',
}) })
end end
-- ToDo remove in v2022.x
uci:delete('firewall', 'local_client_http')
uci:save('firewall') uci:save('firewall')
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment