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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 1D27D93A2F for ; Tue, 20 Feb 2024 16:09:13 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E17299E9F for ; Tue, 20 Feb 2024 16:08:42 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 20 Feb 2024 16:08:42 +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 F41E343C9D for ; Tue, 20 Feb 2024 16:08:41 +0100 (CET) From: Max Carrara To: pve-devel@lists.proxmox.com Date: Tue, 20 Feb 2024 16:08:36 +0100 Message-Id: <20240220150836.520529-1-m.carrara@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.006 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [ticket.pm] Subject: [pve-devel] [PATCH pve-common] ticket: remove fallback for SHA1-base64 CSRF prevention tokens 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: Tue, 20 Feb 2024 15:09:13 -0000 Signed-off-by: Max Carrara --- As the old inline comment notes, this should've been removed in PVE 7.0 already. src/PVE/Ticket.pm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/PVE/Ticket.pm b/src/PVE/Ticket.pm index ce8d5c8..c5508ed 100644 --- a/src/PVE/Ticket.pm +++ b/src/PVE/Ticket.pm @@ -34,13 +34,7 @@ sub verify_csrf_prevention_token { my $timestamp = $1; my $ttime = hex($timestamp); - my $digest; - if (length($sig) == 27) { - # detected sha1 csrf token from older proxy, fallback. FIXME: remove with 7.0 - $digest = Digest::SHA::sha1_base64("$timestamp:$username", $secret); - } else { - $digest = Digest::SHA::hmac_sha256_base64("$timestamp:$username", $secret); - } + my $digest = Digest::SHA::hmac_sha256_base64("$timestamp:$username", $secret); my $age = time() - $ttime; return 1 if ($digest eq $sig) && ($age > $min_age) && -- 2.39.2