use Image::Magick;
use POSIX;
use Digest::MD5;
-use Digest::SHA1;
+use Digest::SHA;
use Digest::HMAC_SHA1;
use MIME::Base64;
use MIME::Types;
require Sesse::pr0n::Config_local;
};
- $VERSION = "v2.72";
+ $VERSION = "v2.80";
@ISA = qw(Exporter);
@EXPORT = qw(&error &dberror);
%EXPORT_TAGS = qw();
my $r = shift;
return $r->dir_config('ImageBase');
}
-
+
sub get_disk_location {
my ($r, $id) = @_;
my $dir = POSIX::floor($id / 256);
}
}
+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);
# 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: $!";
# 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);
my $ref = $dbh->selectrow_hashref('SELECT sha1password,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)) {
+ if (!defined($ref) || $ref->{'sha1password'} ne Digest::SHA::sha1_base64($pass)) {
$r->content_type('text/plain; charset=utf-8');
$r->log->warn("Authentication failed for $user/$takenby");
output_401($r);
}
$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.