all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Arthur Bied-Charreton <a.bied-charreton@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH pve-firewall v2 4/9] api: aliases: add option to update references on edit
Date: Tue, 18 Aug 2026 15:34:08 +0200	[thread overview]
Message-ID: <20260818133413.450776-5-a.bied-charreton@proxmox.com> (raw)
In-Reply-To: <20260818133413.450776-1-a.bied-charreton@proxmox.com>

Renaming an alias still referenced by rules leaves dangling references.
The firewall then fails to parse those rules during compilation and
drops them. The errors, while logged to the journal, are not visible
from the GUI - a rename can therefore effectively disable a whole set
of rules.

Add an 'update-references' option to the rename path to rewrite them to
the new name. For cluster aliases, this also covers references in
downstream configs (host, guest and vnet).

The new alias is persisted before its references are rewritten, so a
concurrent firewall compilation never observes a dangling reference. If
the cluster-wide rewrite is interrupted, it can be retried by passing
'update-references=force'.

Signed-off-by: Arthur Bied-Charreton <a.bied-charreton@proxmox.com>
---
 src/PVE/API2/Firewall/Aliases.pm | 40 +++++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/PVE/API2/Firewall/Aliases.pm b/src/PVE/API2/Firewall/Aliases.pm
index 4f6960d..657f333 100644
--- a/src/PVE/API2/Firewall/Aliases.pm
+++ b/src/PVE/API2/Firewall/Aliases.pm
@@ -2,6 +2,8 @@ package PVE::API2::Firewall::AliasesBase;
 
 use strict;
 use warnings;
+
+use PVE::Firewall::Helpers qw(update_refs get_object_spec);
 use PVE::Exception qw(raise raise_param_exc);
 use PVE::JSONSchema qw(get_standard_option);
 
@@ -219,6 +221,16 @@ sub register_update_alias {
     $properties->{comment} = $api_properties->{comment};
     $properties->{digest} = get_standard_option('pve-config-digest');
 
+    $properties->{'update-references'} = {
+        type => 'string',
+        enum => ['no', 'yes', 'force'],
+        optional => 1,
+        description =>
+            "Update all references to the alias when renaming it. Use 'force' to also "
+            . "overwrite an existing target alias, e.g. to resume an interrupted rename.",
+        default => 'no',
+    };
+
     $class->register_method({
         name => 'update_alias',
         path => '{name}',
@@ -239,6 +251,8 @@ sub register_update_alias {
                 sub {
                     my ($param) = @_;
 
+                    my $update_references = $param->{'update-references'} // 'no';
+
                     my ($fw_conf, $aliases) = $class->load_config($param);
 
                     my $list = &$aliases_to_list($aliases);
@@ -261,9 +275,28 @@ sub register_update_alias {
 
                     if ($rename && ($name ne $rename)) {
                         raise_param_exc({ name => "alias '$param->{rename}' already exists" })
-                            if defined($aliases->{$rename});
-                        $aliases->{$name}->{name} = $param->{rename};
-                        $aliases->{$rename} = $aliases->{$name};
+                            if defined($aliases->{$rename})
+                            && $update_references ne 'force';
+
+                        $aliases->{$rename} =
+                            { $aliases->{$name}->%*, name => $param->{rename} };
+
+                        if ($update_references ne 'no') {
+                            my $env = $class->rule_env();
+                            my $spec = get_object_spec('aliases');
+                            my $new_name = $param->{rename};
+
+                            # persist the new alias before rewriting references so a concurrent
+                            # compilation never sees a reference to a not-yet-saved alias.
+                            $class->save_aliases($param, $fw_conf, $aliases)
+                                if $env eq 'cluster';
+
+                            eval { update_refs($fw_conf, $spec, $name, $new_name, $env) };
+                            die "rename interrupted, references may be partially updated; "
+                                . "retry with 'force' to finish: $@"
+                                if $@;
+                        }
+
                         delete $aliases->{$name};
                     }
 
@@ -311,6 +344,7 @@ sub register_delete_alias {
                     PVE::Tools::assert_if_modified($digest, $param->{digest});
 
                     my $name = lc($param->{name});
+
                     delete $aliases->{$name};
 
                     $class->save_aliases($param, $fw_conf, $aliases);
-- 
2.47.3




  parent reply	other threads:[~2026-08-18 13:34 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-08-18 13:34 [PATCH firewall/manager v2 0/9] allow updating references when renaming/deleting firewall objects Arthur Bied-Charreton
2026-08-18 13:34 ` [PATCH pve-firewall v2 1/9] api: helpers: add helper to update firewall object references Arthur Bied-Charreton
2026-08-18 13:34 ` [PATCH pve-firewall v2 2/9] api: ipset: add option to update references on edit Arthur Bied-Charreton
2026-08-18 13:34 ` [PATCH pve-firewall v2 3/9] api: ipset: add option to GC references on delete Arthur Bied-Charreton
2026-08-18 13:34 ` Arthur Bied-Charreton [this message]
2026-08-18 13:34 ` [PATCH pve-firewall v2 5/9] api: aliases: " Arthur Bied-Charreton
2026-08-18 13:34 ` [PATCH pve-firewall v2 6/9] firewall: tests: add tests for object reference update logic Arthur Bied-Charreton
2026-08-18 13:34 ` [PATCH pve-manager v2 7/9] ui: firewall: add common widgets for deleting and updating references Arthur Bied-Charreton
2026-08-18 13:34 ` [PATCH pve-manager v2 8/9] ui: firewall: ipset: add controls to update/delete references on edit Arthur Bied-Charreton
2026-08-18 13:34 ` [PATCH pve-manager v2 9/9] ui: firewall: aliases: " Arthur Bied-Charreton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260818133413.450776-5-a.bied-charreton@proxmox.com \
    --to=a.bied-charreton@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal