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 C57E373729 for ; Tue, 6 Jul 2021 14:32:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AF258E9FB for ; Tue, 6 Jul 2021 14:32:15 +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 760A9C12D for ; Tue, 6 Jul 2021 14:32:00 +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 B1C9240C72 for ; Tue, 6 Jul 2021 14:31:59 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Tue, 6 Jul 2021 14:31:55 +0200 Message-Id: <20210706123155.9724-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.568 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. [pve6to7.pm] Subject: [pve-devel] [PATCH manager] pve6to7: add check for Debian security repository 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, 06 Jul 2021 12:32:45 -0000 since the pattern for the suite changed. Signed-off-by: Fabian Ebner --- PVE/CLI/pve6to7.pm | 71 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/PVE/CLI/pve6to7.pm b/PVE/CLI/pve6to7.pm index 163f5e4a..6c1c3726 100644 --- a/PVE/CLI/pve6to7.pm +++ b/PVE/CLI/pve6to7.pm @@ -1016,6 +1016,76 @@ sub check_containers_cgroup_compat { } }; +sub check_security_repo { + log_info("Checking if the suite for the Debian security repository is correct.."); + + my $found = 0; + + my $dir = '/etc/apt/sources.list.d'; + my $in_dir = 0; + + my $check_file = sub { + my ($file) = @_; + + $file = "${dir}/${file}" if $in_dir; + + my $raw = eval { PVE::Tools::file_get_contents($file) }; + return if !defined($raw); + my @lines = split(/\n/, $raw); + + my $number = 0; + for my $line (@lines) { + $number++; + + next if length($line) == 0; # split would result in undef then... + + ($line) = split(/#/, $line); + + next if $line !~ m/^deb/; # is case sensitive + + my $suite; + + # catch any of + # https://deb.debian.org/debian-security + # http://security.debian.org/debian-security + # http://security.debian.org/ + if ($line =~ m|https?://deb\.debian\.org/debian-security/?\s+(\S*)|i) { + $suite = $1; + } elsif ($line =~ m|https?://security\.debian\.org(?:.*?)\s+(\S*)|i) { + $suite = $1; + } else { + next; + } + + $found = 1; + + my $where = "in ${file}:${number}"; + + if ($suite eq 'buster/updates') { + log_info("Make sure to change the suite of the Debian security repository " . + "from 'buster/updates' to 'bullseye-security' - $where"); + } elsif ($suite eq 'bullseye-security') { + log_pass("already using 'bullseye-security'"); + } else { + log_fail("The new suite of the Debian security repository should be " . + "'bullseye-security' - $where"); + } + } + }; + + $check_file->("/etc/apt/sources.list"); + + $in_dir = 1; + + PVE::Tools::dir_glob_foreach($dir, '^.*\.list$', $check_file); + + if (!$found) { + # only warn, it might be defined in a .sources file or in a way not catched above + log_warn("No Debian security repository detected in /etc/apt/sources.list and " . + "/etc/apt/sources.list.d/*.list"); + } +} + sub check_misc { print_header("MISCELLANEOUS CHECKS"); my $ssh_config = eval { PVE::Tools::file_get_contents('/root/.ssh/config') }; @@ -1118,6 +1188,7 @@ sub check_misc { check_custom_pool_roles(); check_description_lengths(); check_storage_content(); + check_security_repo(); } __PACKAGE__->register_method ({ -- 2.20.1