X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=src%2FPVE%2FAPI2%2FFirewall%2FCluster.pm;h=c9c3e67a16c5212b1a4984c2081e4adf7fc07198;hb=a38849e6507fd567a3c7d7ff92f7b2bc93841126;hp=8f1deefece76041d065f58e72dcadaaa1b7ff792;hpb=947d6ea2edcfdb445c8258462b082c3ffcf397d9;p=pve-firewall.git

diff --git a/src/PVE/API2/Firewall/Cluster.pm b/src/PVE/API2/Firewall/Cluster.pm
index 8f1deef..c9c3e67 100644
--- a/src/PVE/API2/Firewall/Cluster.pm
+++ b/src/PVE/API2/Firewall/Cluster.pm
@@ -13,7 +13,6 @@ use PVE::API2::Firewall::IPSet;
 
 #fixme: locking?
 
-use Data::Dumper; # fixme: remove
 
 use base qw(PVE::RESTHandler);
 
@@ -71,24 +70,7 @@ __PACKAGE__->register_method({
 	return $result;
     }});
 
-my $option_properties = {
-    enable => {
-	type => 'boolean',
-	optional => 1,
-    },
-    policy_in => {
-	description => "Input policy.",
-	type => 'string',
-	optional => 1,
-	enum => ['ACCEPT', 'REJECT', 'DROP'],
-    },
-    policy_out => {
-	description => "Output policy.",
-	type => 'string',
-	optional => 1,
-	enum => ['ACCEPT', 'REJECT', 'DROP'],
-    },
-};
+my $option_properties = $PVE::Firewall::cluster_option_properties;
 
 my $add_option_properties = sub {
     my ($properties) = @_;
@@ -106,6 +88,9 @@ __PACKAGE__->register_method({
     path => 'options',
     method => 'GET',
     description => "Get Firewall options.",
+    permissions => {
+	check => ['perm', '/', [ 'Sys.Audit' ]],
+    },
     parameters => {
     	additionalProperties => 0,
     },
@@ -129,6 +114,9 @@ __PACKAGE__->register_method({
     method => 'PUT',
     description => "Set Firewall options.",
     protected => 1,
+    permissions => {
+	check => ['perm', '/', [ 'Sys.Modify' ]],
+    },
     parameters => {
     	additionalProperties => 0,
 	properties => &$add_option_properties({
@@ -144,29 +132,37 @@ __PACKAGE__->register_method({
     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 (undef, $digest) = PVE::Firewall::copy_opject_with_digest($cluster_conf->{options});
-	PVE::Tools::assert_if_modified($digest, $param->{digest});
+	    my (undef, $digest) = PVE::Firewall::copy_opject_with_digest($cluster_conf->{options});
+	    PVE::Tools::assert_if_modified($digest, $param->{digest});
 
-	if ($param->{delete}) {
-	    foreach my $opt (PVE::Tools::split_list($param->{delete})) {
-		raise_param_exc({ delete => "no such option '$opt'" })
-		    if !$option_properties->{$opt};
-		delete $cluster_conf->{options}->{$opt};
+	    if ($param->{delete}) {
+		foreach my $opt (PVE::Tools::split_list($param->{delete})) {
+		    raise_param_exc({ delete => "no such option '$opt'" })
+			if !$option_properties->{$opt};
+		    delete $cluster_conf->{options}->{$opt};
+		}
 	    }
-	}
 
-	if (defined($param->{enable})) {
-	    $param->{enable} = $param->{enable} ? 1 : 0;
-	}
+	    if (defined($param->{enable}) && ($param->{enable} > 1)) {
+		$param->{enable} = time();
+	    }
 
-	foreach my $k (keys %$option_properties) {
-	    next if !defined($param->{$k});
-	    $cluster_conf->{options}->{$k} = $param->{$k};
-	}
+	    foreach my $k (keys %$option_properties) {
+		next if !defined($param->{$k});
+		$cluster_conf->{options}->{$k} = $param->{$k};
+	    }
+
+	    PVE::Firewall::save_clusterfw_conf($cluster_conf);
+	});
 
-	PVE::Firewall::save_clusterfw_conf($cluster_conf);
+	# instant firewall update when using double (anti-lockout) API call
+	# -> not waiting for a firewall update at the first (timestamp enable) set
+	if (defined($param->{enable}) && ($param->{enable} > 1)) {
+	    PVE::Firewall::update();
+	}
 
 	return undef;
     }});
@@ -176,6 +172,7 @@ __PACKAGE__->register_method({
     path => 'macros',
     method => 'GET',
     description => "List available macros",
+    permissions => { user => 'all' },
     parameters => {
     	additionalProperties => 0,
     },
@@ -214,9 +211,19 @@ __PACKAGE__->register_method({
     path => 'refs',
     method => 'GET',
     description => "Lists possible IPSet/Alias reference which are allowed in source/dest properties.",
+    permissions => {
+	check => ['perm', '/', [ 'Sys.Audit' ]],
+    },
     parameters => {
 	additionalProperties => 0,
-	properties => {},
+	properties => {
+	    type => {
+		description => "Only list references of specified type.",
+		type => 'string',
+		enum => ['alias', 'ipset'],
+		optional => 1,
+	    },
+	},
     },
     returns => {
 	type => 'array',
@@ -247,27 +254,31 @@ __PACKAGE__->register_method({
 
 	my $res = [];
 
-	foreach my $name (keys %{$conf->{ipset}}) {
-	    my $data = {
-		type => 'ipset',
-		name => $name,
-		ref => "+$name",
-	    };
-	    if (my $comment = $conf->{ipset_comments}->{$name}) {
-		$data->{comment} = $comment;
+	if (!$param->{type} || $param->{type} eq 'ipset') {
+	    foreach my $name (keys %{$conf->{ipset}}) {
+		my $data = {
+		    type => 'ipset',
+		    name => $name,
+		    ref => "+$name",
+		};
+		if (my $comment = $conf->{ipset_comments}->{$name}) {
+		    $data->{comment} = $comment;
+		}
+		push @$res, $data;
 	    }
-	    push @$res, $data;
 	}
 
-	foreach my $name (keys %{$conf->{aliases}}) {
-	    my $e = $conf->{aliases}->{$name};
-	    my $data = {
-		type => 'alias',
-		name => $name,
-		ref => $name,
-	    };
-	    $data->{comment} = $e->{comment} if $e->{comment};
-	    push @$res, $data;
+	if (!$param->{type} || $param->{type} eq 'alias') {
+	    foreach my $name (keys %{$conf->{aliases}}) {
+		my $e = $conf->{aliases}->{$name};
+		my $data = {
+		    type => 'alias',
+		    name => $name,
+		    ref => $name,
+		};
+		$data->{comment} = $e->{comment} if $e->{comment};
+		push @$res, $data;
+	    }
 	}
 
 	return $res;