X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=blobdiff_plain;f=src%2FPVE%2FAPI2%2FFirewall%2FHost.pm;h=b66ca55e553e981af0161802a578ed6c6434a116;hp=2500bd07d739e1c9d6341bbf666048385065ef29;hb=HEAD;hpb=f6163c2e161167e0cef1a365b6c1aebc23bf3511

diff --git a/src/PVE/API2/Firewall/Host.pm b/src/PVE/API2/Firewall/Host.pm
index 2500bd0..0432de2 100644
--- a/src/PVE/API2/Firewall/Host.pm
+++ b/src/PVE/API2/Firewall/Host.pm
@@ -10,12 +10,11 @@ use PVE::RPCEnvironment;
 use PVE::Firewall;
 use PVE::API2::Firewall::Rules;
 
-use Data::Dumper; # fixme: remove
 
 use base qw(PVE::RESTHandler);
 
 __PACKAGE__->register_method ({
-    subclass => "PVE::API2::Firewall::HostRules",  
+    subclass => "PVE::API2::Firewall::HostRules",
     path => 'rules',
 });
 
@@ -59,7 +58,7 @@ my $add_option_properties = sub {
     foreach my $k (keys %$option_properties) {
 	$properties->{$k} = $option_properties->{$k};
     }
-    
+
     return $properties;
 };
 
@@ -87,7 +86,8 @@ __PACKAGE__->register_method({
     code => sub {
 	my ($param) = @_;
 
-	my $hostfw_conf = PVE::Firewall::load_hostfw_conf();
+	my $cluster_conf = PVE::Firewall::load_clusterfw_conf();
+	my $hostfw_conf = PVE::Firewall::load_hostfw_conf($cluster_conf);
 
 	return PVE::Firewall::copy_opject_with_digest($hostfw_conf->{options});
     }});
@@ -118,36 +118,39 @@ __PACKAGE__->register_method({
     code => sub {
 	my ($param) = @_;
 
-	my $hostfw_conf = PVE::Firewall::load_hostfw_conf();
+	PVE::Firewall::lock_hostfw_conf(undef, 10, sub {
+	    my $cluster_conf = PVE::Firewall::load_clusterfw_conf();
+	    my $hostfw_conf = PVE::Firewall::load_hostfw_conf($cluster_conf);
 
-	my (undef, $digest) = PVE::Firewall::copy_opject_with_digest($hostfw_conf->{options});
-	PVE::Tools::assert_if_modified($digest, $param->{digest});
+	    my (undef, $digest) = PVE::Firewall::copy_opject_with_digest($hostfw_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 $hostfw_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 $hostfw_conf->{options}->{$opt};
+		}
 	    }
-	}
 
-	if (defined($param->{enable})) {
-	    $param->{enable} = $param->{enable} ? 1 : 0;
-	}
+	    if (defined($param->{enable})) {
+		$param->{enable} = $param->{enable} ? 1 : 0;
+	    }
 
-	foreach my $k (keys %$option_properties) {
-	    next if !defined($param->{$k});
-	    $hostfw_conf->{options}->{$k} = $param->{$k}; 
-	}
+	    foreach my $k (keys %$option_properties) {
+		next if !defined($param->{$k});
+		$hostfw_conf->{options}->{$k} = $param->{$k};
+	    }
 
-	PVE::Firewall::save_hostfw_conf($hostfw_conf);
+	    PVE::Firewall::save_hostfw_conf($hostfw_conf);
+	});
 
 	return undef;
     }});
 
 __PACKAGE__->register_method({
-    name => 'log', 
-    path => 'log', 
+    name => 'log',
+    path => 'log',
     method => 'GET',
     description => "Read firewall log",
     proxyto => 'node',
@@ -169,11 +172,23 @@ __PACKAGE__->register_method({
 		minimum => 0,
 		optional => 1,
 	    },
+	    since => {
+		type => 'integer',
+		minimum => 0,
+		description => "Display log since this UNIX epoch.",
+		optional => 1,
+	    },
+	    until => {
+		type => 'integer',
+		minimum => 0,
+		description => "Display log until this UNIX epoch.",
+		optional => 1,
+	    },
 	},
     },
     returns => {
 	type => 'array',
-	items => { 
+	items => {
 	    type => "object",
 	    properties => {
 		n => {
@@ -193,12 +208,14 @@ __PACKAGE__->register_method({
 	my $rpcenv = PVE::RPCEnvironment::get();
 	my $user = $rpcenv->get_user();
 	my $node = $param->{node};
+	my $filename = "/var/log/pve-firewall.log";
 
-	my ($count, $lines) = PVE::Tools::dump_logfile("/var/log/pve-firewall.log", $param->{start}, $param->{limit});
+	my ($count, $lines) = PVE::Firewall::Helpers::dump_fw_logfile(
+	    $filename, $param, undef);
 
 	$rpcenv->set_result_attrib('total', $count);
-	    
-	return $lines; 
+
+	return $lines;
     }});
 
 1;