From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <n.ullreich@proxmox.com> 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 96FE5F4DF for <pve-devel@lists.proxmox.com>; Fri, 21 Jul 2023 14:23:18 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7FB6C1EAD1 for <pve-devel@lists.proxmox.com>; Fri, 21 Jul 2023 14:23:18 +0200 (CEST) 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 <pve-devel@lists.proxmox.com>; Fri, 21 Jul 2023 14:23:18 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id B80C742313 for <pve-devel@lists.proxmox.com>; Fri, 21 Jul 2023 14:23:17 +0200 (CEST) From: Noel Ullreich <n.ullreich@proxmox.com> To: pve-devel@lists.proxmox.com Date: Fri, 21 Jul 2023 14:23:10 +0200 Message-Id: <20230721122314.80427-1-n.ullreich@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.061 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. [cifsplugin.pm, cephfsplugin.pm, dirplugin.pm, glusterfsplugin.pm, nfsplugin.pm, storage.pm, plugin.pm] Subject: [pve-devel] [PATCH pve-storage v4; pve-manager 0/4] fix #623: show isos/vztmpl/snippets in subdirs X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> X-List-Received-Date: Fri, 21 Jul 2023 12:23:18 -0000 This patch fixes #623, allowing isos/vztmpl/snippets in subdirectories. This feature is opt-in and can be set from the API, web interface or with `pvesm`. changes from v3: * moved regex that is often used into variables * enabled going through symlinked directories as well. NB: there is no logic in this patch that looks for cycles, (so a symlink to the directory it is in will recurse). This is not a security concern since it can only recurse as many times as the depth has been set to, it might however lead to isos/templates/etc appearing multiple times with cycles in their paths. Imo, while it is ugly, it is an edgecase of a niche feature that doesn't break anything, so it's ok. * changed name of parameter from subdir-depth to scan-depth Noel Ullreich (3): recursively go through subdirs to find files add `scan-depth` option to filesystems update test for recursive subdir search src/PVE/Storage.pm | 11 +++++ src/PVE/Storage/CIFSPlugin.pm | 1 + src/PVE/Storage/CephFSPlugin.pm | 1 + src/PVE/Storage/DirPlugin.pm | 1 + src/PVE/Storage/GlusterfsPlugin.pm | 1 + src/PVE/Storage/NFSPlugin.pm | 1 + src/PVE/Storage/Plugin.pm | 61 ++++++++++++++++++--------- src/test/filesystem_path_test.pm | 18 ++++++++ src/test/list_volumes_test.pm | 68 ++++++++++++++++++++++++++++++ src/test/parse_volname_test.pm | 40 ++++++++++++++++++ 10 files changed, 182 insertions(+), 21 deletions(-) Noel Ullreich (1): ui: add field to set subdir-depth in web interface www/manager6/storage/Base.js | 11 +++++++++++ 1 file changed, 11 insertions(+) -- 2.39.2