From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 62776FCA8 for ; Mon, 24 Jul 2023 15:56:59 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4537EF940 for ; Mon, 24 Jul 2023 15:56:29 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 24 Jul 2023 15:56:28 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 50E304263C for ; Mon, 24 Jul 2023 15:56:28 +0200 (CEST) Date: Mon, 24 Jul 2023 15:56:27 +0200 From: Wolfgang Bumiller To: Lukas Wagner Cc: pve-devel@lists.proxmox.com Message-ID: <6sbzwrne6qwkgw5ea5l573n3y34zbjdycmhdqzmtp64yipapf7@ecdg44meoymy> References: <20230720143236.652292-1-l.wagner@proxmox.com> <20230720143236.652292-53-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230720143236.652292-53-l.wagner@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.116 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pve-devel] [PATCH v4 pve-manager 52/69] api: notification: add api routes for filters X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jul 2023 13:56:59 -0000 And the eval{} parts once more here ;-) On Thu, Jul 20, 2023 at 04:32:19PM +0200, Lukas Wagner wrote: > Signed-off-by: Lukas Wagner > --- > PVE/API2/Cluster/Notifications.pm | 263 ++++++++++++++++++++++++++++++ > 1 file changed, 263 insertions(+) > > diff --git a/PVE/API2/Cluster/Notifications.pm b/PVE/API2/Cluster/Notifications.pm > index 8f0b6429..e358573c 100644 > --- a/PVE/API2/Cluster/Notifications.pm > +++ b/PVE/API2/Cluster/Notifications.pm > @@ -76,6 +76,7 @@ __PACKAGE__->register_method ({ > code => sub { > my $result = [ > { name => 'endpoints' }, > + { name => 'filters' }, > { name => 'groups' }, > ]; > > @@ -908,4 +909,266 @@ __PACKAGE__->register_method ({ > return; > } > }); > + > +my $filter_properties = { > + name => { > + description => 'Name of the endpoint.', > + type => 'string', > + format => 'pve-configid', > + }, > + 'min-severity' => { > + type => 'string', > + description => 'Minimum severity to match', > + optional => 1, > + enum => [qw(info notice warning error)], > + }, > + mode => { > + type => 'string', > + description => "Choose between 'and' and 'or' for when multiple properties are specified", > + optional => 1, > + enum => [qw(and or)], > + default => 'and', > + }, > + 'invert-match' => { > + type => 'boolean', > + description => 'Invert match of the whole filter', > + optional => 1, > + }, > + 'comment' => { > + description => 'Comment', > + type => 'string', > + optional => 1, > + }, > +}; > + > +__PACKAGE__->register_method ({ > + name => 'get_filters', > + path => 'filters', > + method => 'GET', > + description => 'Returns a list of all filters', > + protected => 1, > + permissions => { > + description => "Only lists entries where you have 'Mapping.Modify', 'Mapping.Use' or" > + . " 'Mapping.Audit' permissions on '/mapping/notification/'.", > + user => 'all', > + }, > + parameters => { > + additionalProperties => 0, > + properties => {}, > + }, > + returns => { > + type => 'array', > + items => { > + type => 'object', > + properties => $filter_properties, > + }, > + links => [ { rel => 'child', href => '{name}' } ], > + }, > + code => sub { > + my $config = PVE::Notify::read_config(); > + my $rpcenv = PVE::RPCEnvironment::get(); > + my $authuser = $rpcenv->get_user(); > + my $can_see_mapping_privs = ['Mapping.Modify', 'Mapping.Use', 'Mapping.Audit']; > + > + my $filters = [grep { > + $rpcenv->check_any( > + $authuser, > + "/mapping/notification/$_->{name}", > + $can_see_mapping_privs, > + 1 > + ) > + } eval { Here. > + @{$config->get_filters()} > + }]; > + > + raise_api_error($@) if ($@); > + return $filters; > + } > +}); > + > +__PACKAGE__->register_method ({ > + name => 'get_filter', > + path => 'filters/{name}', > + method => 'GET', > + description => 'Return a specific filter', > + protected => 1, > + permissions => { > + check => ['or', > + ['perm', '/mapping/notification/{name}', ['Mapping.Modify']], > + ['perm', '/mapping/notification/{name}', ['Mapping.Audit']], > + ], > + }, > + parameters => { > + additionalProperties => 0, > + properties => { > + name => { > + type => 'string', > + format => 'pve-configid', > + }, > + } > + }, > + returns => { > + type => 'object', > + properties => { > + %$filter_properties, > + digest => get_standard_option('pve-config-digest'), > + }, > + }, > + code => sub { > + my ($param) = @_; > + my $name = extract_param($param, 'name'); > + > + my $config = PVE::Notify::read_config(); > + > + my $filter = eval { > + $config->get_filter($name) > + }; > + $filter->{digest} = $config->digest(); here > + > + raise_api_error($@) if ($@); > + return $filter; > + } > +}); > + > +__PACKAGE__->register_method ({ > + name => 'create_filter', > + path => 'filters', > + protected => 1, > + method => 'POST', > + description => 'Create a new filter', > + protected => 1, > + permissions => { > + check => ['perm', '/mapping/notification', ['Mapping.Modify']], > + }, > + parameters => { > + additionalProperties => 0, > + properties => $filter_properties, > + }, > + returns => { type => 'null' }, > + code => sub { > + my ($param) = @_; > + > + my $name = extract_param($param, 'name'); > + my $min_severity = extract_param($param, 'min-severity'); > + my $mode = extract_param($param, 'mode'); > + my $invert_match = extract_param($param, 'invert-match'); > + my $comment = extract_param($param, 'comment'); > + > + eval { > + PVE::Notify::lock_config(sub { > + my $config = PVE::Notify::read_config(); > + > + $config->add_filter( > + $name, > + $min_severity, > + $mode, > + $invert_match, > + $comment, > + ); > + > + PVE::Notify::write_config($config); > + }); > + }; > + > + raise_api_error($@) if ($@); > + return; > + } > +}); > + > +__PACKAGE__->register_method ({ > + name => 'update_filter', > + path => 'filters/{name}', > + protected => 1, > + method => 'PUT', > + description => 'Update existing filter', > + permissions => { > + check => ['perm', '/mapping/notification/{name}', ['Mapping.Modify']], > + }, > + parameters => { > + additionalProperties => 0, > + properties => { > + %{ make_properties_optional($filter_properties) }, > + delete => { > + type => 'array', > + items => { > + type => 'string', > + format => 'pve-configid', > + }, > + optional => 1, > + description => 'A list of settings you want to delete.', > + }, > + digest => get_standard_option('pve-config-digest'), > + }, > + }, > + returns => { type => 'null' }, > + code => sub { > + my ($param) = @_; > + > + my $name = extract_param($param, 'name'); > + my $min_severity = extract_param($param, 'min-severity'); > + my $mode = extract_param($param, 'mode'); > + my $invert_match = extract_param($param, 'invert-match'); > + my $comment = extract_param($param, 'comment'); > + my $digest = extract_param($param, 'digest'); > + my $delete = extract_param($param, 'delete'); > + > + eval { > + PVE::Notify::lock_config(sub { > + my $config = PVE::Notify::read_config(); > + > + $config->update_filter( > + $name, > + $min_severity, > + $mode, > + $invert_match, > + $comment, > + $delete, > + $digest, > + ); > + > + PVE::Notify::write_config($config); > + }); > + }; > + > + raise_api_error($@) if ($@); > + return; > + } > +}); > + > +__PACKAGE__->register_method ({ > + name => 'delete_filter', > + protected => 1, > + path => 'filters/{name}', > + method => 'DELETE', > + description => 'Remove filter', > + permissions => { > + check => ['perm', '/mapping/notification/{name}', ['Mapping.Modify']], > + }, > + parameters => { > + additionalProperties => 0, > + properties => { > + name => { > + type => 'string', > + format => 'pve-configid', > + }, > + } > + }, > + returns => { type => 'null' }, > + code => sub { > + my ($param) = @_; > + my $name = extract_param($param, 'name'); > + > + eval { > + PVE::Notify::lock_config(sub { > + my $config = PVE::Notify::read_config(); > + $config->delete_filter($name); > + PVE::Notify::write_config($config); > + }); > + }; > + > + raise_api_error($@) if ($@); > + return; > + } > +}); > + > 1; > -- > 2.39.2