use Image::Magick;
use IO::String;
use POSIX;
-use Digest::SHA;
-use Digest::HMAC_SHA1;
use MIME::Base64;
use MIME::Types;
use LWP::Simple;
use URI::Escape;
use File::Basename;
use Crypt::Eksblowfish::Bcrypt;
+use File::Temp;
BEGIN {
use Exporter ();
require Sesse::pr0n::Config_local;
};
- $VERSION = "v3.00";
+ $VERSION = "v3.20";
@ISA = qw(Exporter);
@EXPORT = qw(&error &dberror);
%EXPORT_TAGS = qw();
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});
sub get_disk_location {
my ($r, $id) = @_;
- my $dir = POSIX::floor($id / 256);
+ my $dir = POSIX::floor($id / 256);
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);
+ my ($id, $width, $height, $format) = @_;
+ my $dir = POSIX::floor($id / 256);
- 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";
- }
+ return $Sesse::pr0n::Config::image_base . "cache/$dir/$id-$width-$height-nobox.$format";
+}
+
+sub get_infobox_cache_location {
+ my ($id, $width, $height, $dpr) = @_;
+ my $dir = POSIX::floor($id / 256);
+
+ 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-nobox.jpg";
+ return $Sesse::pr0n::Config::image_base . "cache/$dir/$id-$width-$height-box\@$dpr.png";
}
}
sub get_mipmap_location {
my ($r, $id, $width, $height) = @_;
- my $dir = POSIX::floor($id / 256);
+ my $dir = POSIX::floor($id / 256);
return $Sesse::pr0n::Config::image_base . "cache/$dir/$id-mipmap-$width-$height.jpg";
}
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=?',
+ my $ref = $dbh->selectrow_hashref('SELECT cryptpassword FROM users WHERE username=? AND vhost=?',
undef, $user, Sesse::pr0n::Common::get_server_name($r));
- 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 $bcrypt_matches = 0;
+ if (!defined($ref) || Crypt::Eksblowfish::Bcrypt::bcrypt($pass, $ref->{'cryptpassword'}) ne $ref->{'cryptpassword'}) {
$r->content_type('text/plain; charset=utf-8');
log_warn($r, "Authentication failed for $user/$takenby");
return undef;
}
log_info($r, "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, Sesse::pr0n::Common::get_server_name($r))
- or die "Couldn't update: " . $dbh->errstr;
- log_info($r, "Updated bcrypt hash for $user");
- }
-
return ($user, $takenby);
}
}
sub ensure_cached {
- my ($r, $filename, $id, $dbwidth, $dbheight, $infobox, $dpr, $xres, $yres, @otherres) = @_;
-
- my ($new_dbwidth, $new_dbheight);
+ my ($r, $avif_ok, $filename, $id, $dbwidth, $dbheight, $xres, $yres, @otherres) = @_;
my $fname = get_disk_location($r, $id);
- if (!$infobox) {
- unless (defined($xres) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbwidth || $yres < $dbheight || $xres == -1)) {
- return ($fname, undef);
- }
+ 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, $dpr);
- my $err;
+ # See if we have an up-to-date AVIF to serve.
+ # (We never generate them on-the-fly, since they're so slow.)
+ my $cachename = get_cache_location($id, $xres, $yres, 'avif');
+ if ($avif_ok && -r $cachename and (-M $cachename <= -M $fname)) {
+ return ($cachename, 'image/avif');
+ }
+
+ $cachename = get_cache_location($id, $xres, $yres, 'jpg');
if (! -r $cachename or (-M $cachename > -M $fname)) {
# If we are in overload mode (aka Slashdot mode), refuse to generate
# new thumbnails.
error($r, 'System is in overload mode, not doing any scaling');
}
- # 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) {
- 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);
- $new_dbwidth = $width = $img->Get('columns');
- $new_dbheight = $height = $img->Get('rows');
- @$img = ();
- } else {
- $img = Image::Magick->new;
- $width = $dbwidth;
- $height = $dbheight;
- }
-
- if (defined($xres) && defined($yres)) {
- ($width, $height) = scale_aspect($width, $height, $xres, $yres);
- }
- $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, $dpr)) {
- $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:');
+ make_cache($r, $filename, $id, $dbwidth, $dbheight, 'jpg', $xres, $yres, @otherres);
+ }
- $width = 1;
- $height = 1;
- }
-
- $err = $img->write(filename => $cachename, quality => 90, depth => 8);
- log_info($r, "New infobox cache: $width x $height for $id.jpg");
-
- return ($cachename, 'image/png');
- }
+ return ($cachename, 'image/jpeg');
+}
- my $img;
- ($img, $new_dbwidth, $new_dbheight) = make_mipmap($r, $filename, $id, $dbwidth, $dbheight, $xres, $yres, @otherres);
+sub make_cache {
+ my ($r, $filename, $id, $dbwidth, $dbheight, $format, $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, $dpr);
-
- my $cimg;
- if (defined($nxres) && defined($nyres)) {
- # we have more resolutions to scale, so don't throw
- # the image away
- $cimg = $img->Clone();
- } else {
- $cimg = $img;
- }
-
- my $width = $img->Get('columns');
- my $height = $img->Get('rows');
- my ($nwidth, $nheight) = scale_aspect($width, $height, $xres, $yres);
+ my ($img, $new_dbwidth, $new_dbheight) = make_mipmap($r, $filename, $id, $dbwidth, $dbheight, $xres, $yres, @otherres);
- my $filter = 'Lanczos';
- my $quality = 87;
- my $sf = "1x1";
+ # 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);
+ }
- if ($xres != -1) {
- $cimg->Resize(width=>$nwidth, height=>$nheight, filter=>$filter, 'sampling-factor'=>$sf);
- }
+ my $err;
+ while (defined($xres) && defined($yres)) {
+ my ($nxres, $nyres) = (shift @otherres, shift @otherres);
+ my $cachename = get_cache_location($id, $xres, $yres, $format);
+
+ my $cimg;
+ if (defined($nxres) && defined($nyres)) {
+ # we have more resolutions to scale, so don't throw
+ # the image away
+ $cimg = $img->Clone();
+ } else {
+ $cimg = $img;
+ }
+
+ my $width = $img->Get('columns');
+ my $height = $img->Get('rows');
+ my ($nwidth, $nheight) = scale_aspect($width, $height, $xres, $yres);
- # Strip EXIF tags etc.
- $cimg->Strip();
+ if ($format eq 'avif') { # AVIF uses 4:2:0.
+ ++$nwidth if ($nwidth % 2 == 1);
+ ++$nheight if ($nheight % 2 == 1);
+ }
- {
- 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);
- }
+ my $filter = 'Lanczos';
+ my $quality = 87;
+ my $sf = "1x1";
- undef $cimg;
+ if ($xres != -1) {
+ $cimg->Resize(width=>$nwidth, height=>$nheight, filter=>$filter);
+ }
- ($xres, $yres) = ($nxres, $nyres);
+ # Strip EXIF tags etc.
+ $cimg->Strip();
- log_info($r, "New cache: $nwidth x $nheight for $id.jpg");
- }
-
- undef $img;
- if ($err) {
- log_warn($r, "$fname: $err");
- $err =~ /(\d+)/;
- if ($1 >= 400) {
- #@$magick = ();
- error($r, "$fname: $err");
+ if ($format eq 'jpg') {
+ 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);
+ } elsif ($format eq 'avif') {
+ # ImageMagick doesn't have AVIF support until version 7,
+ # and Debian hasn't packaged that even in unstable as of 2021.
+ # So we'll need to do it the manual way. (We don't use /tmp, for security reasons.)
+ (my $dirname = $cachename) =~ s,/[^/]*$,,;
+ my ($fh, $raw_filename) = File::Temp::tempfile('tmp.XXXXXXXX', DIR => $dirname, SUFFIX => '.yuv');
+ # Write a Y4M header, so that we get the chroma siting and color space correct.
+ printf $fh "YUV4MPEG2 W%d H%d F25:1 Ip A1:1 C420jpeg XYSCSS=420JPEG XCOLORRANGE=FULL\nFRAME\n", $nwidth, $nheight;
+ my %parms = (
+ file => $fh,
+ filename => $raw_filename,
+ 'sampling-factor' => '2x2'
+ );
+ $cimg->write(%parms);
+ close($fh);
+ my $ivf_filename;
+ ($fh, $ivf_filename) = File::Temp::tempfile('tmp.XXXXXXXX', DIR => $dirname, SUFFIX => '.ivf');
+ close($fh);
+ system('aomenc', '--quiet', '--cpu-used=0', '--bit-depth=10', '--end-usage=q', '--cq-level=10', '--target-bitrate=0', '--good', '--aq-mode=1', '--color-primaries=bt601', '--matrix-coefficients=bt601', '-o', $ivf_filename, $raw_filename);
+ unlink($raw_filename);
+ system('MP4Box', '-quiet', '-add-image', "$ivf_filename:primary", '-ab', 'avif', '-ab', 'miaf', '-new', $cachename);
+ unlink($ivf_filename);
+ } else {
+ die "Unknown format $format";
}
+
+ undef $cimg;
+
+ ($xres, $yres) = ($nxres, $nyres);
+
+ log_info($r, "New cache: $nwidth x $nheight ($format) for $id");
}
- # 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);
+ undef $img;
+ if ($err) {
+ log_warn($r, "$filename: $err");
+ $err =~ /(\d+)/;
+ if ($1 >= 400) {
+ #@$magick = ();
+ error($r, "$filename: $err");
+ }
}
+}
- return ($cachename, 'image/jpeg');
+sub ensure_infobox_cached {
+ my ($r, $filename, $id, $dbwidth, $dbheight, $dpr, $xres, $yres) = @_;
+
+ my ($new_dbwidth, $new_dbheight);
+
+ my $fname = get_disk_location($r, $id);
+ my $cachename = get_infobox_cache_location($id, $xres, $yres, $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)) {
+ log_warn($r, "In overload mode, not scaling $id to $xres x $yres");
+ error($r, 'System is in overload mode, not doing any scaling');
+ }
+
+ # We need the exact width so we can make one in the right size.
+ my ($width, $height);
+
+ # This is slow, but should fortunately almost never happen, so don't bother
+ # special-casing it.
+ if (!defined($dbwidth) || !defined($dbheight)) {
+ my $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight, 0);
+ $new_dbwidth = $width = $img->Get('columns');
+ $new_dbheight = $height = $img->Get('rows');
+ } else {
+ $width = $dbwidth;
+ $height = $dbheight;
+ }
+ my $img = Image::Magick->new;
+
+ if (defined($xres) && defined($yres)) {
+ ($width, $height) = scale_aspect($width, $height, $xres, $yres);
+ }
+ $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, $dpr)) {
+ $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:');
+
+ $width = 1;
+ $height = 1;
+ }
+
+ $err = $img->write(filename => $cachename, quality => 90, depth => 8);
+ log_info($r, "New infobox cache: $width x $height for $id.jpg");
+ }
+
+ return ($cachename, 'image/png');
}
sub get_mimetype_from_filename {
$info->{'ExposureProgram'} =~ /shutter\b.*\bpriority/i);
my $manual_aperture = (defined($info->{'ExposureProgram'}) &&
$info->{'ExposureProgram'} =~ /aperture\b.*\bpriority/i);
- if ($info->{'ExposureProgram'} =~ /manual/i) {
+ if (defined($info->{'ExposureProgram'}) && $info->{'ExposureProgram'} =~ /manual/i) {
$manual_shutter = 1;
$manual_aperture = 1;
}
$model =~ s/^\s+//;
$model =~ s/\s+$//;
- push @parts, [ ' - ', 0 ] if (scalar @parts > 0);
+ push @parts, [ "\x{00A0}\x{2013}\x{00A0}", 0 ] if (scalar @parts > 0);
push @parts, [ $model, 0 ];
}
# classic fields
if (scalar @classic_fields > 0) {
- push @parts, [ ' - ', 0 ] if (scalar @parts > 0);
+ push @parts, [ "\x{00A0}\x{2013}\x{00A0}", 0 ] if (scalar @parts > 0);
my $first_elem = 1;
for my $field (@classic_fields) {
$info->{'Flash'} =~ /no flash/i ||
$info->{'Flash'} =~ /not fired/i ||
$info->{'Flash'} =~ /Off/) {
- push @parts, [ ' - ', 0 ] if (scalar @parts > 0);
+ push @parts, [ "\x{00A0}\x{2013}\x{00A0}", 0 ] if (scalar @parts > 0);
push @parts, [ "No flash", 0 ];
} elsif ($info->{'Flash'} =~ /fired/i ||
$info->{'Flash'} =~ /On/) {
- push @parts, [ ' - ', 0 ] if (scalar @parts > 0);
+ push @parts, [ "\x{00A0}\x{2013}\x{00A0}", 0 ] if (scalar @parts > 0);
push @parts, [ "Flash", 0 ];
} else {
- push @parts, [ ' - ', 0 ] if (scalar @parts > 0);
+ push @parts, [ "\x{00A0}\x{2013}\x{00A0}", 0 ] if (scalar @parts > 0);
push @parts, [ $info->{'Flash'}, 0 ];
}
}
my ($res, $mtime) = @_;
my $str = POSIX::strftime("%a, %d %b %Y %H:%M:%S GMT", gmtime($mtime));
- $res->headers({ 'Last-Modified' => $str });
+ $res->header('Last-Modified' => $str);
}
sub get_server_name {
sub log_info {
my ($r, $msg) = @_;
- if (defined($r->logger)) {
+ 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)) {
+ 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)) {
+ if (defined($r->{'logger'})) {
$r->logger->({ level => 'error', message => $msg });
} else {
print STDERR "[ERROR] $msg\n";