From 80696b3be7cf3f1d16d418e438b9bc8978e0435f Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Sun, 16 Aug 2020 10:55:21 +0200 Subject: [PATCH] Firewall:aliases prevent pfctl error messages from being suppressed. closes https://github.com/opnsense/core/issues/4266 --- src/opnsense/scripts/filter/update_tables.py | 2 +- src/opnsense/www/js/opnsense_ui.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/opnsense/scripts/filter/update_tables.py b/src/opnsense/scripts/filter/update_tables.py index a9de9963b..49445094c 100755 --- a/src/opnsense/scripts/filter/update_tables.py +++ b/src/opnsense/scripts/filter/update_tables.py @@ -163,7 +163,7 @@ if __name__ == '__main__': sp = subprocess.run(['/sbin/pfctl', '-t', alias_name, '-T', 'replace', '-f', '/var/db/aliastables/%s.txt' % alias_name], capture_output=True, text=True) - error_output = sp.stdout.strip() + error_output = sp.stderr.strip() if error_output.find('pfctl: ') > -1: result['status'] = 'error' if 'messages' not in result: diff --git a/src/opnsense/www/js/opnsense_ui.js b/src/opnsense/www/js/opnsense_ui.js index 2bad0260e..536f48784 100644 --- a/src/opnsense/www/js/opnsense_ui.js +++ b/src/opnsense/www/js/opnsense_ui.js @@ -497,7 +497,7 @@ $.fn.SimpleActionButton = function (params) { if (params && params.onAction) { params.onAction(data, status); } - if (status != "success" || data['status'].toLowerCase().trim() != 'ok') { + if ((status != "success" || data['status'].toLowerCase().trim() != 'ok') && data['status']) { BootstrapDialog.show({ type: BootstrapDialog.TYPE_WARNING, title: this_button.data('error-title'),