michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add ability to update the key's contacts

Browse Source
This commit is contained in:
Ilia Rostovtsev
2022-03-21 22:45:59 +02:00
parent 5662ee9062
commit 6519246aef
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
webmin/webmin-lib.pl
View File

@@ -43,8 +43,6 @@ our $webmin_key_email = "jcameron\@webmin.com";
our $webmin_key_fingerprint = "1719 003A CE3E 5A41 E2DE 70DF D97A 3AE9 11F6 3C51";
our $authentic_key_email = "gpg\@ilia.engineer";
our $authentic_key_email_old = "ilia\@rostovtsev.io";
our $authentic_key_email_older = "ilia\@rostovtsev.ru";
our $authentic_key_fingerprint = "EC60 F3DA 9CB7 9ADC CF56 0D1F 121E 166D D9C8 21AB";
our $standard_host = $primary_host;
@@ -640,10 +638,7 @@ my ($ok, $err) = &import_gnupg_key(
return ($ok, $err) if ($ok);
($ok, $err) = &import_gnupg_key(
$authentic_key_email."|".
$authentic_key_email_old."|".
$authentic_key_email_older,
$authentic_key_fingerprint,
$authentic_key_email, $authentic_key_fingerprint,
"$root_directory/authentic-theme/THEME.pgp");
return ($ok, $err) if ($ok);
@@ -664,8 +659,21 @@ return (0) if (!-r $path);
my @keys = &list_keys();
foreach my $k (@keys) {
my $fp = &key_fingerprint($k);
return ( 0 ) if ($k->{'email'}->[0] =~ /^$email$/ &&
$fp && $fp eq $finger);
# Key already been imported with correct contact
if ($k->{'email'}->[0] eq $email && $fp && $fp eq $finger) {
return (0);
}
# Key been imported before but contact changed, delete first
elsif ($k->{'email'}->[0] ne $email) {
my $key = $finger;
$key =~ s/\s+//g;
if ($k->{'key'} eq $key) {
my $out = &backquote_logged("$gpgpath --batch --delete-key $k->{'key'} 2>&1");
if ($?) {
return (2, $out);
}
}
}
}
# Import it if not