luci-mod-status: nftables.js: fix OOM on big nftables IP sets

Signed-off-by: Alexander Georgievskiy <galeksandrp@gmail.com>

diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/nftables.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/nftables.js
index c5677c1ebbb708fb9e641ac4a59a88e731d3985c..3a11f1e8308452b9433fe18969376551107d99fc 100644 (file)
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/nftables.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/nftables.js
@@ -133,7 +133,7 @@ var action_translations = {
 return view.extend({
        load: function() {
                return Promise.all([
-                       L.resolveDefault(fs.exec_direct('/usr/sbin/nft', [ '--json', 'list', 'ruleset' ], 'json'), {}),
+                       L.resolveDefault(fs.exec_direct('/usr/sbin/nft', [ '--terse', '--json', 'list', 'ruleset' ], 'json'), {}),
                        L.resolveDefault(fs.exec_direct('/usr/sbin/iptables-save'), ''),
                        L.resolveDefault(fs.exec_direct('/usr/sbin/ip6tables-save'), '')
                ]);

diff --git a/modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json b/modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json
index f0dab25af20d5a21eff8efd3535d660c92c7dc20..18d267e80140d82616da51861501134bdf3429a6 100644 (file)
--- a/modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json
+++ b/modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json
@@ -71,7 +71,7 @@
                "read": {
                        "cgi-io": [ "exec" ],
                        "file": {
-                               "/usr/sbin/nft --json list ruleset": [ "exec" ],
+                               "/usr/sbin/nft --terse --json list ruleset": [ "exec" ],
                                "/usr/sbin/iptables --line-numbers -w -nvxL -t *": [ "exec" ],
                                "/usr/sbin/ip6tables --line-numbers -w -nvxL -t *": [ "exec" ],
                                "/usr/sbin/ip6tables": [ "list" ],