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 693EF9C1DC for ; Wed, 31 May 2023 13:20:33 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 507208B2D for ; Wed, 31 May 2023 13:20:33 +0200 (CEST) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [IPv6:2a0a:1580:2000::2d]) (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 ; Wed, 31 May 2023 13:20:32 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id A6B588B5E; Wed, 31 May 2023 13:20:26 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 99A772C31D1; Wed, 31 May 2023 13:19:56 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Wed, 31 May 2023 13:19:52 +0200 Message-Id: <20230531111952.568734-3-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230531111952.568734-1-aderumier@odiso.com> References: <20230531111952.568734-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.152 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 HEADER_FROM_DIFFERENT_DOMAINS 0.249 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods POISEN_SPAM_PILL 0.1 Meta: its spam POISEN_SPAM_PILL_1 0.1 random spam to be learned in bayes POISEN_SPAM_PILL_3 0.1 random spam to be learned in bayes SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-manager 1/1] httpserver: add rewrite uri for /nodes/(qemu/lxc)/ 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: Wed, 31 May 2023 11:20:33 -0000 If nodename is not defined, we search the nodename and rewrite uri to /nodes//(qemu|lxc)/ --- PVE/HTTPServer.pm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/PVE/HTTPServer.pm b/PVE/HTTPServer.pm index dabdf7f3..b43611e1 100755 --- a/PVE/HTTPServer.pm +++ b/PVE/HTTPServer.pm @@ -46,6 +46,21 @@ sub verify_spice_connect_url { return ($vmid, $node, $port); } +sub rewrite_uri { + my ($self, $uri) = @_; + + my $base_uri = $self->{base_uri}; + if($uri =~ m/^(\Q$base_uri\E\/+([a-z][a-z0-9]+)\/nodes\/)((qemu|lxc)\/(\d+)(.*))/) { + PVE::Cluster::cfs_update(); + my $vmid = $5; + my $vmlist = PVE::Cluster::get_vmlist(); + my $nodename = $vmlist->{ids}->{$vmid}->{node}; + return $uri if !$nodename; + $uri = "$1$nodename/$3"; + } + return $uri; +} + sub generate_csrf_prevention_token { my ($username) = @_; return PVE::AccessControl::assemble_csrf_prevention_token($username); -- 2.30.2