Make /select purge cache.

[pr0n] / perl / Sesse / pr0n / Common.pm

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index 60e9469d57e7ece412f228cd49f7fc61b6df3f0b..d325907b71395e57298499b8718c9f5f8f480a64 100644 (file)
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -39,7 +39,7 @@ BEGIN {
                require Sesse::pr0n::Config_local;
        };
 
-       $VERSION     = "v2.70";
+       $VERSION     = "v2.71";
        @ISA         = qw(Exporter);
        @EXPORT      = qw(&error &dberror);
        %EXPORT_TAGS = qw();
@@ -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);
        }       
@@ -339,7 +338,8 @@ sub output_401 {
        $r->status(401);
        $r->headers_out->{'www-authenticate'} = 'Basic realm="pr0n.sesse.net"';
 
-       if ($options{'DigestAuth'} // 1) {
+       # Digest auth is disabled for now, due to various client problems.
+       if (0 && ($options{'DigestAuth'} // 1)) {
                # We make our nonce similar to the scheme of RFC2069 section 2.1.1,
                # with some changes: We don't care about client IP (these have a nasty
                # tendency to change from request to request when load-balancing
@@ -370,19 +370,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 +683,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;
@@ -700,7 +706,7 @@ sub ensure_cached {
 
        my $fname = get_disk_location($r, $id);
        if ($infobox ne 'box') {
-               unless (defined($xres) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbheight || $yres < $dbwidth || $xres == -1)) {
+               unless (defined($xres) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbwidth || $yres < $dbheight || $xres == -1)) {
                        return ($fname, undef);
                }
        }
@@ -790,16 +796,9 @@ sub ensure_cached {
                        my $height = $img->Get('rows');
                        my ($nwidth, $nheight) = scale_aspect($width, $height, $xres, $yres);
 
-                       # Use lanczos (sharper) for heavy scaling, mitchell (faster) otherwise
-                       my $filter = 'Mitchell';
-                       my $quality = 90;
-                       my $sf = undef;
-
-                       if ($width / $nwidth > 8.0 || $height / $nheight > 8.0) {
-                               $filter = 'Lanczos';
-                               $quality = 85;
-                               $sf = "1x1";
-                       }
+                       my $filter = 'Lanczos';
+                       my $quality = 87;
+                       my $sf = "1x1";
 
                        if ($xres != -1) {
                                $cimg->Resize(width=>$nwidth, height=>$nheight, filter=>$filter, 'sampling-factor'=>$sf);
@@ -880,7 +879,7 @@ sub make_infobox {
                my ($a, $b) = ($1, $2);
                my $gcd = gcd($a, $b);
                push @classic_fields, [ $a/$gcd . "/" . $b/$gcd . "s", $shutter_priority ];
-       } elsif (defined($info->{'ExposureTime'}) && $info->{'ExposureTime'} =~ /^(\d+(?:\.\d+))$/) {
+       } elsif (defined($info->{'ExposureTime'}) && $info->{'ExposureTime'} =~ /^(\d+(?:\.\d+)?)$/) {
                push @classic_fields, [ $1 . "s", $shutter_priority ];
        }
 
@@ -916,7 +915,7 @@ sub make_infobox {
 
        if (defined($info->{'ExposureBiasValue'}) && $info->{'ExposureBiasValue'} ne "0") {
                push @classic_fields, [ $info->{'ExposureBiasValue'} . " EV", 0 ];
-       } elsif (defined($info->{'ExposureCompensation'}) && $info->{'ExposureCompensation'} != 0) {
+       } elsif (defined($info->{'ExposureCompensation'}) && $info->{'ExposureCompensation'} ne "0") {
                push @classic_fields, [ $info->{'ExposureCompensation'} . " EV", 0 ];
        }
 
@@ -1123,10 +1122,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");
                }
        }