Commit graph

34 commits

Author SHA1 Message Date
Jo-Philipp Wich
9fd7e9fc23 luci-app-firewall: fix variable clash leading to incorrect family display
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-01-20 18:57:47 +01:00
Jo-Philipp Wich
f1771d14aa luci-app-firewall: add SNAT config migration
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-01-19 19:38:07 +01:00
Jo-Philipp Wich
7944b0a90b luci-app-firewall: rework rule descriptions, deduplicate code
Use a simple custom format string DSL to assemble the rule description
texts in the overview page.

Also move common code for shared, complex cbi options to the firewall
tool class.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-01-19 16:22:47 +01:00
Jo-Philipp Wich
0608ff09f8 luci-app-firewall: consolidate duplicate option code
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-01-16 22:16:53 +01:00
Jo-Philipp Wich
28f4a9fced luci-app-firewall: support 'limit' and 'limit_burst' options
Also resync firewall translations.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-01-16 21:36:39 +01:00
Jo-Philipp Wich
aa62419e5b luci-app-firewall: support 'DSCP' action and matches for rules
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-01-16 21:00:46 +01:00
Jo-Philipp Wich
3c0fcf49d4 luci-app-firewall: support 'MARK' action and matches for rules
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-01-16 20:35:09 +01:00
Jo-Philipp Wich
cdf240f0a0 luci-app-firewall: support 'mark' parameter for redirects
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-01-16 18:17:09 +01:00
Jo-Philipp Wich
61fe2146dd luci-app-firewall: support 'helper' and 'reflection_src' parameters for redirects
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-01-16 16:30:58 +01:00
Jo-Philipp Wich
d601e79da5 luci-app-firewall: support 'helper' and 'set_helper' parameters for rules
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-01-16 16:13:01 +01:00
Jo-Philipp Wich
267085cf2d luci-app-firewall: support 'direction' and 'device' parameters for rules
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-01-16 15:31:01 +01:00
Jo-Philipp Wich
a178cdb5cf luci-app-firewall: fix family display for port forwards
The underlying fw3 program currently only does IPv4 port forwards while
LuCI incorrectly reports IPv4 + IPv6 for each forward. Adjust the text
accordingly to fix this.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-01-16 13:54:22 +01:00
Jo-Philipp Wich
c8b8ae6b8e luci-app-firewall: introduce support for "config nat" sections
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-01-15 19:22:06 +01:00
Jo-Philipp Wich
d60a1a13b0 luci-app-firewall: fix zone network default
When a `config zone` section lacks an `option network` or `list network`
setting, its contained interface list defaults to the name of the zone,
e.g. a zone named `foo` will implicitely contain the network `foo` unless
a deviating or empty `option network` is specified.

Adjust the zones.js model accordingly to reflect that implicit default.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-01-04 18:48:49 +01:00
Jo-Philipp Wich
d07cfba160 luci-app-firewall: update rule ip hints based on address family
Fixes: #3119
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-12-30 14:51:40 +01:00
Jo-Philipp Wich
18c60968dc luci-app-firewall: store week- and monthday restrictions as strings
Fixes: FS#2661
Ref: https://bugs.openwrt.org/index.php?do=details&task_id=2661
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-12-30 00:08:17 +01:00
Jo-Philipp Wich
f6e56e67e8 luci-app-firewall: remove obsolete "conntrack" option
Fixes: #3342
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-11-22 08:50:14 +01:00
Jo-Philipp Wich
86f492173d treewide: require ui.js explicitly
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-11-03 21:55:50 +01:00
Jo-Philipp Wich
9e57fbb2c3 luci-base, luci-app-firewall: port custom rules to client side view
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-11-03 20:34:57 +01:00
Jo-Philipp Wich
37b6092aef luci-base, luci-mod-network, luci-app-firewall: migrate luci/getHostHints
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-11-01 12:03:33 +01:00
Nicholas Smith
f9e2d60f13 luci-app-firewall: display "this new zone" instead of "undefined"
Signed-off-by: Nicholas Smith <nicholas.smith@telcoantennas.com.au>
2019-09-11 12:52:24 +02:00
Jo-Philipp Wich
eeced34765 luci-app-firewall: disallow creating zone without name
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-09-11 12:46:59 +02:00
Jo-Philipp Wich
42bc712e2c luci-app-firewall: filter alias interfaces in zone device selection
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-09-10 15:28:16 +02:00
Jo-Philipp Wich
42bd5aa9c4 luci-app-firewall: fix zone overview page after rpc procedure renaming
The "conntrack_helpers" method has been renamed to "getConntrackHelpers".

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-08-15 15:40:46 +02:00
Jo-Philipp Wich
ed8f1c4c1c luci-app-firewall: honour global default policies in per-zone settings
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-08-14 22:58:15 +02:00
Jo-Philipp Wich
9f032e02e4 luci-app-firewall: drop usage of getOffloadSupport()
Rely on the more generic L.hasSystemFeature() from now on.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-08-14 22:58:15 +02:00
Aaron Jones
f7cb913d10
luci-app-firewall: rules: sort ICMP types alphabetically
This just makes it easier to find the type one would want.
No types were added or removed, only re-arranged.

Signed-off-by: Aaron Jones <aaronmdjones@gmail.com>
2019-08-11 06:13:15 +00:00
Aaron Jones
17f3e03930
luci-app-firewall: rules: allow ICMPv6 ND types
The "Match ICMP Type" dropdown had entries for router
solicitation & router advertisements, but not the more
generic neighbour solicitation & neighbour advertisements.

A LAN cannot function without Neighbour Discovery; this
means that setting a LAN interface default input policy to
REJECT breaks IPv6 WAN access for all hosts on that LAN;
as they can no longer discover their gateway's MAC address.
This can be fixed with appropriate rules allowing ND input,
which this patch allows one to do in LuCI.

The spelling is the same as in [1].

[1] <https://git.openwrt.org/?p=openwrt/openwrt.git;a=blob;f=package/network/config/firewall/files/firewall.config>

Signed-off-by: Aaron Jones <aaronmdjones@gmail.com>
2019-08-11 06:10:47 +00:00
Jo-Philipp Wich
d25f95c93d luci-app-firewall: explicitely set 'DNAT' target on new forwards
Fixes: #2920
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-07-26 12:36:04 +02:00
Jo-Philipp Wich
df77b47bad luci-app-firewall: add support for further per-zone options
This commit introduces support for zone devices, subnets, conntrack helpers
and iptables extra options.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-07-22 16:46:51 +02:00
Jo-Philipp Wich
0be4ad51a0 luci-app-firewall: fix cbi form for rules
- Set src/dest defaults only in initial section create state, otherwise it
   is impossible to specify output rules
 - Get rid of dest_remote/dest_local widget switching and implement change
   logic directly in tools.widgets.CBIZoneSelect
 - Remove leftover debug code

Ref: https://github.com/openwrt/luci/issues/2889
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-07-21 22:35:24 +02:00
Anton Kikin
b15c62071c luci-app-firewall: format protocol family for forwards and rules
Fixes: #2878
Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
2019-07-18 12:46:00 +03:00
Jo-Philipp Wich
f970c485cf treewide: switch to shared isObject(), toArray() and sortedKeys() helpers
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-07-07 20:11:35 +02:00
Jo-Philipp Wich
9c16090780 luci-app-firewall: switch to client side CBI views
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-07-07 15:36:26 +02:00