From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: development@lists.ipfire.org Subject: [PATCH v2] use protocol defined in server-list.db for mirror communication Date: Wed, 28 Mar 2018 05:41:50 +0200 Message-ID: <20180328054150.2b9c8dd5.peter.mueller@link38.eu> In-Reply-To: <1522157838.556038.75.camel@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8921063940019365425==" List-Id: --===============8921063940019365425== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable For each mirror server, a protocol can be specified in the server-list.db database. However, it was not used for the actual URL query to a mirror before. This might be useful for deploy HTTPS pinning for Pakfire. If a mirror is known to support HTTPS, all queries to it will be made with this protocol. This saves some overhead if HTTPS is enforced on a mirror via 301 redirects. To enable this, the server-list.db needs to be adjusted. The second version of this patch only handles protocols HTTP and HTTPS, since we do not expect anything else here at the moment. Partially fixes #11661. Signed-off-by: Peter M=C3=BCller Cc: Michael Tremer --- src/pakfire/lib/functions.pl | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index c97d4254d..6cc177128 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -31,6 +31,8 @@ use HTTP::Message; use HTTP::Request; use Net::Ping; =20 +use Switch; + package Pakfire; =20 # A small color-hash :D @@ -172,7 +174,18 @@ sub fetchfile { } =20 $final_data =3D undef; - my $url =3D "http://$host/$file"; + + my $url; + switch ($proto) { + case "HTTP" { $url =3D "http://$host/$file"; } + case "HTTPS" { $url =3D "https://$host/$file"; } + else { + # skip all lines with unknown protocols + logger("DOWNLOAD WARNING: Skipping Host: $host due to unknown protocol (= $proto) in mirror database"); + next; + } + } + my $response; =09 unless ($bfile =3D~ /^counter.py\?.*/) { --=20 2.13.6 --===============8921063940019365425==--