use PVE::Firewall;
use PVE::API2::Firewall::Rules;
-use Data::Dumper; # fixme: remove
use base qw(PVE::RESTHandler);
+my $get_security_group_list = sub {
+ my ($cluster_conf) = @_;
+
+ my $res = [];
+ foreach my $group (sort keys %{$cluster_conf->{groups}}) {
+ my $data = {
+ group => $group,
+ };
+ if (my $comment = $cluster_conf->{group_comments}->{$group}) {
+ $data->{comment} = $comment;
+ }
+ push @$res, $data;
+ }
+
+ my ($list, $digest) = PVE::Firewall::copy_list_with_digest($res);
+
+ return wantarray ? ($list, $digest) : $list;
+};
+
__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) = @_;
my $cluster_conf = PVE::Firewall::load_clusterfw_conf();
- my $digest = $cluster_conf->{digest};
-
- my $res = [];
- foreach my $group (keys %{$cluster_conf->{groups}}) {
- my $data = {
- name => $group,
- digest => $digest,
- count => scalar(@{$cluster_conf->{groups}->{$group}})
- };
- if (my $comment = $cluster_conf->{group_comments}->{$group}) {
- $data->{comment} = $comment;
- }
- push @$res, $data;
- }
-
- return $res;
+ return &$get_security_group_list($cluster_conf);
}});
__PACKAGE__->register_method({
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();
+ PVE::Firewall::lock_clusterfw_conf(10, sub {
+ my $cluster_conf = PVE::Firewall::load_clusterfw_conf();
- my $digest = $cluster_conf->{digest};
+ if ($param->{rename}) {
+ my (undef, $digest) = &$get_security_group_list($cluster_conf);
+ PVE::Tools::assert_if_modified($digest, $param->{digest});
- PVE::Tools::assert_if_modified($digest, $param->{digest});
+ raise_param_exc({ group => "Security group '$param->{rename}' does not exist" })
+ if !$cluster_conf->{groups}->{$param->{rename}};
- if (!$param->{rename}) {
- foreach my $name (keys %{$cluster_conf->{groups}}) {
- raise_param_exc({ name => "Security group '$name' already exists" })
- if $name eq $param->{name};
- }
- }
-
- if ($param->{rename}) {
- raise_param_exc({ name => "Security group '$param->{rename}' does not exists" })
- if !$cluster_conf->{groups}->{$param->{rename}};
- 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 {
- $cluster_conf->{groups}->{$param->{name}} = [];
- $cluster_conf->{group_comments}->{$param->{name}} = $param->{comment} if defined($param->{comment});
- }
-
- PVE::Firewall::save_clusterfw_conf($cluster_conf);
-
- return undef;
- }});
+ # prevent overwriting an existing group
+ raise_param_exc({ group => "Security group '$param->{group}' does already exist" })
+ if $cluster_conf->{groups}->{$param->{group}} &&
+ $param->{group} ne $param->{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();
-
- PVE::Tools::assert_if_modified($cluster_conf->{digest}, $param->{digest});
-
- return undef if !$cluster_conf->{groups}->{$param->{name}};
-
- die "Security group '$param->{name}' is not empty\n"
- if scalar(@{$cluster_conf->{groups}->{$param->{name}}});
+ my $data = delete $cluster_conf->{groups}->{$param->{rename}};
+ $cluster_conf->{groups}->{$param->{group}} = $data;
+ if (my $comment = delete $cluster_conf->{group_comments}->{$param->{rename}}) {
+ $cluster_conf->{group_comments}->{$param->{group}} = $comment;
+ }
+ $cluster_conf->{group_comments}->{$param->{group}} = $param->{comment} if defined($param->{comment});
+ } else {
+ foreach my $name (keys %{$cluster_conf->{groups}}) {
+ raise_param_exc({ group => "Security group '$name' already exists" })
+ if $name eq $param->{group};
+ }
- delete $cluster_conf->{groups}->{$param->{name}};
+ $cluster_conf->{groups}->{$param->{group}} = [];
+ $cluster_conf->{group_comments}->{$param->{group}} = $param->{comment} if defined($param->{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}',
});