- urpmi.addmedia, urpmi.update:

  o check downloaded MD5SUM is not invalid HTML code, and try
    another mirror from mirrorlist (#39918)
    (useful for servers not returning a valid HTTP error)

3 files changed, 37 insertions, 14 deletions

diff --git a/NEWS b/NEWS
index 40959cb0..c227bab5 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,8 @@
   o add missing mark in "Do you want to add media '%s'?" message (from Nikos)
 - urpmi.addmedia, urpmi.update:
   o fix checking synthesis MD5SUM
-  o check downloaded synthesis is not invalid HTML code (#39918)
+  o check downloaded synthesis/MD5SUM is not invalid HTML code, and try
+    another mirror from mirrorlist (#39918)
     (useful for servers not returning a valid HTTP error)
 
 Version 5.19 - 3 April 2008, by Pascal "Pixel" Rigaux
diff --git a/urpm/md5sum.pm b/urpm/md5sum.pm
index b5d4a7f1..855bfdd1 100644
--- a/urpm/md5sum.pm
+++ b/urpm/md5sum.pm
@@ -8,19 +8,25 @@ sub parse {
     my ($md5sum_file) = @_;
 
     my %h = map {
-	my ($md5sum, $file) = m|(\S+)\s+(?:\./)?(\S+)|;
+	my ($md5sum, $file) = m|^([0-9-a-f]+)\s+(?:\./)?(\S+)$|i or return;
 	$file => $md5sum;
-    } cat_($md5sum_file);
+    } cat_($md5sum_file) or return;
 
     \%h;
 }
 
+sub check_file {
+    my ($md5sum_file) = @_;
+
+    file_size($md5sum_file) > 32 && parse($md5sum_file);
+}
+
 sub from_MD5SUM__or_warn {
     my ($urpm, $md5sum_file, $basename) = @_;
     $urpm->{debug}(N("examining %s file", $md5sum_file)) if $urpm->{debug};
-    my $retrieved_md5sum = parse($md5sum_file)->{$basename} 
-      or $urpm->{log}(N("warning: md5sum for %s unavailable in MD5SUM file", $basename));
-    return $retrieved_md5sum;
+    my $md5sums = parse($md5sum_file) or $urpm->{log}(N("invalid MD5SUM file")), return;
+    $md5sums->{$basename} or $urpm->{log}(N("warning: md5sum for %s unavailable in MD5SUM file", $basename));
+    $md5sums->{$basename};
 }
 
 sub compute {
diff --git a/urpm/media.pm b/urpm/media.pm
index 2769c33d..12d7f0cc 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -706,11 +706,8 @@ sub add_medium {
 	# forcing the standard media_info_dir if undefined
 	$medium->{media_info_dir} ||= 'media_info';
 
-	require urpm::mirrors;
-	urpm::mirrors::try($urpm, $medium, sub {
-	    # this is a little ugly since MD5SUM will be downloaded again later, but it's small enough...
-	    _download_MD5SUM($urpm, $medium);
-	}) or return;
+	# this is a little ugly since MD5SUM will be downloaded again later, but it's small enough...
+	_download_MD5SUM_and_check($urpm, $medium) or return;
     }
 
     if ($with_synthesis) {
@@ -1362,7 +1359,26 @@ sub _download_MD5SUM {
     unlink $cachedir_MD5SUM;
     urpm::download::sync($urpm, $medium, 
 			       [ reduce_pathname(_synthesis_dir($medium) . '/MD5SUM') ],
-			       quiet => 1) && file_size($cachedir_MD5SUM) > 32;
+			       quiet => 1) or return;
+    $cachedir_MD5SUM;
+}
+
+sub _download_MD5SUM_and_check {
+    my ($urpm, $medium) = @_;
+
+    my ($err, $cachedir_MD5SUM);
+    require urpm::mirrors;
+    try__maybe_mirrorlist($urpm, $medium, sub {
+	$cachedir_MD5SUM = _download_MD5SUM($urpm, $medium) or $err = $@;
+	$cachedir_MD5SUM && urpm::md5sum::check_file($cachedir_MD5SUM);
+    }) and return $cachedir_MD5SUM;
+
+    if ($cachedir_MD5SUM) {
+	$urpm->{error}(N("invalid MD5SUM file (downloaded from %s)", _synthesis_dir($medium)));
+    } else {
+	$urpm->{error}(N("...retrieving failed: %s", $err));
+    }
+    undef;
 }
 
 #- options: callback, force, nomd5sum, probe_with, quiet
@@ -1378,8 +1394,8 @@ sub _update_medium__parse_if_unmodified__remote {
 	#- to be checked for being valid, nothing can be deduced if no MD5SUM
 	#- file is present.
 
-	if (!$options->{nomd5sum} && _download_MD5SUM($urpm, $medium)) {
-	    my $new_MD5SUM = "$urpm->{cachedir}/partial/MD5SUM";
+	if (!$options->{nomd5sum}) {
+	    my $new_MD5SUM = _download_MD5SUM_and_check($urpm, $medium) or return;
 	    if ($options->{force} < 2 && _is_statedir_MD5SUM_uptodate($urpm, $medium, $new_MD5SUM)) {
 		_medium_is_up_to_date($urpm, $medium);
 		return 'unmodified';