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 B1FF67D718 for ; Tue, 9 Nov 2021 12:27:53 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D2BB4AFC1 for ; Tue, 9 Nov 2021 12:27:26 +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 B3C76AF95 for ; Tue, 9 Nov 2021 12:27:25 +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 78BE046917 for ; Tue, 9 Nov 2021 12:27:25 +0100 (CET) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Tue, 9 Nov 2021 12:27:07 +0100 Message-Id: <20211109112721.130935-19-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211109112721.130935-1-w.bumiller@proxmox.com> References: <20211109112721.130935-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.546 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. [ticket.pm] Subject: [pve-devel] [PATCH common] Ticket: uri-escape colons 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, 09 Nov 2021 11:27:53 -0000 Signed-off-by: Wolfgang Bumiller --- src/PVE/Ticket.pm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/PVE/Ticket.pm b/src/PVE/Ticket.pm index d522401..ce8d5c8 100644 --- a/src/PVE/Ticket.pm +++ b/src/PVE/Ticket.pm @@ -8,6 +8,7 @@ use Crypt::OpenSSL::RSA; use MIME::Base64; use Digest::SHA; use Time::HiRes qw(gettimeofday); +use URI::Escape; use PVE::Exception qw(raise); @@ -60,7 +61,10 @@ sub assemble_rsa_ticket { my $plain = "$prefix:"; - $plain .= "$data:" if defined($data); + if (defined($data)) { + $data = uri_escape($data, ':'); + $plain .= "$data:"; + } $plain .= $timestamp; @@ -88,6 +92,10 @@ sub verify_rsa_ticket { my $age = time() - $ttime; + if (defined($data)) { + $data = uri_unescape($data); + } + if (($age > $min_age) && ($age < $max_age)) { if (defined($data)) { return wantarray ? ($data, $age) : $data; -- 2.30.2