X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=pvefw;h=b10895e22af32ef3deefe02ea69f829247220f41;hb=5e1267a55ed38388206bc1116b7b68775e8caf72;hp=1a0631b4bf9870b42d6e96de6a11bbd7d6d7b4a0;hpb=9aab3127bdc04bc3e17bcfb0b8461e32694dc098;p=pve-firewall.git

diff --git a/pvefw b/pvefw
index 1a0631b..b10895e 100755
--- a/pvefw
+++ b/pvefw
@@ -3,15 +3,11 @@
 use strict;
 use lib qw(.);
 use PVE::Firewall;
-use File::Path;
-use IO::File;
-use Data::Dumper;
 
 use PVE::SafeSyslog;
 use PVE::Cluster;
 use PVE::INotify;
 use PVE::RPCEnvironment;
-use PVE::QemuServer;
 
 use PVE::JSONSchema qw(get_standard_option);
 
@@ -34,118 +30,6 @@ $rpcenv->set_language($ENV{LANG});
 $rpcenv->set_user('root@pam');
 
 
-sub parse_fw_rules {
-    my ($filename, $fh) = @_;
-
-    my $section;
-
-    my $res = { in => [], out => [] };
-
-    my $macros = PVE::Firewall::get_shorewall_macros();
-
-    while (defined(my $line = <$fh>)) {
-	next if $line =~ m/^#/;
-	next if $line =~ m/^\s*$/;
-
-	if ($line =~ m/^\[(in|out)\]\s*$/i) {
-	    $section = lc($1);
-	    next;
-	}
-	next if !$section;
-
-	my ($action, $iface, $source, $dest, $proto, $dport, $sport) =
-	    split(/\s+/, $line);
-
-	if (!($action && $iface && $source && $dest)) {
-	    warn "skip incomplete line\n";
-	    next;
-	}
-
-	my $service;
-	if ($action =~ m/^(ACCEPT|DROP|REJECT)$/) {
-	    # OK
-	} elsif ($action =~ m/^(\S+)\((ACCEPT|DROP|REJECT)\)$/) {
-	    ($service, $action) = ($1, $2);
-	    if (!$macros->{$service}) {
-		warn "unknown service '$service'\n";
-		next;
-	    }
-	} else {
-	    warn "unknown action '$action'\n";
-	    next;
-	}
-
-	if ($iface !~ m/^(all|net0|net1|net2|net3|net4|net5)$/) {
-	    warn "unknown interface '$iface'\n";
-	    next;
-	}
-
-	if ($proto && $proto !~ m/^(icmp|tcp|udp)$/) {
-	    warn "unknown protokol '$proto'\n";
-	    next;
-	}
-
-	if ($source !~ m/^(any)$/) {
-	    warn "unknown source '$source'\n";
-	    next;
-	}
-
-	if ($dest !~ m/^(any)$/) {
-	    warn "unknown destination '$dest'\n";
-	    next;
-	}
-
-	my $rule = {
-	    action => $action,
-	    service => $service,
-	    iface => $iface,
-	    source => $source,
-	    dest => $dest,
-	    proto => $proto,
-	    dport => $dport,
-	    sport => $sport,
-	};
-
-	push @{$res->{$section}}, $rule;
-    }
-
-    return $res;
-}
-
-sub read_local_vm_config {
-
-    my $openvz = {};
-
-    my $qemu = {};
-
-    my $list = PVE::QemuServer::config_list();
-
-    foreach my $vmid (keys %$list) {
-	my $cfspath = PVE::QemuServer::cfs_config_path($vmid);
-	if (my $conf = PVE::Cluster::cfs_read_file($cfspath)) {
-	    $qemu->{$vmid} = $conf;
-	}
-    }
-
-    my $vmdata = { openvz => $openvz, qemu => $qemu };
-
-    return $vmdata;
-};
-
-sub read_vm_firewall_rules {
-    my ($vmdata) = @_;
-    my $rules = {};
-    foreach my $vmid (keys %{$vmdata->{qemu}}, keys %{$vmdata->{openvz}}) {
-	my $filename = "/etc/pve/firewall/$vmid.fw";
-	my $fh = IO::File->new($filename, O_RDONLY);
-	next if !$fh;
-
-	$rules->{$vmid} = parse_fw_rules($filename, $fh);
-    }
-
-    return $rules;
-}
-
 __PACKAGE__->register_method ({
     name => 'compile',
     path => 'compile',
@@ -160,27 +44,35 @@ __PACKAGE__->register_method ({
     code => sub {
 	my ($param) = @_;
 
-	my $vmdata = read_local_vm_config();
-	my $rules = read_vm_firewall_rules($vmdata);
+	PVE::Firewall::compile();
 
-	# print Dumper($vmdata);
+	return undef;
+    }});
 
-	my $swdir = '/etc/shorewall';
-	mkdir $swdir;
+__PACKAGE__->register_method ({
+    name => 'start',
+    path => 'start',
+    method => 'POST',
+    description => "Start firewall.",
+    parameters => {
+    	additionalProperties => 0,
+	properties => {},
+    },
+    returns => { type => 'null' },
 
-	PVE::Firewall::compile($swdir, $vmdata, $rules);
+    code => sub {
+	my ($param) = @_;
 
-	PVE::Tools::run_command(['shorewall', 'compile']);
+	PVE::Firewall::compile_and_start();
 
 	return undef;
-
     }});
 
 __PACKAGE__->register_method ({
-    name => 'start',
-    path => 'start',
+    name => 'restart',
+    path => 'restart',
     method => 'POST',
-    description => "Start firewall.",
+    description => "Restart firewall.",
     parameters => {
     	additionalProperties => 0,
 	properties => {},
@@ -190,7 +82,7 @@ __PACKAGE__->register_method ({
     code => sub {
 	my ($param) = @_;
 
-	PVE::Tools::run_command(['shorewall', 'start']);
+	PVE::Firewall::compile_and_start(1);
 
 	return undef;
     }});
@@ -238,6 +130,7 @@ my $nodename = PVE::INotify::nodename();
 my $cmddef = {
     compile => [ __PACKAGE__, 'compile', []],
     start => [ __PACKAGE__, 'start', []],
+    restart => [ __PACKAGE__, 'restart', []],
     stop => [ __PACKAGE__, 'stop', []],
     clear => [ __PACKAGE__, 'clear', []],
 };