X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FCommon.pm;h=8ea7fca1330bcb4be7faaa90909b8cd2841c5e8f;hp=ee1718e16af5293441178a3d4114ef3d5e73a108;hb=c41996944dd4d5b818e6b69150db1341d6483701;hpb=9e34ef3368cd8f2e2a2f584e48a9e26aa2778552 diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm index ee1718e..8ea7fca 100644 --- a/perl/Sesse/pr0n/Common.pm +++ b/perl/Sesse/pr0n/Common.pm @@ -19,7 +19,7 @@ use DBD::Pg; use Image::Magick; use POSIX; use Digest::MD5; -use Digest::SHA1; +use Digest::SHA; use Digest::HMAC_SHA1; use MIME::Base64; use MIME::Types; @@ -29,6 +29,7 @@ use Image::ExifTool; use HTML::Entities; use URI::Escape; use File::Basename; +use Crypt::Eksblowfish::Bcrypt; BEGIN { use Exporter (); @@ -39,7 +40,7 @@ BEGIN { require Sesse::pr0n::Config_local; }; - $VERSION = "v2.71"; + $VERSION = "v2.81"; @ISA = qw(Exporter); @EXPORT = qw(&error &dberror); %EXPORT_TAGS = qw(); @@ -96,7 +97,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 => Encode::decode_utf8($quote) }); + Sesse::pr0n::Templates::print_template($r, "header", { title => $title, quotes => $quote }); } sub footer { @@ -211,7 +212,7 @@ sub get_base { my $r = shift; return $r->dir_config('ImageBase'); } - + sub get_disk_location { my ($r, $id) = @_; my $dir = POSIX::floor($id / 256); @@ -231,6 +232,23 @@ sub get_cache_location { } } +sub ensure_disk_location_exists { + my ($r, $id) = @_; + my $dir = POSIX::floor($id / 256); + + my $img_dir = get_base($r) . "/images/$dir/"; + if (! -d $img_dir) { + $r->log->info("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/"; + if (! -d $cache_dir) { + $r->log->info("Need to create new cache directory $cache_dir"); + mkdir($cache_dir) or die "Couldn't create new image directory $cache_dir"; + } +} + sub get_mipmap_location { my ($r, $id, $width, $height) = @_; my $dir = POSIX::floor($id / 256); @@ -291,6 +309,10 @@ sub update_image_info { # 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: $!"; @@ -306,7 +328,7 @@ sub update_image_info { # 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: $!"; } @@ -346,11 +368,11 @@ sub output_401 { # 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 + # NOTE: For some weird reason, Digest::HMAC_SHA 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 $nonce = Digest::HMAC_SHA->hmac_sha1_hex($ts . "", $Sesse::pr0n::Config::db_password); my $stale_nonce_text = ""; $stale_nonce_text = ", stale=\"true\"" if ($options{'StaleNonce'} // 0); @@ -369,10 +391,18 @@ 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,digest_ha1_hex FROM users WHERE username=? AND vhost=?', + + my $ref = $dbh->selectrow_hashref('SELECT sha1password,cryptpassword,digest_ha1_hex FROM users WHERE username=? AND vhost=?', undef, $user, $r->get_server_name); - if (!defined($ref) || $ref->{'sha1password'} ne Digest::SHA1::sha1_base64($pass)) { + 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)) { $r->content_type('text/plain; charset=utf-8'); $r->log->warn("Authentication failed for $user/$takenby"); output_401($r); @@ -389,9 +419,39 @@ sub check_basic_auth { $r->log->info("Updated Digest auth hash for for $user"); } + # 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"); + } + return ($user, $takenby); } +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): $!"; + } + $bytes .= $tmp; + $num_left -= length($bytes); + } + close $randfh; + return $bytes; +} + sub check_digest_auth { my ($r, $auth) = @_; @@ -532,7 +592,8 @@ sub stat_image_from_id { } # 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 ($img, $mmimg, $width, $height); @@ -630,8 +691,10 @@ sub make_mipmap { if (!defined($img)) { $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale); + $width = $img->Get('columns'); + $height = $img->Get('rows'); } - return $img; + return ($img, $width, $height); } sub read_original_image { @@ -689,24 +752,17 @@ sub read_original_image { $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 ($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)) { + unless (defined($xres) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbwidth || $yres < $dbheight || $xres == -1)) { return ($fname, undef); } } @@ -732,8 +788,8 @@ sub ensure_cached { # 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; @@ -777,7 +833,8 @@ sub ensure_cached { $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, $can_use_qscale, $xres, $yres, @otherres); while (defined($xres) && defined($yres)) { my ($nxres, $nyres) = (shift @otherres, shift @otherres); @@ -844,6 +901,13 @@ 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"); + update_image_info($r, $id, $new_dbwidth, $new_dbheight); + } + return ($cachename, 'image/jpeg'); } @@ -863,10 +927,14 @@ sub make_infobox { # 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)?$/) { @@ -878,24 +946,24 @@ sub make_infobox { 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 ]; } } @@ -1092,8 +1160,6 @@ sub purge_cache { } $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.