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 23D50936B0 for ; Thu, 5 Jan 2023 10:18:58 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EDB35273AD for ; Thu, 5 Jan 2023 10:18:27 +0100 (CET) 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 ; Thu, 5 Jan 2023 10:18:27 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 0FBF0448F6 for ; Thu, 5 Jan 2023 10:18:27 +0100 (CET) From: Christian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 5 Jan 2023 10:18:03 +0100 Message-Id: <20230105091804.156599-2-c.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230105091804.156599-1-c.ebner@proxmox.com> References: <20230105091804.156599-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [vm.pm, host.pm] Subject: [pve-devel] [RFC firewall] api: Add optional parameters `since` and `until` for timestamp filter 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: Thu, 05 Jan 2023 09:18:58 -0000 The optional unix epoch timestamps parameters `since` and `until` are introduced in order to filter firewall logs files. Since the `dump_logfile` function is used in multiple places, not neccessarily following the firewall log output format, a specialized function `dump_fw_logfile` is introduced in the PVE::Tools, with fallback to the previous `dump_logfile` function if none of the parameters is present. This patch depends on the corresponding patch in the pve-common repository. Signed-off-by: Christian Ebner --- src/PVE/API2/Firewall/Host.pm | 15 ++++++++++++++- src/PVE/API2/Firewall/VM.pm | 18 +++++++++++++++--- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/src/PVE/API2/Firewall/Host.pm b/src/PVE/API2/Firewall/Host.pm index dfeccd0..8470f7f 100644 --- a/src/PVE/API2/Firewall/Host.pm +++ b/src/PVE/API2/Firewall/Host.pm @@ -172,6 +172,18 @@ __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 => { @@ -197,7 +209,8 @@ __PACKAGE__->register_method({ my $user = $rpcenv->get_user(); my $node = $param->{node}; - my ($count, $lines) = PVE::Tools::dump_logfile("/var/log/pve-firewall.log", $param->{start}, $param->{limit}); + my($count, $lines) = PVE::Tools::dump_fw_logfile("/var/log/pve-firewall.log", + $param->{start}, $param->{limit}, undef, $param->{since}, $param->{until}); $rpcenv->set_result_attrib('total', $count); diff --git a/src/PVE/API2/Firewall/VM.pm b/src/PVE/API2/Firewall/VM.pm index 48b8c5f..a0c0f94 100644 --- a/src/PVE/API2/Firewall/VM.pm +++ b/src/PVE/API2/Firewall/VM.pm @@ -176,6 +176,18 @@ sub register_handlers { 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 => { @@ -201,9 +213,9 @@ sub register_handlers { my $user = $rpcenv->get_user(); my $vmid = $param->{vmid}; - my ($count, $lines) = PVE::Tools::dump_logfile("/var/log/pve-firewall.log", - $param->{start}, $param->{limit}, - "^$vmid "); + my ($count, $lines) = PVE::Tools::dump_fw_logfile("/var/log/pve-firewall.log", + $param->{start}, $param->{limit}, "^$vmid ", $param->{since}, + $param->{until}); $rpcenv->set_result_attrib('total', $count); -- 2.30.2