use PVE::Firewall;
use PVE::API2::Firewall::Rules;
-use Data::Dumper; # fixme: remove
use base qw(PVE::RESTHandler);
my ($cluster_conf) = @_;
my $res = [];
- foreach my $group (keys %{$cluster_conf->{groups}}) {
- my $data = {
- name => $group,
+ foreach my $group (sort keys %{$cluster_conf->{groups}}) {
+ my $data = {
+ group => $group,
};
if (my $comment = $cluster_conf->{group_comments}->{$group}) {
$data->{comment} = $comment;
return wantarray ? ($list, $digest) : $list;
};
+my $rename_fw_rules = sub {
+ my ($old, $new, $rules) = @_;
+
+ for my $rule (@{$rules}) {
+ next if ($rule->{type} ne "group" || $rule->{action} ne $old);
+ $rule->{action} = $new;
+ }
+};
+
__PACKAGE__->register_method({
name => 'list_security_groups',
path => '',
method => 'GET',
description => "List security groups.",
+ permissions => { user => 'all' },
parameters => {
additionalProperties => 0,
+ properties => {},
},
returns => {
type => 'array',
items => {
type => "object",
- properties => {
- name => get_standard_option('pve-security-group-name'),
+ properties => {
+ group => get_standard_option('pve-security-group-name'),
digest => get_standard_option('pve-config-digest', { optional => 0} ),
- comment => {
+ comment => {
type => 'string',
optional => 1,
}
},
},
- links => [ { rel => 'child', href => "{name}" } ],
+ links => [ { rel => 'child', href => "{group}" } ],
},
code => sub {
my ($param) = @_;
method => 'POST',
description => "Create new security group.",
protected => 1,
+ permissions => {
+ check => ['perm', '/', [ 'Sys.Modify' ]],
+ },
parameters => {
additionalProperties => 0,
- properties => {
- name => get_standard_option('pve-security-group-name'),
+ properties => {
+ group => get_standard_option('pve-security-group-name'),
comment => {
type => 'string',
optional => 1,
code => sub {
my ($param) = @_;
- my $cluster_conf = PVE::Firewall::load_clusterfw_conf();
-
- if ($param->{rename}) {
- my (undef, $digest) = &$get_security_group_list($cluster_conf);
- PVE::Tools::assert_if_modified($digest, $param->{digest});
+ my $group = $param->{group};
+ my $rename = $param->{rename};
+ my $comment = $param->{comment};
- raise_param_exc({ name => "Security group '$param->{rename}' does not exists" })
- if !$cluster_conf->{groups}->{$param->{rename}};
+ PVE::Firewall::lock_clusterfw_conf(10, sub {
+ my $cluster_conf = PVE::Firewall::load_clusterfw_conf();
- my $data = delete $cluster_conf->{groups}->{$param->{rename}};
- $cluster_conf->{groups}->{$param->{name}} = $data;
- if (my $comment = delete $cluster_conf->{group_comments}->{$param->{rename}}) {
- $cluster_conf->{group_comments}->{$param->{name}} = $comment;
- }
- $cluster_conf->{group_comments}->{$param->{name}} = $param->{comment} if defined($param->{comment});
- } else {
- foreach my $name (keys %{$cluster_conf->{groups}}) {
- raise_param_exc({ name => "Security group '$name' already exists" })
- if $name eq $param->{name};
- }
+ if ($rename) {
+ my (undef, $digest) = &$get_security_group_list($cluster_conf);
+ PVE::Tools::assert_if_modified($digest, $param->{digest});
- $cluster_conf->{groups}->{$param->{name}} = [];
- $cluster_conf->{group_comments}->{$param->{name}} = $param->{comment} if defined($param->{comment});
- }
+ raise_param_exc({ group => "Security group '$rename' does not exist" })
+ if !$cluster_conf->{groups}->{$rename};
- PVE::Firewall::save_clusterfw_conf($cluster_conf);
-
- return undef;
- }});
+ # prevent overwriting an existing group
+ raise_param_exc({ group => "Security group '$group' does already exist" })
+ if $cluster_conf->{groups}->{$group} &&
+ $group ne $rename;
-__PACKAGE__->register_method({
- name => 'delete_security_group',
- path => '{name}',
- method => 'DELETE',
- description => "Delete security group.",
- protected => 1,
- parameters => {
- additionalProperties => 0,
- properties => {
- name => get_standard_option('pve-security-group-name'),
- digest => get_standard_option('pve-config-digest'),
- },
- },
- returns => { type => 'null' },
- code => sub {
- my ($param) = @_;
-
- my $cluster_conf = PVE::Firewall::load_clusterfw_conf();
+ if ($rename eq $group) {
+ $cluster_conf->{group_comments}->{$rename} = $comment if defined($comment);
+ PVE::Firewall::save_clusterfw_conf($cluster_conf);
+ return;
+ }
- return undef if !$cluster_conf->{groups}->{$param->{name}};
+ # Create an exact copy of the old security group
+ $cluster_conf->{groups}->{$group} = $cluster_conf->{groups}->{$rename};
+ $cluster_conf->{group_comments}->{$group} = $cluster_conf->{group_comments}->{$rename};
+
+ # Update comment if provided
+ $cluster_conf->{group_comments}->{$group} = $comment if defined($comment);
+
+ # Write the copy to the cluster config, so that if something fails inbetween, the new firewall
+ # rules won't be broken when the new name is referenced
+ PVE::Firewall::save_clusterfw_conf($cluster_conf);
+
+ # Update all the host configs to the new copy
+ my $hosts = PVE::Cluster::get_nodelist();
+ foreach my $host (@$hosts) {
+ PVE::Firewall::lock_hostfw_conf($host, 10, sub {
+ my $host_conf_path = "/etc/pve/nodes/$host/host.fw";
+ my $host_conf = PVE::Firewall::load_hostfw_conf($cluster_conf, $host_conf_path);
+
+ if (defined($host_conf)) {
+ &$rename_fw_rules($rename,
+ $group,
+ $host_conf->{rules});
+ PVE::Firewall::save_hostfw_conf($host_conf, $host_conf_path);
+ }
+ });
+ }
- my (undef, $digest) = &$get_security_group_list($cluster_conf);
- PVE::Tools::assert_if_modified($digest, $param->{digest});
+ # Update all the VM configs
+ my $vms = PVE::Cluster::get_vmlist();
+ foreach my $vm (keys %{$vms->{ids}}) {
+ PVE::Firewall::lock_vmfw_conf($vm, 10, sub {
+ my $vm_type = $vms->{ids}->{$vm}->{type} eq "lxc" ? "ct" : "vm";
+ my $vm_conf = PVE::Firewall::load_vmfw_conf($cluster_conf, $vm_type, $vm, "/etc/pve/firewall");
+
+ if (defined($vm_conf)) {
+ &$rename_fw_rules($rename,
+ $group,
+ $vm_conf->{rules});
+ PVE::Firewall::save_vmfw_conf($vm, $vm_conf);
+ }
+ });
+ }
- die "Security group '$param->{name}' is not empty\n"
- if scalar(@{$cluster_conf->{groups}->{$param->{name}}});
+ # And also update the cluster itself
+ &$rename_fw_rules($rename,
+ $group,
+ $cluster_conf->{rules});
+
+ # Now that everything has been updated, the old rule can be deleted
+ delete $cluster_conf->{groups}->{$rename};
+ delete $cluster_conf->{group_comments}->{$rename};
+ } else {
+ foreach my $name (keys %{$cluster_conf->{groups}}) {
+ raise_param_exc({ group => "Security group '$name' already exists" })
+ if $name eq $group;
+ }
- delete $cluster_conf->{groups}->{$param->{name}};
+ $cluster_conf->{groups}->{$group} = [];
+ $cluster_conf->{group_comments}->{$group} = $comment if defined($comment);
+ }
- PVE::Firewall::save_clusterfw_conf($cluster_conf);
+ PVE::Firewall::save_clusterfw_conf($cluster_conf);
+ });
return undef;
}});
__PACKAGE__->register_method ({
- subclass => "PVE::API2::Firewall::GroupRules",
+ subclass => "PVE::API2::Firewall::GroupRules",
path => '{group}',
});
projects / pve-firewall.git / blobdiff