proxmox-mirrors/pve-access-control
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-access-control synced 2025-10-04 17:18:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tfa: upgrade check: more info in error message(s)

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-11-11 12:06:42 +01:00
parent 9f34502077
commit b649f3b40e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/PVE/AccessControl.pm
View File

@ -1774,22 +1774,22 @@ sub assert_new_tfa_config_available() {
foreach my $node (keys $members->%*) { foreach my $node (keys $members->%*) {
my $info = $version_info->{$node}; my $info = $version_info->{$node};
if (!$info) { if (!$info) {
$old .= "cluster node '$node' is too old, did not broadcast its version info\n"; $old .= " cluster node '$node' is too old, did not broadcast its version info\n";
next; next;
} }
$info = from_json($info); $info = from_json($info);
my $ver = $info->{version}; my $ver = $info->{version};
if ($ver !~ /^(\d+\.\d+)-(\d+)/) { if ($ver !~ /^(\d+\.\d+)-(\d+)/) {
$old .= "cluster node '$node' provided an invalid version string: '$ver'\n"; $old .= " cluster node '$node' provided an invalid version string: '$ver'\n";
next; next;
} }
my ($maj, $rel) = ($1, $2); my ($maj, $rel) = ($1, $2);
if (!($maj > 7.0 || ($maj == 7.0 && $rel >= 15))) { if (!($maj > 7.0 || ($maj == 7.0 && $rel >= 15))) {
$old .= "cluster node '$node' is too old\n"; $old .= " cluster node '$node' is too old ($ver < 7.0-15)\n";
next; next;
} }
} }
die $old if length($old); die "cannot update tfa config, following nodes are not up to date:\n$old" if length($old);
} }
sub user_remove_tfa : prototype($) { sub user_remove_tfa : prototype($) {