proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-07-27 08:17:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

inotify: apt auth: sort longest machine entry first and allow deletion

Browse Source 
plus a few code cleanups.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2020-11-27 15:21:37 +01:00
parent 7f4dcc9239
commit 1d15203cfa
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/PVE/INotify.pm
View File

@ -1778,8 +1778,11 @@ my $format_apt_auth_data = sub {
my $raw = ''; my $raw = '';
foreach my $machine (sort keys %$data) { # sort longer entries first, so machine definitions with higher granularity are preferred
for my $machine (sort { length($b) <=> length($a) || $a cmp $b} keys %$data) {
my $d = $data->{$machine}; my $d = $data->{$machine};
next if !defined($d); # allow "deleting" set entries
$raw .= "machine $machine\n"; $raw .= "machine $machine\n";
$raw .= " login $d->{login}\n" if $d->{login}; $raw .= " login $d->{login}\n" if $d->{login};
$raw .= " password $d->{password}\n" if $d->{password}; $raw .= " password $d->{password}\n" if $d->{password};
@ -1792,7 +1795,7 @@ my $format_apt_auth_data = sub {
sub write_apt_auth { sub write_apt_auth {
my ($filename, $fh, $data) = @_; my ($filename, $fh, $data) = @_;
my $raw = &$format_apt_auth_data($data); my $raw = $format_apt_auth_data->($data);
die "write failed: $!" unless print $fh "$raw\n"; die "write failed: $!" unless print $fh "$raw\n";
@ -1808,11 +1811,16 @@ sub update_apt_auth {
$orig->{$machine} = $data->{$machine}; $orig->{$machine} = $data->{$machine};
} }
return &$format_apt_auth_data($orig); return $format_apt_auth_data->($orig);
} }
register_file('apt-auth', "/etc/apt/auth.conf", register_file(
\&read_apt_auth, \&write_apt_auth, 'apt-auth',
\&update_apt_auth, perm => 0640); "/etc/apt/auth.conf",
\&read_apt_auth,
\&write_apt_auth,
\&update_apt_auth,
perm => 0640,
);
1; 1;