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 9B60F7F342 for ; Fri, 12 Nov 2021 10:37:46 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 910AE16CBE for ; Fri, 12 Nov 2021 10:37:46 +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 id 2716116CB5 for ; Fri, 12 Nov 2021 10:37:46 +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 EDE9343778 for ; Fri, 12 Nov 2021 10:37:45 +0100 (CET) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Fri, 12 Nov 2021 10:37:45 +0100 Message-Id: <20211112093745.55337-1-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.471 Adjusted score from AWL reputation of From: address 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. [tfa.pm] Subject: [pve-devel] [PATCH access-control] tfa: fix http 404 in get_tfa_entry 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: Fri, 12 Nov 2021 09:37:46 -0000 this produced warnings in the journal and returned code 500 instead Signed-off-by: Wolfgang Bumiller --- src/PVE/API2/TFA.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/PVE/API2/TFA.pm b/src/PVE/API2/TFA.pm index 87d7255..657a74c 100644 --- a/src/PVE/API2/TFA.pm +++ b/src/PVE/API2/TFA.pm @@ -3,6 +3,8 @@ package PVE::API2::TFA; use strict; use warnings; +use HTTP::Status qw(:constants); + use PVE::AccessControl; use PVE::Cluster qw(cfs_read_file cfs_write_file); use PVE::JSONSchema qw(get_standard_option); @@ -280,7 +282,7 @@ __PACKAGE__->register_method ({ my $tfa_cfg = cfs_read_file('priv/tfa.cfg'); my $id = $param->{id}; my $entry = $tfa_cfg->api_get_tfa_entry($param->{userid}, $id); - raise("No such tfa entry '$id'", 404) if !$entry; + raise("No such tfa entry '$id'", code => HTTP::Status::HTTP_NOT_FOUND) if !$entry; return $entry; }}); -- 2.30.2