michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-06 15:20:29 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add active nftables table clear action

Browse Source
This commit is contained in:
Ilia Ross
2026-05-03 00:05:24 +02:00
parent d61852cc72
commit 1d5b426043
4 changed files with 57 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nftables/active.cgi
View File

@@ -36,11 +36,17 @@ else {
my $is_saved = table_is_webmin_managed($t, \@saved_tables);
my $table_url = "active_table.cgi?family=".urlize($t->{'family'}).
"&name=".urlize($t->{'name'});
my $actions = $is_saved ? "-" :
ui_link(
my @actions;
push(@actions, ui_link(
"import_table.cgi?family=".urlize($t->{'family'}).
"&name=".urlize($t->{'name'}),
$text{'active_import'});
$text{'active_import'})) if (!$is_saved);
push(@actions, ui_link(
"clear_table.cgi?family=".urlize($t->{'family'}).
"&name=".urlize($t->{'name'}),
$text{'active_clear'}))
if (!table_is_externally_managed($t));
my $actions = @actions ? join(" ", @actions) : "-";
print ui_columns_row([
ui_link($table_url, html_escape(nft_table_spec($t))),
html_escape($flags),

41
nftables/clear_table.cgi Executable file
View File

@@ -0,0 +1,41 @@
#!/usr/bin/perl
# clear_table.cgi
# Remove one table from the active nftables ruleset
require './nftables-lib.pl'; ## no critic
use strict;
use warnings;
our (%in, %text);
ReadParse();
error_setup($text{'clear_err'});
my ($tables, $err) = get_active_nftables_save();
error(text('active_failed', $err)) if ($err);
my $table;
foreach my $t (@$tables) {
if ($t->{'family'} eq $in{'family'} && $t->{'name'} eq $in{'name'}) {
$table = $t;
last;
}
}
$table || error($text{'active_table_notable'});
if ($in{'confirm'}) {
$err = delete_active_table($table);
error(text('clear_failed', $err)) if ($err);
webmin_log("clear", "table", $table->{'name'},
{ 'family' => $table->{'family'} });
redirect("active.cgi");
}
ui_print_header(undef, $text{'clear_title'}, "", "intro", 1, 1);
print "<center>\n";
print ui_form_start("clear_table.cgi");
print ui_hidden("family", $table->{'family'});
print ui_hidden("name", $table->{'name'});
print text('clear_confirm',
"<tt>".html_escape(nft_table_spec($table))."</tt>"),"<p>\n";
print ui_form_end([ [ "confirm", $text{'active_clear'} ] ]);
print "</center>\n";
ui_print_footer("active.cgi", $text{'active_return'});

4
nftables/index.cgi
View File

@@ -213,9 +213,9 @@ if (!@tables) {
my $actions_html =
ui_link("edit_chain.cgi?table=$in{'table'}&chain=".
urlize($c), $text{'index_cedit'})."<br>".
urlize($c), $text{'index_cedit'})." | ".
ui_link("rename_chain.cgi?table=$in{'table'}&chain=".
urlize($c), $text{'index_crename'})."<br>".
urlize($c), $text{'index_crename'})." | ".
ui_link("edit_rule.cgi?table=$in{'table'}&chain=".
urlize($c)."&new=1", $text{'index_radd'});
$chains_html .= ui_checked_columns_row([

5
nftables/lang/en
View File

@@ -293,11 +293,16 @@ active_external=Externally managed
active_unclaimed=Unclaimed
active_import=Import Copy
active_importdesc=Import this active table as a separate Webmin-managed table.
active_clear=Clear
active_return=active ruleset
active_table_title=Active Table
active_table_err=Failed to view active table
active_table_notable=No such active table selected
active_table_summary=Active table details
clear_title=Clear active table
clear_err=Failed to clear active table
clear_confirm=Clear active table $1 from the live ruleset? This does not change Webmin's saved configuration.
clear_failed=Failed to clear active table: $1
import_title=Import active table
import_header=Import table as Webmin-managed copy
import_err=Failed to import active table