use Sesse::pr0n::QscaleProxy;
use Sesse::pr0n::Templates;
-use Apache2::RequestRec (); # for $r->content_type
-use Apache2::RequestIO (); # for $r->print
-use Apache2::Const -compile => ':common';
-use Apache2::Log;
-use ModPerl::Util;
-
use Carp;
use Encode;
use DBI;
use DBD::Pg;
use Image::Magick;
+use IO::String;
use POSIX;
-use Digest::MD5;
-use Digest::SHA1;
-use Digest::HMAC_SHA1;
use MIME::Base64;
use MIME::Types;
use LWP::Simple;
use HTML::Entities;
use URI::Escape;
use File::Basename;
+use Crypt::Eksblowfish::Bcrypt;
BEGIN {
use Exporter ();
require Sesse::pr0n::Config_local;
};
- $VERSION = "v2.70";
+ $VERSION = "v3.00";
@ISA = qw(Exporter);
@EXPORT = qw(&error &dberror);
%EXPORT_TAGS = qw();
or die "Couldn't connect to PostgreSQL database: " . DBI->errstr;
our $mimetypes = new MIME::Types;
- Apache2::ServerUtil->server->log_error("Initializing pr0n $VERSION");
+ print STDERR "Initializing pr0n $VERSION\n";
}
END {
our $dbh;
$status = 500;
$title = "Internal server error";
}
+
+ my $res = Plack::Response->new($status);
+ my $io = IO::String->new;
$r->content_type('text/html; charset=utf-8');
- $r->status($status);
- header($r, $title);
- $
r->print(" <p>Error: $err</p>\n");
- footer($r);
+ header($r, $io, $title);
+ $
io->print(" <p>Error: $err</p>\n");
+ footer($r, $io);
- $r->log->error($err);
- $r->log->error("Stack trace follows: " . Carp::longmess());
+ log_error($r, $err);
+ log_error($r, "Stack trace follows: " . Carp::longmess());
- ModPerl::Util::exit();
+ $io->setpos(0);
+ $res->body($io);
+ return $res;
}
sub dberror {
my ($r,$err) = @_;
- error($r, "$err (DB error: " . $dbh->errstr . ")");
+ return error($r, "$err (DB error: " . $dbh->errstr . ")");
}
sub header {
- my ($r,$title) = @_;
+ my ($r, $io, $title) = @_;
$r->content_type("text/html; charset=utf-8");
# Fetch quote if we're itk-bilder.samfundet.no
my $quote = "";
- if ($r->get_server_name eq 'itk-bilder.samfundet.no') {
+ if (Sesse::pr0n::Common::get_server_name($r) eq 'itk-bilder.samfundet.no') {
$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 => Encode::decode_utf8($quote) });
+ Sesse::pr0n::Templates::print_template($r, $io, "header", { title => $title, quotes => $quote });
}
sub footer {
- my ($r) = @_;
- Sesse::pr0n::Templates::print_template($r, "footer",
+ my ($r, $io) = @_;
+ Sesse::pr0n::Templates::print_template($r, $io, "footer",
{ version => $Sesse::pr0n::Common::VERSION });
}
}
sub print_link {
- my ($r, $title, $baseurl, $param, $defparam, $accesskey) = @_;
+ my ($io, $title, $baseurl, $param, $defparam, $accesskey) = @_;
my $str = "<a href=\"$baseurl" . get_query_string($param, $defparam) . "\"";
if (defined($accesskey) && length($accesskey) == 1) {
$str .= " accesskey=\"$accesskey\"";
}
$str .= ">$title</a>";
- $r->print($str);
+ $io->print($str);
}
sub get_dbh {
# Check that we are alive
if (!(defined($dbh) && $dbh->ping)) {
# Try to reconnect
- Apache2::ServerUtil->server->log_error("Lost contact with PostgreSQL server, trying to reconnect...");
+ print STDERR "Lost contact with PostgreSQL server, trying to reconnect...\n";
unless ($dbh = DBI->connect("dbi:Pg:dbname=pr0n;host=" . $Sesse::pr0n::Config::db_host,
$Sesse::pr0n::Config::db_username, $Sesse::pr0n::Config::db_password)) {
$dbh = undef;
return $dbh;
}
-sub get_base {
- my $r = shift;
- return $r->dir_config('ImageBase');
-}
-
sub get_disk_location {
my ($r, $id) = @_;
my $dir = POSIX::floor($id / 256);
- return get_base($r) . "images/$dir/$id.jpg";
+ return $Sesse::pr0n::Config::image_base . "images/$dir/$id.jpg";
}
sub get_cache_location {
- my ($r, $id, $width, $height, $infobox) = @_;
+ my ($r, $id, $width, $height, $infobox, $dpr) = @_;
my $dir = POSIX::floor($id / 256);
- if ($infobox eq 'both') {
- return get_base($r) . "cache/$dir/$id-$width-$height.jpg";
- } elsif ($infobox eq 'nobox') {
- return get_base($r) . "cache/$dir/$id-$width-$height-nobox.jpg";
+ if ($infobox) {
+ if ($dpr == 1) {
+ return $Sesse::pr0n::Config::image_base . "cache/$dir/$id-$width-$height-box.png";
+ } else {
+ return $Sesse::pr0n::Config::image_base . "cache/$dir/$id-$width-$height-box\@$dpr.png";
+ }
} else {
- return get_base($r) . "cache/$dir/$id-$width-$height-box.png";
+ return $Sesse::pr0n::Config::image_base . "cache/$dir/$id-$width-$height-nobox.jpg";
+ }
+}
+
+sub ensure_disk_location_exists {
+ my ($r, $id) = @_;
+ my $dir = POSIX::floor($id / 256);
+
+ my $img_dir = $Sesse::pr0n::Config::image_base . "/images/$dir/";
+ if (! -d $img_dir) {
+ log_info($r, "Need to create new image directory $img_dir");
+ mkdir($img_dir) or die "Couldn't create new image directory $img_dir";
+ }
+
+ my $cache_dir = $Sesse::pr0n::Config::image_base . "/cache/$dir/";
+ if (! -d $cache_dir) {
+ log_info($r, "Need to create new cache directory $cache_dir");
+ mkdir($cache_dir) or die "Couldn't create new image directory $cache_dir";
}
}
my ($r, $id, $width, $height) = @_;
my $dir = POSIX::floor($id / 256);
- return get_base($r) . "cache/$dir/$id-mipmap-$width-$height.jpg";
+ return $Sesse::pr0n::Config::image_base . "cache/$dir/$id-mipmap-$width-$height.jpg";
}
sub update_image_info {
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=?)',
+ $dbh->do('UPDATE last_picture_cache SET last_picture=GREATEST(last_picture, ?),last_update=CURRENT_TIMESTAMP WHERE (vhost,event)=(SELECT vhost,event FROM images WHERE id=?)',
undef, $datetime, $id)
or die "Couldn't update last_picture in SQL: $!";
}
#return qw(sesse Sesse);
- my $auth = $r->headers_in->{'authorization'};
+ my $auth = $r->header('authorization');
if (!defined($auth)) {
- output_401($r);
return undef;
}
- $r->log->warn("Auth: $auth");
if ($auth =~ /^Basic ([a-zA-Z0-9+\/]+=*)$/) {
return check_basic_auth($r, $1);
}
- if ($auth =~ /^Digest (.*)$/) {
- return check_digest_auth($r, $1);
- }
- output_401($r);
return undef;
}
-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
- }
+sub generate_401 {
+ my ($r) = @_;
+ my $res = Plack::Response->new(401);
+ $res->content_type('text/plain; charset=utf-8');
+ $res->status(401);
+ $res->header('WWW-Authenticate' => 'Basic realm="pr0n.sesse.net"');
- $r->print("Need authorization\n");
+ $res->body("Need authorization\n");
+ return $res;
}
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 cryptpassword FROM users WHERE username=? AND vhost=?',
+ undef, $user, Sesse::pr0n::Common::get_server_name($r));
+ my $bcrypt_matches = 0;
+ if (!defined($ref) || Crypt::Eksblowfish::Bcrypt::bcrypt($pass, $ref->{'cryptpassword'}) ne $ref->{'cryptpassword'}) {
$r->content_type('text/plain; charset=utf-8');
- $r->log->warn("Authentication failed for $user/$takenby");
- output_401($r);
+ log_warn($r, "Authentication failed for $user/$takenby");
return undef;
}
-
- $r->log->info("Authentication succeeded for $user/$takenby");
+ log_info($r, "Authentication succeeded for $user/$takenby");
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;
+sub get_pseudorandom_bytes {
+ my $num_left = shift;
+ my $bytes = "";
+ open my $randfh, "<", "/dev/urandom"
+ or die "/dev/urandom: $!";
+ binmode $randfh;
+ while ($num_left > 0) {
+ my $tmp;
+ if (sysread($randfh, $tmp, $num_left) == -1) {
+ die "sysread(/dev/urandom): $!";
}
- $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;
+ $bytes .= $tmp;
+ $num_left -= length($bytes);
}
-
- # 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);
+ close $randfh;
+ return $bytes;
}
sub extract_takenby {
}
# Takes in an image ID and a set of resolutions, and returns (generates if needed)
-# the smallest mipmap larger than the largest of them.
+# the smallest mipmap larger than the largest of them, as well as the original image
+# dimensions.
sub make_mipmap {
- my ($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale, @res) = @_;
+ my ($r, $filename, $id, $dbwidth, $dbheight, @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);
+ $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight);
$width = $img->Get('columns');
$height = $img->Get('rows');
} else {
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 = Sesse::pr0n::QscaleProxy->new;
$img->Read($last_good_mmlocation);
} else {
- $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale);
+ $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight);
}
}
my $cimg;
} else {
$cimg = $img->Clone();
}
- $r->log->info("Making mipmap for $id: " . $mmres->[0] . " x " . $mmres->[1]);
+ log_info($r, "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(
}
if ($last && !defined($img)) {
# OK, read in the smallest one
- if ($can_use_qscale) {
- $img = Sesse::pr0n::QscaleProxy->new;
- } else {
- $img = Image::Magick->new;
- }
+ $img = Sesse::pr0n::QscaleProxy->new;
my $err = $img->Read($mmlocation);
}
}
if (!defined($img)) {
- $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale);
+ $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight);
+ $width = $img->Get('columns');
+ $height = $img->Get('rows');
}
- return $img;
+ return ($img, $width, $height);
}
sub read_original_image {
- my ($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale) = @_;
+ my ($r, $filename, $id, $dbwidth, $dbheight) = @_;
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)) {
+ if ($filename =~ /\.jpeg$/i || $filename =~ /\.jpg$/i) {
$magick = Sesse::pr0n::QscaleProxy->new;
} else {
$magick = Image::Magick->new;
}
if ($err) {
- $r->log->warn("$physical_fname: $err");
+ log_warn($r, "$physical_fname: $err");
$err =~ /(\d+)/;
if ($1 >= 400) {
undef $magick;
# 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;
}
- 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 ($r, $filename, $id, $dbwidth, $dbheight, $infobox, $dpr, $xres, $yres, @otherres) = @_;
+
+ my ($new_dbwidth, $new_dbheight);
my $fname = get_disk_location($r, $id);
- if ($infobox ne 'box') {
- unless (defined($xres) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbheight || $yres < $dbwidth || $xres == -1)) {
+ if (!$infobox) {
+ unless (defined($xres) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbwidth || $yres < $dbheight || $xres == -1)) {
return ($fname, undef);
}
}
- my $cachename = get_cache_location($r, $id, $xres, $yres, $infobox);
+ my $cachename = get_cache_location($r, $id, $xres, $yres, $infobox, $dpr);
my $err;
if (! -r $cachename or (-M $cachename > -M $fname)) {
# If we are in overload mode (aka Slashdot mode), refuse to generate
# new thumbnails.
if (Sesse::pr0n::Overload::is_in_overload($r)) {
- $r->log->warn("In overload mode, not scaling $id to $xres x $yres");
+ log_warn($r, "In overload mode, not scaling $id to $xres x $yres");
error($r, 'System is in overload mode, not doing any scaling');
}
- # If we're being asked for just the box, make a new image with just the box.
+ # If we're being asked for the box, make a new image with it.
# 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') {
+ if ($infobox) {
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');
+ $new_dbwidth = $width = $img->Get('columns');
+ $new_dbheight = $height = $img->Get('rows');
@$img = ();
} else {
$img = Image::Magick->new;
if (defined($xres) && defined($yres)) {
($width, $height) = scale_aspect($width, $height, $xres, $yres);
}
- $height = 24;
+ $height = 24 * $dpr;
$img->Set(size=>($width . "x" . $height));
$img->Read('xc:white');
my $info = Image::ExifTool::ImageInfo($fname);
- if (make_infobox($img, $info, $r)) {
+ if (make_infobox($img, $info, $r, $dpr)) {
$img->Quantize(colors=>16, dither=>'False');
# Since the image is grayscale, ImageMagick overrides us and writes this
}
$err = $img->write(filename => $cachename, quality => 90, depth => 8);
- $r->log->info("New infobox cache: $width x $height for $id.jpg");
+ log_info($r, "New infobox cache: $width x $height for $id.jpg");
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);
+ my $img;
+ ($img, $new_dbwidth, $new_dbheight) = make_mipmap($r, $filename, $id, $dbwidth, $dbheight, $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);
+ my $cachename = get_cache_location($r, $id, $xres, $yres, $infobox, $dpr);
my $cimg;
if (defined($nxres) && defined($nyres)) {
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);
}
- 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();
($xres, $yres) = ($nxres, $nyres);
- $r->log->info("New cache: $nwidth x $nheight for $id.jpg");
+ log_info($r, "New cache: $nwidth x $nheight for $id.jpg");
}
undef $img;
if ($err) {
- $r->log->warn("$fname: $err");
+ log_warn($r, "$fname: $err");
$err =~ /(\d+)/;
if ($1 >= 400) {
#@$magick = ();
}
}
}
+
+ # Update the SQL database if it doesn't contain the required info
+ if (!defined($dbwidth) && defined($new_dbwidth)) {
+ log_info($r, "Updating width/height for $id: $new_dbwidth x $new_dbheight");
+ update_image_info($r, $id, $new_dbwidth, $new_dbheight);
+ }
+
return ($cachename, 'image/jpeg');
}
}
sub make_infobox {
- my ($img, $info, $r) = @_;
+ my ($img, $info, $r, $dpr) = @_;
# The infobox is of the form
# "Time - date - focal length, shutter time, aperture, sensitivity, exposure bias - flash",
# fields"; note the comma separation. Every field has an associated "bold flag"
# in the second part.
- my $shutter_priority = (defined($info->{'ExposureProgram'}) &&
+ my $manual_shutter = (defined($info->{'ExposureProgram'}) &&
$info->{'ExposureProgram'} =~ /shutter\b.*\bpriority/i);
- my $aperture_priority = (defined($info->{'ExposureProgram'}) &&
+ my $manual_aperture = (defined($info->{'ExposureProgram'}) &&
$info->{'ExposureProgram'} =~ /aperture\b.*\bpriority/i);
+ if ($info->{'ExposureProgram'} =~ /manual/i) {
+ $manual_shutter = 1;
+ $manual_aperture = 1;
+ }
my @classic_fields = ();
if (defined($info->{'FocalLength'}) && $info->{'FocalLength'} =~ /^(\d+)(?:\.\d+)?\s*(?:mm)?$/) {
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", $shutter_priority ];
- } elsif (defined($info->{'ExposureTime'}) && $info->{'ExposureTime'} =~ /^(\d+(?:\.\d+))$/) {
- push @classic_fields, [ $1 . "s", $shutter_priority ];
+ push @classic_fields, [ $a/$gcd . "/" . $b/$gcd . "s", $manual_shutter ];
+ } elsif (defined($info->{'ExposureTime'}) && $info->{'ExposureTime'} =~ /^(\d+(?:\.\d+)?)$/) {
+ push @classic_fields, [ $1 . "s", $manual_shutter ];
}
if (defined($info->{'FNumber'}) && $info->{'FNumber'} =~ /^(\d+)\/(\d+)$/) {
my $f = $1/$2;
if ($f >= 10) {
- push @classic_fields, [ (sprintf "f/%.0f", $f), $aperture_priority ];
+ push @classic_fields, [ (sprintf "f/%.0f", $f), $manual_aperture ];
} else {
- push @classic_fields, [ (sprintf "f/%.1f", $f), $aperture_priority ];
+ push @classic_fields, [ (sprintf "f/%.1f", $f), $manual_aperture ];
}
} elsif (defined($info->{'FNumber'}) && $info->{'FNumber'} =~ /^(\d+)\.(\d+)$/) {
my $f = $info->{'FNumber'};
if ($f >= 10) {
- push @classic_fields, [ (sprintf "f/%.0f", $f), $aperture_priority ];
+ push @classic_fields, [ (sprintf "f/%.0f", $f), $manual_aperture ];
} else {
- push @classic_fields, [ (sprintf "f/%.1f", $f), $aperture_priority ];
+ push @classic_fields, [ (sprintf "f/%.1f", $f), $manual_aperture ];
}
}
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 ];
}
$font = '/usr/share/fonts/truetype/msttcorefonts/Arial.ttf';
}
- my (undef, undef, $h, undef, $w) = ($img->QueryFontMetrics(text=>$part->[0], font=>$font, pointsize=>12));
+ my (undef, undef, $h, undef, $w) = ($img->QueryFontMetrics(text=>$part->[0], font=>$font, pointsize=>12*$dpr));
$tw += $w;
$th = $h if ($h > $th);
return 0 if ($tw > $img->Get('columns'));
my $x = 0;
- my $y = $img->Get('rows') - 24;
+ my $y = $img->Get('rows') - 24*$dpr;
# Hit exact DCT blocks
$y -= ($y % 8);
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);
+ $img->Draw(primitive=>'line', stroke=>'black', strokewidth=>$dpr, points=>$lpoints);
# Start writing out the text
$x = ($img->Get('columns') - $tw) / 2;
- my $room = ($img->Get('rows') - 1 - $y - $th);
- $y = ($img->Get('rows') - 1) - $room/2;
+ my $room = ($img->Get('rows') - $dpr - $y - $th);
+ $y = ($img->Get('rows') - $dpr) - $room/2;
for my $part (@parts) {
my $font;
} 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];
+ $img->Annotate(text=>$part->[0], font=>$font, pointsize=>12*$dpr, x=>int($x), y=>int($y));
+ $x += ($img->QueryFontMetrics(text=>$part->[0], font=>$font, pointsize=>12*$dpr))[4];
}
return 1;
}
sub add_new_event {
- my ($r, $dbh, $id, $date, $desc) = @_;
+ my ($r, $res, $dbh, $id, $date, $desc) = @_;
my @errors = ();
if (!defined($id) || $id =~ /^\s*$/ || $id !~ /^([a-zA-Z0-9-]+)$/) {
return @errors;
}
- my $vhost = $r->get_server_name;
+ my $vhost = Sesse::pr0n::Common::get_server_name($r);
$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 (vhost,event,last_picture) VALUES (?,?,NULL)",
undef, $vhost, $id)
or return ("Kunne ikke sette inn ny cache-rad" . $dbh->errstr);
- purge_cache($r, "/");
+ purge_cache($r, $res, "/");
return ();
}
# 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) = @_;
+ my ($r, $res, @elements) = @_;
return if (scalar @elements == 0);
my @pe = ();
for my $elem (@elements) {
- $r->log->info("Purging $elem");
+ log_info($r, "Purging $elem");
(my $e = $elem) =~ s/[.+*|()]/\\$&/g;
push @pe, $e;
}
$regex .= "(" . join('|', @pe) . ")";
}
$regex .= "(\\?.*)?\$";
- $r->headers_out->{'X-Pr0n-Purge'} = $regex;
-
- $r->log->info($r->headers_out->{'X-Pr0n-Purge'});
+ $res->header('X-Pr0n-Purge' => $regex);
}
# Find a list of all cache URLs for a given image, given what we have on disk.
my $filename = $ref->{'filename'};
$q->finish;
- my $base = get_base($r) . "cache/$dir";
+ my $base = $Sesse::pr0n::Config::image_base . "cache/$dir";
for my $file (<$base/$id-*>) {
my $fname = File::Basename::basename($file);
if ($fname =~ /^$id-mipmap-.*\.jpg$/) {
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");
+ log_warn($r, "Couldn't find a purging URL for $fname");
}
}
return @ret;
}
+sub set_last_modified {
+ my ($res, $mtime) = @_;
+
+ my $str = POSIX::strftime("%a, %d %b %Y %H:%M:%S GMT", gmtime($mtime));
+ $res->headers({ 'Last-Modified' => $str });
+}
+
+sub get_server_name {
+ my $r = shift;
+ my $host = $r->env->{'HTTP_HOST'};
+ $host =~ s/:.*//;
+ return $host;
+}
+
+sub log_info {
+ my ($r, $msg) = @_;
+ if (defined($r->logger)) {
+ $r->logger->({ level => 'info', message => $msg });
+ } else {
+ print STDERR "[INFO] $msg\n";
+ }
+}
+
+sub log_warn {
+ my ($r, $msg) = @_;
+ if (defined($r->logger)) {
+ $r->logger->({ level => 'warn', message => $msg });
+ } else {
+ print STDERR "[WARN] $msg\n";
+ }
+}
+
+sub log_error {
+ my ($r, $msg) = @_;
+ if (defined($r->logger)) {
+ $r->logger->({ level => 'error', message => $msg });
+ } else {
+ print STDERR "[ERROR] $msg\n";
+ }
+}
+
1;
projects / pr0n / blobdiff