X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FCommon.pm;h=34ee8d9c7abcd2f58dced0d6001553c209e358f6;hp=60e9469d57e7ece412f228cd49f7fc61b6df3f0b;hb=6170d7a868e3fe5765600166e8cdad487cd6c103;hpb=a87e90cdd5ed56bc6bfa460a9b56f587a65bebd3

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index 60e9469..34ee8d9 100644
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -322,7 +322,6 @@ sub check_access {
 		output_401($r);
 		return undef;
 	} 
-	$r->log->warn("Auth: $auth");
 	if ($auth =~ /^Basic ([a-zA-Z0-9+\/]+=*)$/) {
 		return check_basic_auth($r, $1);
 	}	
@@ -370,19 +369,25 @@ sub check_basic_auth {
 	my ($raw_user, $pass) = split /:/, MIME::Base64::decode_base64($auth);
 	my ($user, $takenby) = extract_takenby($raw_user);
 	
-	my $oldpass = $pass;
-	$pass = Digest::SHA1::sha1_base64($pass);
-	my $ref = $dbh->selectrow_hashref('SELECT count(*) AS auth FROM users WHERE username=? AND sha1password=? AND vhost=?',
-		undef, $user, $pass, $r->get_server_name);
-	if ($ref->{'auth'} != 1) {
+	my $ref = $dbh->selectrow_hashref('SELECT sha1password,digest_ha1_hex FROM users WHERE username=? AND vhost=?',
+		undef, $user, $r->get_server_name);
+	if (!defined($ref) || $ref->{'sha1password'} ne Digest::SHA1::sha1_base64($pass)) {
 		$r->content_type('text/plain; charset=utf-8');
 		$r->log->warn("Authentication failed for $user/$takenby");
 		output_401($r);
 		return undef;
 	}
-
 	$r->log->info("Authentication succeeded for $user/$takenby");
 
+	# Make sure we can use Digest authentication in the future with this password.
+	my $ha1 = Digest::MD5::md5_hex($user . ':pr0n.sesse.net:' . $pass);
+	if (!defined($ref->{'digest_ha1_hex'}) || $ref->{'digest_ha1_hex'} ne $ha1) {
+		$dbh->do('UPDATE users SET digest_ha1_hex=? WHERE username=? AND vhost=?',
+			undef, $ha1, $user, $r->get_server_name)
+			or die "Couldn't update: " . $dbh->errstr;
+		$r->log->info("Updated Digest auth hash for for $user");
+	}
+
 	return ($user, $takenby);
 }
 
@@ -677,7 +682,7 @@ sub read_original_image {
 
 	# If we use ->[0] unconditionally, text rendering (!) seems to crash
 	my $img;
-	if (ref($magick)) {
+	if (ref($magick) !~ /Image::Magick/) {
 		$img = $magick;
 	} else {
 		$img = (scalar @$magick > 1) ? $magick->[0] : $magick;
@@ -1123,10 +1128,12 @@ sub get_all_cache_urls {
 			push @ret, "/$event/$1x$2/$filename";
 		} elsif ($fname =~ /^$id-(\d+)-(\d+)-nobox\.jpg$/) {
 			push @ret, "/$event/$1x$2/nobox/$filename";
+		} elsif ($fname =~ /^$id--1--1-box\.png$/) {
+			push @ret, "/$event/box/$filename";
 		} elsif ($fname =~ /^$id-(\d+)-(\d+)-box\.png$/) {
 			push @ret, "/$event/$1x$2/box/$filename";
 		} else {
-			$r->log->warning("Couldn't find a purging URL for $fname");
+			$r->log->warn("Couldn't find a purging URL for $fname");
 		}
 	}