webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

pakfire: Drop old key import mechanism

Browse Source 
This was error-prone and allowed to potentially inject another
key.

Fixes: #11539
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2018-03-16 14:36:05 +00:00
parent 7d995c9f56
commit 35b892b0dd
3 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/120/filelists/files
View File

@@ -4,6 +4,7 @@ etc/sysctl.conf
etc/fcron.daily/openvpn-crl-updater etc/fcron.daily/openvpn-crl-updater
etc/rc.d/init.d/dhcp etc/rc.d/init.d/dhcp
etc/rc.d/init.d/unbound etc/rc.d/init.d/unbound
opt/pakfire/lib/functions.pl
opt/pakfire/pakfire.key opt/pakfire/pakfire.key
srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/proxy.cgi

16
src/pakfire/lib/functions.pl
View File

@@ -33,9 +33,6 @@ use Net::Ping;
package Pakfire; package Pakfire;
# GPG Keys
my $myid = "179740DC4D8C47DC63C099C74BDE364C64D96617"; # Our own gpg-key paks@ipfire.org
# A small color-hash :D # A small color-hash :D
my %color; my %color;
$color{'normal'} = "\033[0m"; $color{'normal'} = "\033[0m";
@@ -899,19 +896,6 @@ sub senduuid {
} }
} }
sub checkcryptodb {
logger("CRYPTO INFO: Checking GnuPG Database");
system("gpg --fingerprint $myid >/dev/null");
return if ($? == 0);
message("CRYPTO WARN: The GnuPG isn't configured correctly. Trying now to fix this.");
message("CRYPTO WARN: It's normal to see this on first execution.");
message("CRYPTO WARN: If this message is being shown repeatedly, check if time and date are set correctly, and if IPFire can connect via port 11371 TCP.");
my $command = "gpg --keyserver pgp.ipfire.org --always-trust --status-fd 2";
system("$command --recv-key $myid >> $Conf::logdir/gnupg-database.log 2>&1");
}
sub callback { sub callback {
my ($data, $response, $protocol) = @_; my ($data, $response, $protocol) = @_;
$final_data .= $data; $final_data .= $data;

1
src/pakfire/pakfire
View File

@@ -30,7 +30,6 @@
my $force = "noforce"; my $force = "noforce";
&Pakfire::logger("PAKFIRE INFO: IPFire Pakfire $Conf::version started!"); &Pakfire::logger("PAKFIRE INFO: IPFire Pakfire $Conf::version started!");
&Pakfire::checkcryptodb;
### Check if we are running as root ### Check if we are running as root
# #