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 72E94917D9 for ; Mon, 14 Nov 2022 12:39:14 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4A536229B3 for ; Mon, 14 Nov 2022 12:38:44 +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 ; Mon, 14 Nov 2022 12:38:43 +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 398F643CC9 for ; Mon, 14 Nov 2022 12:38:42 +0100 (CET) From: Stefan Sterz To: pve-devel@lists.proxmox.com Date: Mon, 14 Nov 2022 12:38:27 +0100 Message-Id: <20221114113828.286081-2-s.sterz@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221114113828.286081-1-s.sterz@proxmox.com> References: <20221114113828.286081-1-s.sterz@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: =?UTF-8?Q?0=0A=09?=AWL -0.101 Adjusted score from AWL reputation of From: =?UTF-8?Q?address=0A=09?=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 =?UTF-8?Q?Alignment=0A=09?=SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF =?UTF-8?Q?Record=0A=09?=SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH docs v3 1/2] asciidoc-pve: disallow certain characters in onlineHelp keys 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: Mon, 14 Nov 2022 11:39:14 -0000 this removes the lazily evaluated part of the regex used to detect `onlineHelp` keys in order to match them with asciidoc anchors in the documentation. it uses a pattern that excludes curly braces, brackets and quotations instead. this allows for greedy matching and also removes an issue where keys that are set via CBind were included incorrectly. the script would try to find an anchor name that was equivalent to the CBind placeholder, which would fail. since brackets, curly braces and quotation marks aren't allowed in asciidoc anchors anyway, excluding them like this should be safe. Signed-off-by: Stefan Sterz --- asciidoc-pve.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asciidoc-pve.in b/asciidoc-pve.in index d638a38..49e54bd 100644 --- a/asciidoc-pve.in +++ b/asciidoc-pve.in @@ -465,7 +465,7 @@ sub scan_extjs_file { debug("scan-extjs $filename"); while(defined(my $line = <$fh>)) { - if ($line =~ m/\s+onlineHelp:\s*[\'\"](.*?)[\'\"]/) { + if ($line =~ m/\s+onlineHelp:\s*[\'\"]([^{}\[\]\'\"]+)[\'\"]/) { my $blockid = $1; my $link = $fileinfo->{blockid_target}->{default}->{$blockid}; die "undefined blockid '$blockid' ($filename, line $.)\n" -- 2.30.2