Error: $err
\n"); - footer($r); + header($r, $io, $title); + $io->print("Error: $err
\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 => $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 }); } @@ -131,7 +128,8 @@ sub get_query_string { my $first = 1; my $str = ""; - while (my ($key, $value) = each %$param) { + for my $key (sort keys %$param) { + my $value = $param->{$key}; next unless defined($value); next if (defined($defparam->{$key}) && $value == $defparam->{$key}); @@ -183,20 +181,20 @@ sub pretty_unescape { } sub print_link { - my ($r, $title, $baseurl, $param, $defparam, $accesskey) = @_; + my ($io, $title, $baseurl, $param, $defparam, $accesskey) = @_; my $str = "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; @@ -207,31 +205,24 @@ sub get_dbh { 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, $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"; - } else { + if ($infobox) { if ($dpr == 1) { - return get_base($r) . "cache/$dir/$id-$width-$height-box.png"; + return $Sesse::pr0n::Config::image_base . "cache/$dir/$id-$width-$height-box.png"; } else { - return get_base($r) . "cache/$dir/$id-$width-$height-box\@$dpr.png"; + return $Sesse::pr0n::Config::image_base . "cache/$dir/$id-$width-$height-box\@$dpr.png"; } + } else { + return $Sesse::pr0n::Config::image_base . "cache/$dir/$id-$width-$height-nobox.jpg"; } } @@ -239,15 +230,15 @@ sub ensure_disk_location_exists { my ($r, $id) = @_; my $dir = POSIX::floor($id / 256); - my $img_dir = get_base($r) . "/images/$dir/"; + my $img_dir = $Sesse::pr0n::Config::image_base . "/images/$dir/"; if (! -d $img_dir) { - $r->log->info("Need to create new image directory $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 = get_base($r) . "/cache/$dir/"; + my $cache_dir = $Sesse::pr0n::Config::image_base . "/cache/$dir/"; if (! -d $cache_dir) { - $r->log->info("Need to create new cache directory $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"; } } @@ -256,7 +247,7 @@ sub get_mipmap_location { 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 { @@ -310,25 +301,6 @@ 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'); - if (scalar @tags == 0) { - # This is XMP-dc:Subject, an RDF bag of tags. - @tags = $exiftool->GetValue('Subject', '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, ?),last_update=CURRENT_TIMESTAMP WHERE (vhost,event)=(SELECT vhost,event FROM images WHERE id=?)', @@ -342,25 +314,25 @@ sub check_access { #return qw(sesse Sesse); - my $auth = $r->headers_in->{'authorization'}; + my $auth = $r->header('authorization'); if (!defined($auth)) { - output_401($r); return undef; } if ($auth =~ /^Basic ([a-zA-Z0-9+\/]+=*)$/) { return check_basic_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"'; +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 { @@ -369,35 +341,15 @@ sub check_basic_auth { my ($raw_user, $pass) = split /:/, MIME::Base64::decode_base64($auth); my ($user, $takenby) = extract_takenby($raw_user); - my $ref = $dbh->selectrow_hashref('SELECT sha1password,cryptpassword FROM users WHERE username=? AND vhost=?', - undef, $user, $r->get_server_name); - my ($sha1_matches, $bcrypt_matches) = (0, 0); - if (defined($ref) && defined($ref->{'sha1password'})) { - $sha1_matches = (Digest::SHA::sha1_base64($pass) eq $ref->{'sha1password'}); - } - if (defined($ref) && defined($ref->{'cryptpassword'})) { - $bcrypt_matches = (Crypt::Eksblowfish::Bcrypt::bcrypt($pass, $ref->{'cryptpassword'}) eq $ref->{'cryptpassword'}); - } - - if (!defined($ref) || (!$sha1_matches && !$bcrypt_matches)) { + 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"); - - # Make sure we can use bcrypt authentication in the future with this password. - # Also remove old-style SHA1 password when we migrate. - if (!$bcrypt_matches) { - my $salt = get_pseudorandom_bytes(16); # Doesn't need to be cryptographically secur. - my $hash = "\$2a\$07\$" . Crypt::Eksblowfish::Bcrypt::en_base64($salt); - my $cryptpassword = Crypt::Eksblowfish::Bcrypt::bcrypt($pass, $hash); - $dbh->do('UPDATE users SET sha1password=NULL,cryptpassword=? WHERE username=? AND vhost=?', - undef, $cryptpassword, $user, $r->get_server_name) - or die "Couldn't update: " . $dbh->errstr; - $r->log->info("Updated bcrypt hash for $user"); - } + log_info($r, "Authentication succeeded for $user/$takenby"); return ($user, $takenby); } @@ -464,14 +416,14 @@ sub stat_image_from_id { # 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 { @@ -519,14 +471,10 @@ sub make_mipmap { 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; @@ -535,7 +483,7 @@ sub make_mipmap { } 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( @@ -549,17 +497,13 @@ sub make_mipmap { } 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'); } @@ -567,13 +511,13 @@ sub make_mipmap { } 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; @@ -605,7 +549,7 @@ sub read_original_image { } if ($err) { - $r->log->warn("$physical_fname: $err"); + log_warn($r, "$physical_fname: $err"); $err =~ /(\d+)/; if ($1 >= 400) { undef $magick; @@ -630,7 +574,7 @@ sub ensure_cached { my ($new_dbwidth, $new_dbheight); my $fname = get_disk_location($r, $id); - if ($infobox ne 'box') { + if (!$infobox) { unless (defined($xres) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbwidth || $yres < $dbheight || $xres == -1)) { return ($fname, undef); } @@ -642,15 +586,15 @@ sub ensure_cached { # 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 @@ -692,18 +636,13 @@ sub ensure_cached { } $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; - ($img, $new_dbwidth, $new_dbheight) = make_mipmap($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale, $xres, $yres, @otherres); + ($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); @@ -730,11 +669,6 @@ sub ensure_cached { $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, 1); - } - # Strip EXIF tags etc. $cimg->Strip(); @@ -757,12 +691,12 @@ sub ensure_cached { ($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 = (); @@ -773,7 +707,7 @@ sub ensure_cached { # Update the SQL database if it doesn't contain the required info if (!defined($dbwidth) && defined($new_dbwidth)) { - $r->log->info("Updating width/height for $id: $new_dbwidth x $new_dbheight"); + log_info($r, "Updating width/height for $id: $new_dbwidth x $new_dbheight"); update_image_info($r, $id, $new_dbwidth, $new_dbheight); } @@ -963,7 +897,7 @@ sub gcd { } 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-]+)$/) { @@ -980,14 +914,14 @@ sub add_new_event { 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 (); } @@ -1011,12 +945,12 @@ sub guess_charset { # 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; } @@ -1028,7 +962,7 @@ sub purge_cache { $regex .= "(" . join('|', @pe) . ")"; } $regex .= "(\\?.*)?\$"; - $r->headers_out->{'X-Pr0n-Purge'} = $regex; + $res->header('X-Pr0n-Purge' => $regex); } # Find a list of all cache URLs for a given image, given what we have on disk. @@ -1046,7 +980,7 @@ sub get_all_cache_urls { 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$/) { @@ -1062,13 +996,54 @@ sub get_all_cache_urls { } elsif ($fname =~ /^$id-(\d+)-(\d+)-box\.png$/) { push @ret, "/$event/$1x$2/box/$filename"; } else { - $r->log->warn("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;