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 9B62E71A25; Fri, 11 Jun 2021 13:45:14 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5DF8D10C6C; Fri, 11 Jun 2021 13:44:39 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id B064B10904; Fri, 11 Jun 2021 13:44:27 +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 827BB42F38; Fri, 11 Jun 2021 13:44:27 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Date: Fri, 11 Jun 2021 13:44:16 +0200 Message-Id: <20210611114418.28772-28-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210611114418.28772-1-f.ebner@proxmox.com> References: <20210611114418.28772-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.845 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. [apt.pm] Subject: [pve-devel] [PATCH v6 pve-manager 3/5] api: apt: add call for repository check 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: Fri, 11 Jun 2021 11:45:14 -0000 Signed-off-by: Fabian Ebner --- Changes from v5: * The check_repositories function in Rust takes an Option<&str> now. Adapt to that and work around edge case in perlmod (already fixed in current master) PVE/API2/APT.pm | 78 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/PVE/API2/APT.pm b/PVE/API2/APT.pm index 0e1cc260..2815785e 100644 --- a/PVE/API2/APT.pm +++ b/PVE/API2/APT.pm @@ -68,6 +68,7 @@ __PACKAGE__->register_method({ my $res = [ { id => 'changelog' }, { id => 'repositories' }, + { id => 'checkrepositories' }, { id => 'update' }, { id => 'versions' }, ]; @@ -631,6 +632,83 @@ __PACKAGE__->register_method({ }; }}); +__PACKAGE__->register_method({ + name => 'checkrepositories', + path => 'checkrepositories', + method => 'GET', + proxyto => 'node', + description => "Additional sanity checks for the configured APT repositories.", + permissions => { + check => ['perm', '/nodes/{node}', [ 'Sys.Audit' ]], + }, + parameters => { + additionalProperties => 0, + properties => { + node => get_standard_option('pve-node'), + digest => { + type => "string", + description => "Digest to detect modifications.", + maxLength => 80, + optional => 1, + }, + }, + }, + returns => { + type => "object", + description => "Additional sanity checks for the configured APT repositories.", + properties => { + infos => { + type => "array", + description => "Additional information/warnings for APT repositories.", + items => { + type => "object", + properties => { + path => { + type => "string", + description => "Path to the associated file.", + }, + number => { + type => "string", + description => "Number of the associated repository within the file.", + }, + kind => { + type => "string", + description => "Kind of the information (e.g. warning).", + }, + message => { + type => "string", + description => "Information message.", + } + }, + }, + }, + enterprise => { + type => "boolean", + description => "Whether the enterprise repository is enabled or not.", + }, + nosubscription => { + type => "boolean", + description => "Whether the no-subscription repository is enabled or not.", + } + }, + }, + code => sub { + my ($param) = @_; + + # NOTE As of perlmod 0.4.3, passing $param->{digest} directly will fail if the value is + # undef. Assign it to a variable first to work around the issue. + my $digest = $param->{digest}; + + my ($infos, $enterprise, $nosubscription) = + PVE::RS::APT::Repositories::check_repositories($digest); + + return { + infos => $infos, + enterprise => $enterprise, + nosubscription => $nosubscription, + }; + }}); + __PACKAGE__->register_method({ name => 'versions', path => 'versions', -- 2.20.1