X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FCommon.pm;h=ebcf408a866db140b1db75540b1f36932d6cc7f5;hp=da8173f8bbd04d2fd881bf55b97666c040d2efc0;hb=1a510dfa9c7cf801e9189f3ed329ef29b3526d65;hpb=9f211c59da85613e88c6234a53bbec9c6c9a6ee9 diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm index da8173f..ebcf408 100644 --- a/perl/Sesse/pr0n/Common.pm +++ b/perl/Sesse/pr0n/Common.pm @@ -2,8 +2,9 @@ package Sesse::pr0n::Common; use strict; use warnings; -use Sesse::pr0n::Templates; use Sesse::pr0n::Overload; +use Sesse::pr0n::QscaleProxy; +use Sesse::pr0n::Templates; use Apache2::RequestRec (); # for $r->content_type use Apache2::RequestIO (); # for $r->print @@ -17,13 +18,17 @@ use DBI; use DBD::Pg; use Image::Magick; use POSIX; +use Digest::MD5; use Digest::SHA1; +use Digest::HMAC_SHA1; use MIME::Base64; use MIME::Types; use LWP::Simple; # use Image::Info; use Image::ExifTool; use HTML::Entities; +use URI::Escape; +use File::Basename; BEGIN { use Exporter (); @@ -34,7 +39,7 @@ BEGIN { require Sesse::pr0n::Config_local; }; - $VERSION = "v2.21"; + $VERSION = "v2.70"; @ISA = qw(Exporter); @EXPORT = qw(&error &dberror); %EXPORT_TAGS = qw(); @@ -91,7 +96,7 @@ sub header { $quote = LWP::Simple::get("http://itk.samfundet.no/include/quotes.cli.php"); $quote = "Error: Could not fetch quotes." if (!defined($quote)); } - Sesse::pr0n::Templates::print_template($r, "header", { title => $title, quotes => $quote }); + Sesse::pr0n::Templates::print_template($r, "header", { title => $title, quotes => Encode::decode_utf8($quote) }); } sub footer { @@ -129,6 +134,8 @@ sub get_query_string { while (my ($key, $value) = each %$param) { next unless defined($value); next if (defined($defparam->{$key}) && $value == $defparam->{$key}); + + $value = pretty_escape($value); $str .= ($first) ? "?" : ';'; $str .= "$key=$value"; @@ -137,6 +144,44 @@ sub get_query_string { return $str; } +# This is not perfect (it can't handle "_ " right, for one), but it will do for now +sub weird_space_encode { + my $val = shift; + if ($val =~ /_/) { + return "_" x (length($val) * 2); + } else { + return "_" x (length($val) * 2 - 1); + } +} + +sub weird_space_unencode { + my $val = shift; + if (length($val) % 2 == 0) { + return "_" x (length($val) / 2); + } else { + return " " x ((length($val) + 1) / 2); + } +} + +sub pretty_escape { + my $value = shift; + + $value =~ s/(([_ ])\2*)/weird_space_encode($1)/ge; + $value = URI::Escape::uri_escape($value); + $value =~ s/%2F/\//g; + + return $value; +} + +sub pretty_unescape { + my $value = shift; + + # URI unescaping is already done for us + $value =~ s/(_+)/weird_space_unencode($1)/ge; + + return $value; +} + sub print_link { my ($r, $title, $baseurl, $param, $defparam, $accesskey) = @_; my $str = "new; + $exiftool->ExtractInfo(get_disk_location($r, $id)); + my $info = $exiftool->GetInfo(); my $datetime = undef; if (defined($info->{'DateTimeOriginal'})) { @@ -198,57 +254,120 @@ sub update_image_info { } } - $dbh->do('UPDATE images SET width=?, height=?, date=? WHERE id=?', - undef, $width, $height, $datetime, $id) - or die "Couldn't update width/height in SQL: $!"; + { + local $dbh->{AutoCommit} = 0; - $dbh->do('DELETE FROM exif_info WHERE image=?', - undef, $id) - or die "Couldn't delete old EXIF information in SQL: $!"; + # EXIF information + $dbh->do('DELETE FROM exif_info WHERE image=?', + undef, $id) + or die "Couldn't delete old EXIF information in SQL: $!"; - my $q = $dbh->prepare('INSERT INTO exif_info (image,tag,value) VALUES (?,?,?)') - or die "Couldn't prepare inserting EXIF information: $!"; + my $q = $dbh->prepare('INSERT INTO exif_info (image,key,value) VALUES (?,?,?)') + or die "Couldn't prepare inserting EXIF information: $!"; - for my $key (keys %$info) { - next if ref $info->{$key}; - $q->execute($id, $key, guess_charset($info->{$key})) - or die "Couldn't insert EXIF information in database: $!"; - } + for my $key (keys %$info) { + next if ref $info->{$key}; + $q->execute($id, $key, guess_charset($info->{$key})) + or die "Couldn't insert EXIF information in database: $!"; + } + + # Model/Lens + my $model = $exiftool->GetValue('Model', 'PrintConv'); + my $lens = $exiftool->GetValue('Lens', 'PrintConv'); + $lens = $exiftool->GetValue('LensSpec', 'PrintConv') if (!defined($lens)); - # update the last_picture cache as well (this should of course be done - # via a trigger, but this is less complicated :-) ) - $dbh->do('UPDATE last_picture_cache SET last_picture=GREATEST(last_picture, ?) WHERE event=(SELECT event FROM images WHERE id=?)', - undef, $datetime, $id) - or die "Couldn't update last_picture in SQL: $!"; + $model =~ s/^\s*//; + $model =~ s/\s*$//; + $model = undef if (length($model) == 0); + + $lens =~ s/^\s*//; + $lens =~ s/\s*$//; + $lens = undef if (length($lens) == 0); + + # Now update the main table with the information we've got + $dbh->do('UPDATE images SET width=?, height=?, date=?, model=?, lens=? WHERE id=?', + undef, $width, $height, $datetime, $model, $lens, $id) + or die "Couldn't update width/height in SQL: $!"; + + # Tags + my @tags = $exiftool->GetValue('Keywords', 'ValueConv'); + $dbh->do('DELETE FROM tags WHERE image=?', + undef, $id) + or die "Couldn't delete old tag information in SQL: $!"; + + $q = $dbh->prepare('INSERT INTO tags (image,tag) VALUES (?,?)') + or die "Couldn't prepare inserting tag information: $!"; + + + for my $tag (@tags) { + $q->execute($id, guess_charset($tag)) + or die "Couldn't insert tag information in database: $!"; + } + + # update the last_picture cache as well (this should of course be done + # via a trigger, but this is less complicated :-) ) + $dbh->do('UPDATE last_picture_cache SET last_picture=GREATEST(last_picture, ?) WHERE (vhost,event)=(SELECT vhost,event FROM images WHERE id=?)', + undef, $datetime, $id) + or die "Couldn't update last_picture in SQL: $!"; + } } sub check_access { my $r = shift; + + #return qw(sesse Sesse); my $auth = $r->headers_in->{'authorization'}; - if (!defined($auth) || $auth !~ m#^Basic ([a-zA-Z0-9+/]+=*)$#) { - $r->content_type('text/plain; charset=utf-8'); - $r->status(401); - $r->headers_out->{'www-authenticate'} = 'Basic realm="pr0n.sesse.net"'; - $r->print("Need authorization\n"); + if (!defined($auth)) { + output_401($r); return undef; + } + if ($auth =~ /^Basic ([a-zA-Z0-9+\/]+=*)$/) { + return check_basic_auth($r, $1); + } + if ($auth =~ /^Digest (.*)$/) { + return check_digest_auth($r, $1); } - - #return qw(sesse Sesse); + output_401($r); + return undef; +} - my ($user, $pass) = split /:/, MIME::Base64::decode_base64($1); - # WinXP is stupid :-) - if ($user =~ /^.*\\(.*)$/) { - $user = $1; +sub output_401 { + my ($r, %options) = @_; + $r->content_type('text/plain; charset=utf-8'); + $r->status(401); + $r->headers_out->{'www-authenticate'} = 'Basic realm="pr0n.sesse.net"'; + + if ($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 + # proxies etc. are being used), and we use HMAC instead of simple + # hashing simply because that's a better signing method. + # + # NOTE: For some weird reason, Digest::HMAC_SHA1 doesn't like taking + # the output from time directly (it gives a different response), so we + # forcefully stringify the argument. + my $ts = time; + my $nonce = Digest::HMAC_SHA1->hmac_sha1_hex($ts . "", $Sesse::pr0n::Config::db_password); + my $stale_nonce_text = ""; + $stale_nonce_text = ", stale=\"true\"" if ($options{'StaleNonce'} // 0); + + $r->headers_out->{'www-authenticate'} = + "Digest realm=\"pr0n.sesse.net\", " . + "nonce=\"$nonce\", " . + "opaque=\"$ts\", " . + "qop=\"auth\"" . $stale_nonce_text; # FIXME: support auth-int } - my $takenby; - if ($user =~ /^([a-zA-Z0-9^_-]+)\@([a-zA-Z0-9^_-]+)$/) { - $user = $1; - $takenby = $2; - } else { - ($takenby = $user) =~ s/^([a-zA-Z])/uc($1)/e; - } + $r->print("Need authorization\n"); +} + +sub check_basic_auth { + my ($r, $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); @@ -256,11 +375,8 @@ sub check_access { undef, $user, $pass, $r->get_server_name); if ($ref->{'auth'} != 1) { $r->content_type('text/plain; charset=utf-8'); - warn "No user exists, only $auth"; - $r->status(401); - $r->headers_out->{'www-authenticate'} = 'Basic realm="pr0n.sesse.net"'; - $r->print("Authorization failed"); $r->log->warn("Authentication failed for $user/$takenby"); + output_401($r); return undef; } @@ -268,6 +384,124 @@ sub check_access { return ($user, $takenby); } + +sub check_digest_auth { + my ($r, $auth) = @_; + + # We're a bit more liberal than RFC2069 in the parsing here, allowing + # quoted strings everywhere. + my %auth = (); + while ($auth =~ s/^ ([a-zA-Z]+) # key + = + ( + [^",]* # either something that doesn't contain comma or quotes + | + " ( [^"\\] | \\ . ) * " # or a full quoted string + ) + (?: (?: , \s* ) + | $ ) # delimiter(s), or end of string + //x) { + my ($key, $value) = ($1, $2); + if ($value =~ /^"(.*)"$/) { + $value = $1; + $value =~ s/\\(.)/$1/g; + } + $auth{$key} = $value; + } + unless (exists($auth{'username'}) && + exists($auth{'uri'}) && + exists($auth{'nonce'}) && + exists($auth{'opaque'}) && + exists($auth{'response'})) { + output_401($r); + return undef; + } + if ($r->uri ne $auth{'uri'}) { + output_401($r); + return undef; + } + + # Verify that the opaque data does indeed look like a timestamp, and that the nonce + # is indeed a signed version of it. + if ($auth{'opaque'} !~ /^\d+$/) { + output_401($r); + return undef; + } + my $compare_nonce = Digest::HMAC_SHA1->hmac_sha1_hex($auth{'opaque'}, $Sesse::pr0n::Config::db_password); + if ($auth{'nonce'} ne $compare_nonce) { + output_401($r); + return undef; + } + + # Now look up the user's HA1 from the database, and calculate HA2. + my ($user, $takenby) = extract_takenby($auth{'username'}); + my $ref = $dbh->selectrow_hashref('SELECT digest_ha1_hex FROM users WHERE username=? AND vhost=?', + undef, $user, $r->get_server_name); + if (!defined($ref)) { + output_401($r); + return undef; + } + if (!defined($ref->{'digest_ha1_hex'}) || $ref->{'digest_ha1_hex'} !~ /^[0-9a-f]{32}$/) { + # A user that exists but has empty HA1 is a user that's not + # ready for digest auth, so we hack it and resend 401, + # only this time without digest auth. + output_401($r, DigestAuth => 0); + return undef; + } + my $ha1 = $ref->{'digest_ha1_hex'}; + my $ha2 = Digest::MD5::md5_hex($r->method . ':' . $auth{'uri'}); + my $response; + if (exists($auth{'qop'}) && $auth{'qop'} eq 'auth') { + unless (exists($auth{'nc'}) && exists($auth{'cnonce'})) { + output_401($r); + return undef; + } + + $response = $ha1; + $response .= ':' . $auth{'nonce'}; + $response .= ':' . $auth{'nc'}; + $response .= ':' . $auth{'cnonce'}; + $response .= ':' . $auth{'qop'}; + $response .= ':' . $ha2; + } else { + $response = $ha1; + $response .= ':' . $auth{'nonce'}; + $response .= ':' . $ha2; + } + if ($auth{'response'} ne Digest::MD5::md5_hex($response)) { + output_401($r); + return undef; + } + + # OK, everything is good, and there's only one thing we need to check: That the nonce + # isn't too old. If it is, but everything else is ok, we tell the browser that and it + # will re-encrypt with the new nonce. + my $timediff = time - $auth{'opaque'}; + if ($timediff < 0 || $timediff > 300) { + output_401($r, StaleNonce => 1); + return undef; + } + + return ($user, $takenby); +} + +sub extract_takenby { + my ($user) = shift; + + # WinXP is stupid :-) + if ($user =~ /^.*\\(.*)$/) { + $user = $1; + } + + my $takenby; + if ($user =~ /^([a-zA-Z0-9^_-]+)\@([a-zA-Z0-9^_-]+)$/) { + $user = $1; + $takenby = $2; + } else { + ($takenby = $user) =~ s/^([a-zA-Z])/uc($1)/e; + } + + return ($user, $takenby); +} sub stat_image { my ($r, $event, $filename) = (@_); @@ -290,15 +524,188 @@ sub stat_image_from_id { return ($fname, $size, $mtime); } +# Takes in an image ID and a set of resolutions, and returns (generates if needed) +# the smallest mipmap larger than the largest of them. +sub make_mipmap { + my ($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale, @res) = @_; + my ($img, $mmimg, $width, $height); + + my $physical_fname = get_disk_location($r, $id); + + # If we don't know the size, we'll need to read it in anyway + if (!defined($dbwidth) || !defined($dbheight)) { + $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale); + $width = $img->Get('columns'); + $height = $img->Get('rows'); + } else { + $width = $dbwidth; + $height = $dbheight; + } + + # Generate the list of mipmaps + my @mmlist = (); + + my $mmwidth = $width; + my $mmheight = $height; + + while ($mmwidth > 1 || $mmheight > 1) { + my $new_mmwidth = POSIX::floor($mmwidth / 2); + my $new_mmheight = POSIX::floor($mmheight / 2); + + $new_mmwidth = 1 if ($new_mmwidth < 1); + $new_mmheight = 1 if ($new_mmheight < 1); + + my $large_enough = 1; + for my $i (0..($#res/2)) { + my ($xres, $yres) = ($res[$i*2], $res[$i*2+1]); + if ($xres == -1 || $xres > $new_mmwidth || $yres > $new_mmheight) { + $large_enough = 0; + last; + } + } + + last if (!$large_enough); + + $mmwidth = $new_mmwidth; + $mmheight = $new_mmheight; + + push @mmlist, [ $mmwidth, $mmheight ]; + } + + # Ensure that all of them are OK + my $last_good_mmlocation; + for my $i (0..$#mmlist) { + my $last = ($i == $#mmlist); + my $mmres = $mmlist[$i]; + + my $mmlocation = get_mipmap_location($r, $id, $mmres->[0], $mmres->[1]); + if (! -r $mmlocation or (-M $mmlocation > -M $physical_fname)) { + if (!defined($img)) { + if (defined($last_good_mmlocation)) { + if ($can_use_qscale) { + $img = Sesse::pr0n::QscaleProxy->new; + } else { + $img = Image::Magick->new; + } + $img->Read($last_good_mmlocation); + } else { + $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale); + } + } + my $cimg; + if ($last) { + $cimg = $img; + } else { + $cimg = $img->Clone(); + } + $r->log->info("Making mipmap for $id: " . $mmres->[0] . " x " . $mmres->[1]); + $cimg->Resize(width=>$mmres->[0], height=>$mmres->[1], filter=>'Lanczos', 'sampling-factor'=>'1x1'); + $cimg->Strip(); + my $err = $cimg->write( + filename => $mmlocation, + quality => 95, + 'sampling-factor' => '1x1' + ); + $img = $cimg; + } else { + $last_good_mmlocation = $mmlocation; + } + if ($last && !defined($img)) { + # OK, read in the smallest one + if ($can_use_qscale) { + $img = Sesse::pr0n::QscaleProxy->new; + } else { + $img = Image::Magick->new; + } + my $err = $img->Read($mmlocation); + } + } + + if (!defined($img)) { + $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale); + } + return $img; +} + +sub read_original_image { + my ($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale) = @_; + + my $physical_fname = get_disk_location($r, $id); + + # Read in the original image + my $magick; + if ($can_use_qscale && ($filename =~ /\.jpeg$/i || $filename =~ /\.jpg$/i)) { + $magick = Sesse::pr0n::QscaleProxy->new; + } else { + $magick = Image::Magick->new; + } + my $err; + + # ImageMagick can handle NEF files, but it does it by calling dcraw as a delegate. + # The delegate support is rather broken and causes very odd stuff to happen when + # more than one thread does this at the same time. Thus, we simply do it ourselves. + if ($filename =~ /\.(nef|cr2)$/i) { + # this would suffice if ImageMagick gets to fix their handling + # $physical_fname = "NEF:$physical_fname"; + + open DCRAW, "-|", "dcraw", "-w", "-c", $physical_fname + or error("dcraw: $!"); + $err = $magick->Read(file => \*DCRAW); + close(DCRAW); + } else { + # We always want YCbCr JPEGs. Setting this explicitly here instead of using + # RGB is slightly faster (no colorspace conversion needed) and works equally + # well for our uses, as long as we don't need to draw an information box, + # which trickles several ImageMagick bugs related to colorspace handling. + # (Ideally we'd be able to keep the image subsampled and + # planar, but that would probably be difficult for ImageMagick to expose.) + #if (!$infobox) { + # $magick->Set(colorspace=>'YCbCr'); + #} + $err = $magick->Read($physical_fname); + } + + if ($err) { + $r->log->warn("$physical_fname: $err"); + $err =~ /(\d+)/; + if ($1 >= 400) { + undef $magick; + error($r, "$physical_fname: $err"); + } + } + + # If we use ->[0] unconditionally, text rendering (!) seems to crash + my $img; + if (ref($magick)) { + $img = $magick; + } else { + $img = (scalar @$magick > 1) ? $magick->[0] : $magick; + } + + my $width = $img->Get('columns'); + my $height = $img->Get('rows'); + + # Update the SQL database if it doesn't contain the required info + if (!defined($dbwidth) || !defined($dbheight)) { + $r->log->info("Updating width/height for $id: $width x $height"); + update_image_info($r, $id, $width, $height); + } + + return $img; +} + sub ensure_cached { my ($r, $filename, $id, $dbwidth, $dbheight, $infobox, $xres, $yres, @otherres) = @_; my $fname = get_disk_location($r, $id); - unless (defined($xres) && ($xres < $dbheight || $yres < $dbwidth || $dbwidth == -1 || $dbheight == -1 || $xres == -1)) { - return ($fname, 0); + if ($infobox ne 'box') { + unless (defined($xres) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbheight || $yres < $dbwidth || $xres == -1)) { + return ($fname, undef); + } } my $cachename = get_cache_location($r, $id, $xres, $yres, $infobox); + my $err; if (! -r $cachename or (-M $cachename > -M $fname)) { # If we are in overload mode (aka Slashdot mode), refuse to generate # new thumbnails. @@ -306,41 +713,65 @@ sub ensure_cached { $r->log->warn("In overload mode, not scaling $id to $xres x $yres"); error($r, 'System is in overload mode, not doing any scaling'); } - - # Need to generate the cache; read in the image - my $magick = new Image::Magick; - my $info = Image::ExifTool::ImageInfo($fname); - # NEF files aren't autodetected - $fname = "NEF:$fname" if ($filename =~ /\.nef$/i); - - my $err = $magick->Read($fname); - if ($err) { - $r->log->warn("$fname: $err"); - $err =~ /(\d+)/; - if ($1 >= 400) { - undef $magick; - error($r, "$fname: $err"); + # If we're being asked for just the box, make a new image with just the box. + # We don't care about @otherres since each of these images are + # already pretty cheap to generate, but we need the exact width so we can make + # one in the right size. + if ($infobox eq 'box') { + my ($img, $width, $height); + + # This is slow, but should fortunately almost never happen, so don't bother + # special-casing it. + if (!defined($dbwidth) || !defined($dbheight)) { + $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight, 0); + $width = $img->Get('columns'); + $height = $img->Get('rows'); + @$img = (); + } else { + $img = Image::Magick->new; + $width = $dbwidth; + $height = $dbheight; } - } - - # If we use ->[0] unconditionally, text rendering (!) seems to crash - my $img = (scalar @$magick > 1) ? $magick->[0] : $magick; - - my $width = $img->Get('columns'); - my $height = $img->Get('rows'); + + if (defined($xres) && defined($yres)) { + ($width, $height) = scale_aspect($width, $height, $xres, $yres); + } + $height = 24; + $img->Set(size=>($width . "x" . $height)); + $img->Read('xc:white'); + + my $info = Image::ExifTool::ImageInfo($fname); + if (make_infobox($img, $info, $r)) { + $img->Quantize(colors=>16, dither=>'False'); + + # Since the image is grayscale, ImageMagick overrides us and writes this + # as grayscale anyway, but at least we get rid of the alpha channel this + # way. + $img->Set(type=>'Palette'); + } else { + # Not enough room for the text, make a tiny dummy transparent infobox + @$img = (); + $img->Set(size=>"1x1"); + $img->Read('null:'); - # Update the SQL database if it doesn't contain the required info - if ($dbwidth == -1 || $dbheight == -1) { - $r->log->info("Updating width/height for $id: $width x $height"); - update_image_info($r, $id, $width, $height); - } + $width = 1; + $height = 1; + } + + $err = $img->write(filename => $cachename, quality => 90, depth => 8); + $r->log->info("New infobox cache: $width x $height for $id.jpg"); - # We always want RGB JPEGs - if ($img->Get('Colorspace') eq "CMYK") { - $img->Set(colorspace=>'RGB'); + return ($cachename, 'image/png'); + } + + my $can_use_qscale = 0; + if ($infobox eq 'nobox') { + $can_use_qscale = 1; } + my $img = make_mipmap($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale, $xres, $yres, @otherres); + while (defined($xres) && defined($yres)) { my ($nxres, $nyres) = (shift @otherres, shift @otherres); my $cachename = get_cache_location($r, $id, $xres, $yres, $infobox); @@ -354,33 +785,46 @@ sub ensure_cached { $cimg = $img; } + my $width = $img->Get('columns'); + 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 = 80; + $quality = 85; + $sf = "1x1"; } if ($xres != -1) { - $cimg->Resize(width=>$nwidth, height=>$nheight, filter=>$filter); + $cimg->Resize(width=>$nwidth, height=>$nheight, filter=>$filter, 'sampling-factor'=>$sf); } - if (($nwidth >= 800 || $nheight >= 600 || $xres == -1) && $infobox == 1) { + if (($nwidth >= 800 || $nheight >= 600 || $xres == -1) && $infobox ne 'nobox') { + my $info = Image::ExifTool::ImageInfo($fname); make_infobox($cimg, $info, $r); } # Strip EXIF tags etc. $cimg->Strip(); - if (($nwidth >= 640 && $nheight >= 480) || - ($nwidth >= 480 && $nheight >= 640)) { - $err = $cimg->write(filename=>$cachename, quality=>$quality, interlace=>'Plane'); - } else { - $err = $cimg->write(filename=>$cachename, quality=>$quality); + { + my %parms = ( + filename => $cachename, + quality => $quality + ); + if (($nwidth >= 640 && $nheight >= 480) || + ($nwidth >= 480 && $nheight >= 640)) { + $parms{'interlace'} = 'Plane'; + } + if (defined($sf)) { + $parms{'sampling-factor'} = $sf; + } + $err = $cimg->write(%parms); } undef $cimg; @@ -390,18 +834,17 @@ sub ensure_cached { $r->log->info("New cache: $nwidth x $nheight for $id.jpg"); } - undef $magick; undef $img; if ($err) { $r->log->warn("$fname: $err"); $err =~ /(\d+)/; if ($1 >= 400) { - @$magick = (); + #@$magick = (); error($r, "$fname: $err"); } } } - return ($cachename, 1); + return ($cachename, 'image/jpeg'); } sub get_mimetype_from_filename { @@ -413,66 +856,97 @@ sub get_mimetype_from_filename { sub make_infobox { my ($img, $info, $r) = @_; - - my @lines = (); - my @classic_fields = (); - - if (defined($info->{'DateTimeOriginal'}) && - $info->{'DateTimeOriginal'} =~ /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)$/ - && $1 >= 1990) { - push @lines, "$1-$2-$3 $4:$5"; - } - if (defined($info->{'Model'})) { - my $model = $info->{'Model'}; - $model =~ s/^\s+//; - $model =~ s/\s+$//; - push @lines, $model; - } + # The infobox is of the form + # "Time - date - focal length, shutter time, aperture, sensitivity, exposure bias - flash", + # possibly with some parts omitted -- the middle part is known as the "classic + # fields"; note the comma separation. Every field has an associated "bold flag" + # in the second part. - # classic fields - if (defined($info->{'FocalLength'}) && $info->{'FocalLength'} =~ /^(\d+)(?:\.\d+)?(?:mm)?$/) { - push @classic_fields, ($1 . "mm"); + my $shutter_priority = (defined($info->{'ExposureProgram'}) && + $info->{'ExposureProgram'} =~ /shutter\b.*\bpriority/i); + my $aperture_priority = (defined($info->{'ExposureProgram'}) && + $info->{'ExposureProgram'} =~ /aperture\b.*\bpriority/i); + + my @classic_fields = (); + if (defined($info->{'FocalLength'}) && $info->{'FocalLength'} =~ /^(\d+)(?:\.\d+)?\s*(?:mm)?$/) { + push @classic_fields, [ $1 . "mm", 0 ]; } elsif (defined($info->{'FocalLength'}) && $info->{'FocalLength'} =~ /^(\d+)\/(\d+)$/) { - push @classic_fields, (sprintf "%.1fmm", ($1/$2)); + push @classic_fields, [ (sprintf "%.1fmm", ($1/$2)), 0 ]; } + if (defined($info->{'ExposureTime'}) && $info->{'ExposureTime'} =~ /^(\d+)\/(\d+)$/) { my ($a, $b) = ($1, $2); my $gcd = gcd($a, $b); - push @classic_fields, ($a/$gcd . "/" . $b/$gcd . "s"); + push @classic_fields, [ $a/$gcd . "/" . $b/$gcd . "s", $shutter_priority ]; + } elsif (defined($info->{'ExposureTime'}) && $info->{'ExposureTime'} =~ /^(\d+(?:\.\d+))$/) { + push @classic_fields, [ $1 . "s", $shutter_priority ]; } + if (defined($info->{'FNumber'}) && $info->{'FNumber'} =~ /^(\d+)\/(\d+)$/) { my $f = $1/$2; if ($f >= 10) { - push @classic_fields, (sprintf "f/%.0f", $f); + push @classic_fields, [ (sprintf "f/%.0f", $f), $aperture_priority ]; } else { - push @classic_fields, (sprintf "f/%.1f", $f); + push @classic_fields, [ (sprintf "f/%.1f", $f), $aperture_priority ]; } } elsif (defined($info->{'FNumber'}) && $info->{'FNumber'} =~ /^(\d+)\.(\d+)$/) { my $f = $info->{'FNumber'}; if ($f >= 10) { - push @classic_fields, (sprintf "f/%.0f", $f); + push @classic_fields, [ (sprintf "f/%.0f", $f), $aperture_priority ]; } else { - push @classic_fields, (sprintf "f/%.1f", $f); + push @classic_fields, [ (sprintf "f/%.1f", $f), $aperture_priority ]; } } # Apache2::ServerUtil->server->log_error(join(':', keys %$info)); + my $iso = undef; if (defined($info->{'NikonD1-ISOSetting'})) { - push @classic_fields, $info->{'NikonD1-ISOSetting'}->[1] . " ISO"; + $iso = $info->{'NikonD1-ISOSetting'}; + } elsif (defined($info->{'ISO'})) { + $iso = $info->{'ISO'}; } elsif (defined($info->{'ISOSetting'})) { - push @classic_fields, $info->{'ISOSetting'} . " ISO"; + $iso = $info->{'ISOSetting'}; + } + if (defined($iso) && $iso =~ /(\d+)/) { + push @classic_fields, [ $1 . " ISO", 0 ]; } - if (defined($info->{'ExposureBiasValue'}) && $info->{'ExposureBiasValue'} != 0) { - push @classic_fields, $info->{'ExposureBiasValue'} . " EV"; + if (defined($info->{'ExposureBiasValue'}) && $info->{'ExposureBiasValue'} ne "0") { + push @classic_fields, [ $info->{'ExposureBiasValue'} . " EV", 0 ]; } elsif (defined($info->{'ExposureCompensation'}) && $info->{'ExposureCompensation'} != 0) { - push @classic_fields, $info->{'ExposureCompensation'} . " EV"; + push @classic_fields, [ $info->{'ExposureCompensation'} . " EV", 0 ]; } + + # Now piece together the rest + my @parts = (); + if (defined($info->{'DateTimeOriginal'}) && + $info->{'DateTimeOriginal'} =~ /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)$/ + && $1 >= 1990) { + push @parts, [ "$1-$2-$3 $4:$5", 0 ]; + } + + if (defined($info->{'Model'})) { + my $model = $info->{'Model'}; + $model =~ s/^\s+//; + $model =~ s/\s+$//; + + push @parts, [ ' - ', 0 ] if (scalar @parts > 0); + push @parts, [ $model, 0 ]; + } + + # classic fields if (scalar @classic_fields > 0) { - push @lines, join(', ', @classic_fields); + push @parts, [ ' - ', 0 ] if (scalar @parts > 0); + + my $first_elem = 1; + for my $field (@classic_fields) { + push @parts, [ ', ', 0 ] if (!$first_elem); + $first_elem = 0; + push @parts, $field; + } } if (defined($info->{'Flash'})) { @@ -480,67 +954,69 @@ sub make_infobox { $info->{'Flash'} =~ /no flash/i || $info->{'Flash'} =~ /not fired/i || $info->{'Flash'} =~ /Off/) { - push @lines, "No flash"; + push @parts, [ ' - ', 0 ] if (scalar @parts > 0); + push @parts, [ "No flash", 0 ]; } elsif ($info->{'Flash'} =~ /fired/i || $info->{'Flash'} =~ /On/) { - push @lines, "Flash"; + push @parts, [ ' - ', 0 ] if (scalar @parts > 0); + push @parts, [ "Flash", 0 ]; } else { - push @lines, $info->{'Flash'}; + push @parts, [ ' - ', 0 ] if (scalar @parts > 0); + push @parts, [ $info->{'Flash'}, 0 ]; } } - return if (scalar @lines == 0); - - # OK, this sucks. Let's make something better :-) - @lines = ( join(" - ", @lines) ); + return 0 if (scalar @parts == 0); # Find the required width - my $th = 14 * (scalar @lines) + 6; - my $tw = 1; + my $th = 0; + my $tw = 0; - for my $line (@lines) { - my $this_w = ($img->QueryFontMetrics(text=>$line, font=>'/usr/share/fonts/truetype/msttcorefonts/Arial.ttf', pointsize=>12))[4]; - $tw = $this_w if ($this_w >= $tw); - } + for my $part (@parts) { + my $font; + if ($part->[1]) { + $font = '/usr/share/fonts/truetype/msttcorefonts/Arial_Bold.ttf'; + } else { + $font = '/usr/share/fonts/truetype/msttcorefonts/Arial.ttf'; + } - $tw += 6; + my (undef, undef, $h, undef, $w) = ($img->QueryFontMetrics(text=>$part->[0], font=>$font, pointsize=>12)); - # Round up so we hit exact DCT blocks - $tw += 8 - ($tw % 8) unless ($tw % 8 == 0); - $th += 8 - ($th % 8) unless ($th % 8 == 0); - - return if ($tw > $img->Get('columns')); + $tw += $w; + $th = $h if ($h > $th); + } + + return 0 if ($tw > $img->Get('columns')); -# my $x = $img->Get('columns') - 8 - $tw; -# my $y = $img->Get('rows') - 8 - $th; my $x = 0; - my $y = $img->Get('rows') - $th; - $tw = $img->Get('columns'); + my $y = $img->Get('rows') - 24; - $x -= $x % 8; - $y -= $y % 8; + # Hit exact DCT blocks + $y -= ($y % 8); - my $points = sprintf "%u,%u %u,%u", $x, $y, ($x+$tw-1), ($img->Get('rows') - 1); - my $lpoints = sprintf "%u,%u %u,%u", $x, $y, ($x+$tw-1), $y; -# $img->Draw(primitive=>'rectangle', stroke=>'black', fill=>'white', points=>$points); + my $points = sprintf "%u,%u %u,%u", $x, $y, ($img->Get('columns') - 1), ($img->Get('rows') - 1); + my $lpoints = sprintf "%u,%u %u,%u", $x, $y, ($img->Get('columns') - 1), $y; $img->Draw(primitive=>'rectangle', stroke=>'white', fill=>'white', points=>$points); $img->Draw(primitive=>'line', stroke=>'black', points=>$lpoints); - my $i = -(scalar @lines - 1)/2.0; - my $xc = $x + $tw / 2 - $img->Get('columns')/2; - my $yc = ($y + $img->Get('rows'))/2 - $img->Get('rows')/2; - #my $yc = ($y + $img->Get('rows'))/4; - my $yi = $th / (scalar @lines); - - $lpoints = sprintf "%u,%u %u,%u", $x, $yc + $img->Get('rows')/2, ($x+$tw-1), $yc+$img->Get('rows')/2; + # Start writing out the text + $x = ($img->Get('columns') - $tw) / 2; - for my $line (@lines) { - $img->Annotate(text=>$line, font=>'/usr/share/fonts/truetype/msttcorefonts/Arial.ttf', pointsize=>12, gravity=>'Center', - # $img->Annotate(text=>$line, font=>'Helvetica', pointsize=>12, gravity=>'Center', - x=>int($xc), y=>int($yc + $i * $yi)); + my $room = ($img->Get('rows') - 1 - $y - $th); + $y = ($img->Get('rows') - 1) - $room/2; - $i = $i + 1; + for my $part (@parts) { + my $font; + if ($part->[1]) { + $font = '/usr/share/fonts/truetype/msttcorefonts/Arial_Bold.ttf'; + } else { + $font = '/usr/share/fonts/truetype/msttcorefonts/Arial.ttf'; + } + $img->Annotate(text=>$part->[0], font=>$font, pointsize=>12, x=>int($x), y=>int($y)); + $x += ($img->QueryFontMetrics(text=>$part->[0], font=>$font, pointsize=>12))[4]; } + + return 1; } sub gcd { @@ -550,7 +1026,7 @@ sub gcd { } sub add_new_event { - my ($dbh, $id, $date, $desc, $vhost) = @_; + my ($r, $dbh, $id, $date, $desc) = @_; my @errors = (); if (!defined($id) || $id =~ /^\s*$/ || $id !~ /^([a-zA-Z0-9-]+)$/) { @@ -567,12 +1043,14 @@ sub add_new_event { return @errors; } - $dbh->do("INSERT INTO events (id,date,name,vhost) VALUES (?,?,?,?)", + my $vhost = $r->get_server_name; + $dbh->do("INSERT INTO events (event,date,name,vhost) VALUES (?,?,?,?)", undef, $id, $date, $desc, $vhost) or return ("Kunne ikke sette inn ny hendelse" . $dbh->errstr); - $dbh->do("INSERT INTO last_picture_cache (event,last_picture) VALUES (?,NULL)", - undef, $id) + $dbh->do("INSERT INTO last_picture_cache (vhost,event,last_picture) VALUES (?,?,NULL)", + undef, $vhost, $id) or return ("Kunne ikke sette inn ny cache-rad" . $dbh->errstr); + purge_cache($r, "/"); return (); } @@ -591,6 +1069,69 @@ sub guess_charset { return $decoded; } +# Depending on your front-end cache, you might want to get creative somehow here. +# This example assumes you have a front-end cache and it can translate an X-Pr0n-Purge +# regex tacked onto a request into something useful. The elements given in +# should not be regexes, though, as e.g. Squid will not be able to handle that. +sub purge_cache { + my ($r, @elements) = @_; + return if (scalar @elements == 0); + + my @pe = (); + for my $elem (@elements) { + $r->log->info("Purging $elem"); + (my $e = $elem) =~ s/[.+*|()]/\\$&/g; + push @pe, $e; + } + + my $regex = "^"; + if (scalar @pe == 1) { + $regex .= $pe[0]; + } else { + $regex .= "(" . join('|', @pe) . ")"; + } + $regex .= "(\\?.*)?\$"; + $r->headers_out->{'X-Pr0n-Purge'} = $regex; + + $r->log->info($r->headers_out->{'X-Pr0n-Purge'}); +} + +# Find a list of all cache URLs for a given image, given what we have on disk. +sub get_all_cache_urls { + my ($r, $dbh, $id) = @_; + my $dir = POSIX::floor($id / 256); + my @ret = (); + + my $q = $dbh->prepare('SELECT event, filename FROM images WHERE id=?') + or die "Couldn't prepare: " . $dbh->errstr; + $q->execute($id) + or die "Couldn't find event and filename: " . $dbh->errstr; + my $ref = $q->fetchrow_hashref; + my $event = $ref->{'event'}; + my $filename = $ref->{'filename'}; + $q->finish; + + my $base = get_base($r) . "cache/$dir"; + for my $file (<$base/$id-*>) { + my $fname = File::Basename::basename($file); + if ($fname =~ /^$id-mipmap-.*\.jpg$/) { + # Mipmaps don't have an URL, ignore + } elsif ($fname =~ /^$id--1--1\.jpg$/) { + push @ret, "/$event/$filename"; + } elsif ($fname =~ /^$id-(\d+)-(\d+)\.jpg$/) { + push @ret, "/$event/$1x$2/$filename"; + } elsif ($fname =~ /^$id-(\d+)-(\d+)-nobox\.jpg$/) { + push @ret, "/$event/$1x$2/nobox/$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"); + } + } + + return @ret; +} + 1;