-package PVE::API2::Firewall::VM;
+package PVE::API2::Firewall::VMBase;
use strict;
use warnings;
use PVE::Cluster;
use PVE::Firewall;
use PVE::API2::Firewall::Rules;
+use PVE::API2::Firewall::Aliases;
use Data::Dumper; # fixme: remove
use base qw(PVE::RESTHandler);
-__PACKAGE__->register_method ({
- subclass => "PVE::API2::Firewall::VMRules",
- path => 'rules',
-});
-
-__PACKAGE__->register_method({
- name => 'index',
- path => '',
- method => 'GET',
- permissions => { user => 'all' },
- description => "Directory index.",
- parameters => {
- additionalProperties => 0,
- properties => {
- node => get_standard_option('pve-node'),
- vmid => get_standard_option('pve-vmid'),
- },
- },
- returns => {
- type => 'array',
- items => {
- type => "object",
- properties => {},
- },
- links => [ { rel => 'child', href => "{name}" } ],
- },
- code => sub {
- my ($param) = @_;
-
- my $result = [
- { name => 'rules' },
- { name => 'options' },
- ];
-
- return $result;
- }});
-
my $option_properties = {
enable => {
description => "Enable host firewall rules.",
type => 'boolean',
optional => 1,
},
+ macfilter => {
+ description => "Enable/disable MAC address filter.",
+ type => 'boolean',
+ optional => 1,
+ },
+ dhcp => {
+ description => "Enable DHCP.",
+ type => 'boolean',
+ optional => 1,
+ },
policy_in => {
description => "Input policy.",
type => 'string',
optional => 1,
enum => ['ACCEPT', 'REJECT', 'DROP'],
},
+ log_level_in => get_standard_option('pve-fw-loglevel', {
+ description => "Log level for incoming traffic." }),
+ log_level_out => get_standard_option('pve-fw-loglevel', {
+ description => "Log level for outgoing traffic." }),
+
};
my $add_option_properties = sub {
return $properties;
};
-__PACKAGE__->register_method({
- name => 'get_options',
- path => 'options',
- method => 'GET',
- description => "Get VM firewall options.",
- proxyto => 'node',
- parameters => {
- additionalProperties => 0,
- properties => {
- node => get_standard_option('pve-node'),
- vmid => get_standard_option('pve-vmid'),
+
+sub register_handlers {
+ my ($class, $rule_env) = @_;
+
+ $class->register_method({
+ name => 'index',
+ path => '',
+ method => 'GET',
+ permissions => { user => 'all' },
+ description => "Directory index.",
+ parameters => {
+ additionalProperties => 0,
+ properties => {
+ node => get_standard_option('pve-node'),
+ vmid => get_standard_option('pve-vmid'),
+ },
},
- },
- returns => {
- type => "object",
- #additionalProperties => 1,
- properties => $option_properties,
- },
- code => sub {
- my ($param) = @_;
-
- my $vmfw_conf = PVE::Firewall::load_vmfw_conf($param->{vmid});
-
- return PVE::Firewall::copy_opject_with_digest($vmfw_conf->{options});
- }});
-
-__PACKAGE__->register_method({
- name => 'set_options',
- path => 'options',
- method => 'PUT',
- description => "Set Firewall options.",
- protected => 1,
- proxyto => 'node',
- parameters => {
- additionalProperties => 0,
- properties => &$add_option_properties({
- node => get_standard_option('pve-node'),
- vmid => get_standard_option('pve-vmid'),
- delete => {
- type => 'string', format => 'pve-configid-list',
- description => "A list of settings you want to delete.",
- optional => 1,
+ returns => {
+ type => 'array',
+ items => {
+ type => "object",
+ properties => {},
},
- digest => get_standard_option('pve-config-digest'),
- }),
- },
- returns => { type => "null" },
- code => sub {
- my ($param) = @_;
+ links => [ { rel => 'child', href => "{name}" } ],
+ },
+ code => sub {
+ my ($param) = @_;
- my $vmfw_conf = PVE::Firewall::load_vmfw_conf($param->{vmid});
+ my $result = [
+ { name => 'rules' },
+ { name => 'aliases' },
+ { name => 'options' },
+ ];
- my (undef, $digest) = PVE::Firewall::copy_opject_with_digest($vmfw_conf->{options});
- PVE::Tools::assert_if_modified($digest, $param->{digest});
+ return $result;
+ }});
- 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 $vmfw_conf->{options}->{$opt};
- }
- }
-
- if (defined($param->{enable})) {
- $param->{enable} = $param->{enable} ? 1 : 0;
- }
-
- foreach my $k (keys %$option_properties) {
- next if !defined($param->{$k});
- $vmfw_conf->{options}->{$k} = $param->{$k};
- }
-
- PVE::Firewall::save_vmfw_conf($param->{vmid}, $vmfw_conf);
-
- return undef;
- }});
-
-__PACKAGE__->register_method({
- name => 'log',
- path => 'log',
- method => 'GET',
- description => "Read firewall log",
- proxyto => 'node',
- permissions => {
- check => ['perm', '/vms/{vmid}', [ 'VM.Console' ]],
- },
- protected => 1,
- parameters => {
- additionalProperties => 0,
- properties => {
- node => get_standard_option('pve-node'),
- vmid => get_standard_option('pve-vmid'),
- start => {
- type => 'integer',
- minimum => 0,
- optional => 1,
- },
- limit => {
- type => 'integer',
- minimum => 0,
- optional => 1,
+
+ $class->register_method({
+ name => 'get_options',
+ path => 'options',
+ method => 'GET',
+ description => "Get VM firewall options.",
+ proxyto => 'node',
+ parameters => {
+ additionalProperties => 0,
+ properties => {
+ node => get_standard_option('pve-node'),
+ vmid => get_standard_option('pve-vmid'),
},
},
- },
- returns => {
- type => 'array',
- items => {
+ returns => {
type => "object",
- properties => {
- n => {
- description=> "Line number",
- type=> 'integer',
+ #additionalProperties => 1,
+ properties => $option_properties,
+ },
+ code => sub {
+ my ($param) = @_;
+
+ my $cluster_conf = PVE::Firewall::load_clusterfw_conf();
+ my $vmfw_conf = PVE::Firewall::load_vmfw_conf($cluster_conf, $rule_env, $param->{vmid});
+
+ return PVE::Firewall::copy_opject_with_digest($vmfw_conf->{options});
+ }});
+
+ $class->register_method({
+ name => 'set_options',
+ path => 'options',
+ method => 'PUT',
+ description => "Set Firewall options.",
+ protected => 1,
+ proxyto => 'node',
+ parameters => {
+ additionalProperties => 0,
+ properties => &$add_option_properties({
+ node => get_standard_option('pve-node'),
+ vmid => get_standard_option('pve-vmid'),
+ delete => {
+ type => 'string', format => 'pve-configid-list',
+ description => "A list of settings you want to delete.",
+ optional => 1,
},
- t => {
- description=> "Line text",
- type => 'string',
+ digest => get_standard_option('pve-config-digest'),
+ }),
+ },
+ returns => { type => "null" },
+ code => sub {
+ my ($param) = @_;
+
+
+ my $cluster_conf = PVE::Firewall::load_clusterfw_conf();
+ my $vmfw_conf = PVE::Firewall::load_vmfw_conf($cluster_conf, $rule_env, $param->{vmid});
+
+ my (undef, $digest) = PVE::Firewall::copy_opject_with_digest($vmfw_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 $vmfw_conf->{options}->{$opt};
}
}
- }
- },
- code => sub {
- my ($param) = @_;
- my $rpcenv = PVE::RPCEnvironment::get();
- my $user = $rpcenv->get_user();
- my $vmid = $param->{vmid};
+ if (defined($param->{enable})) {
+ $param->{enable} = $param->{enable} ? 1 : 0;
+ }
+
+ foreach my $k (keys %$option_properties) {
+ next if !defined($param->{$k});
+ $vmfw_conf->{options}->{$k} = $param->{$k};
+ }
+
+ PVE::Firewall::save_vmfw_conf($param->{vmid}, $vmfw_conf);
+
+ return undef;
+ }});
+
+ $class->register_method({
+ name => 'log',
+ path => 'log',
+ method => 'GET',
+ description => "Read firewall log",
+ proxyto => 'node',
+ permissions => {
+ check => ['perm', '/vms/{vmid}', [ 'VM.Console' ]],
+ },
+ protected => 1,
+ parameters => {
+ additionalProperties => 0,
+ properties => {
+ node => get_standard_option('pve-node'),
+ vmid => get_standard_option('pve-vmid'),
+ start => {
+ type => 'integer',
+ minimum => 0,
+ optional => 1,
+ },
+ limit => {
+ type => 'integer',
+ minimum => 0,
+ optional => 1,
+ },
+ },
+ },
+ returns => {
+ type => 'array',
+ items => {
+ type => "object",
+ properties => {
+ n => {
+ description=> "Line number",
+ type=> 'integer',
+ },
+ t => {
+ description=> "Line text",
+ type => 'string',
+ }
+ }
+ }
+ },
+ code => sub {
+ my ($param) = @_;
- my ($count, $lines) = PVE::Tools::dump_logfile("/var/log/pve-firewall.log",
- $param->{start}, $param->{limit},
- "^$vmid ");
+ my $rpcenv = PVE::RPCEnvironment::get();
+ my $user = $rpcenv->get_user();
+ my $vmid = $param->{vmid};
- $rpcenv->set_result_attrib('total', $count);
+ my ($count, $lines) = PVE::Tools::dump_logfile("/var/log/pve-firewall.log",
+ $param->{start}, $param->{limit},
+ "^$vmid ");
+
+ $rpcenv->set_result_attrib('total', $count);
- return $lines;
- }});
+ return $lines;
+ }});
+}
+
+package PVE::API2::Firewall::VM;
+
+use strict;
+use warnings;
+
+use base qw(PVE::API2::Firewall::VMBase);
+
+__PACKAGE__->register_method ({
+ subclass => "PVE::API2::Firewall::VMRules",
+ path => 'rules',
+});
+
+__PACKAGE__->register_method ({
+ subclass => "PVE::API2::Firewall::VMAliases",
+ path => 'aliases',
+});
+
+__PACKAGE__->register_method ({
+ subclass => "PVE::API2::Firewall::VMIPSetList",
+ path => 'ipset',
+});
+
+__PACKAGE__->register_handlers('vm');
+
+package PVE::API2::Firewall::CT;
+
+use strict;
+use warnings;
+
+use base qw(PVE::API2::Firewall::VMBase);
+
+__PACKAGE__->register_method ({
+ subclass => "PVE::API2::Firewall::CTRules",
+ path => 'rules',
+});
+
+__PACKAGE__->register_method ({
+ subclass => "PVE::API2::Firewall::CTAliases",
+ path => 'aliases',
+});
+
+__PACKAGE__->register_method ({
+ subclass => "PVE::API2::Firewall::CTIPSetList",
+ path => 'ipset',
+});
+
+__PACKAGE__->register_handlers('vm');
1;
projects / pve-firewall.git / blobdiff