}
+our $magic;
+
=over
=item retrieve_libravatar
);
my %param = @_;
my $cache_location = $param{location};
+ my $timestamp;
$cache_location =~ s/\.[^\.\/]+$//;
# take out a lock on the cache location so that if another request
# is made while we are serving this one, we don't do double work
} else {
# figure out if the cache is now valid; if it is, return the
# cache location
- my ($temp_location, $is_valid) = cache_location(email => $param{email});
- if ($is_valid) {
- return $temp_location;
+ my $temp_location;
+ ($temp_location, $timestamp) = cache_location(email => $param{email});
+ if ($timestamp) {
+ return ($temp_location,$timestamp);
}
}
require LWP::UserAgent;
- my $dest_type;
+ my $dest_type = 'png';
eval {
my $uri = libravatar_url(email => $param{email},
default => 404,
$ua->timeout(10);
# if the avatar is bigger than 30K, we don't want it either
$ua->max_size(30*1024);
+ $ua->default_header('Accept' => 'image/*');
my $r = $ua->get($uri);
if (not $r->is_success()) {
- die "Not successful in request";
+ if ($r->code != 404) {
+ die "Not successful in request";
+ }
+ # No avatar - cache a negative result
+ if ($config{libravatar_default_image} =~ m/\.(png|jpg)$/) {
+ $dest_type = $1;
+
+ system('cp', '-laf', $config{libravatar_default_image}, $cache_location.'.'.$dest_type) == 0
+ or die("Cannot copy $config{libravatar_default_image}");
+ # Returns from eval {}
+ return;
+ }
}
my $aborted = $r->header('Client-Aborted');
# if we exceeded max size, I'm not sure if we'll be
my $type = $r->header('Content-Type');
# if there's no content type, or it's not one we like, we won't
# bother going further
- die "No content type" if not defined $type;
- die "Wrong content type" if not $type =~ m{^image/([^/]+)$};
- $dest_type = $type_mapping{$1};
- die "No dest type" if not defined $dest_type;
+ if (defined $type) {
+ die "Wrong content type" if not $type =~ m{^image/([^/]+)$};
+ $dest_type = $type_mapping{$1};
+ die "No dest type" if not defined $dest_type;
+ }
# undo any content encoding
$r->decode() or die "Unable to decode content encoding";
# ok, now we need to convert it from whatever it is into a
eval {
print {$temp_fh} $r->content() or
die "Unable to print to temp file";
- close ($temp_fh);
+ close ($temp_fh) or
+ die "Unable to close temp file";
+ ### Figure out the actual type from the file
+ $magic = File::LibMagic->new() if not defined $magic;
+ $type = $magic->checktype_filename(abs_path($temp_fn));
+ die "Wrong content type ($type)" if not $type =~ m{^image/([^/;]+)(?:;|$)};
+ $dest_type = $type_mapping{$1};
+ die "No dest type for ($1)" if not defined $dest_type;
### resize all images to 80x80 and strip comments out of
### them. If convert has a bug, it would be possible for
### this to be an attack vector, but hopefully minimizing
return undef;
}
simple_unlockfile($fh,$lockfile);
- return $cache_location.'.'.$dest_type;
+ $timestamp = (stat($cache_location.'.'.$dest_type))[9];
+ return ($cache_location.'.'.$dest_type,$timestamp);
}
sub blocked_libravatar {
return $blocked;
}
-# Returns ($path, $is_valid)
+# Returns ($path, $timestamp)
# - For blocked images, $path will be undef
-# - If $is_valid is false (and $path is not undef), the image should
+# - If $timestamp is 0 (and $path is not undef), the image should
# be re-fetched.
sub cache_location {
my %param = @_;
croak("cache_location must be called with one of md5sum or email");
}
return (undef, 0) if blocked_libravatar($param{email},$md5sum);
- $stem = $config{libravatar_cache_dir}.'/'.$md5sum;
+ my $cache_dir = $param{cache_dir} // $config{libravatar_cache_dir};
+ $stem = $cache_dir.'/'.$md5sum;
for my $ext ('.png', '.jpg', '') {
my $path = $stem.$ext;
if (-e $path) {
- my $is_valid = (time - (stat(_))[9] < 60*60) ? 1 : 0;
- return ($path, $is_valid);
+ my $timestamp = (time - (stat(_))[9] < 60*60) ? (stat(_))[9] : 0;
+ return ($path, $timestamp);
}
}
return ($stem, 0);
return Apache2::Const::DECLINED();
}
# figure out what the md5sum of the e-mail is.
- my ($cache_location, $is_valid) = cache_location(email => $email);
+ my ($cache_location, $timestamp) = cache_location(email => $email);
# if we've got it, and it's less than one hour old, return it.
- if ($is_valid) {
+ if ($timestamp) {
serve_cache_mod_perl($cache_location,$r);
return Apache2::Const::DECLINED();
}
- $cache_location = retrieve_libravatar(location => $cache_location,
- email => $email,
- );
+ ($cache_location,$timestamp) =
+ retrieve_libravatar(location => $cache_location,
+ email => $email,
+ );
if (not defined $cache_location) {
# failure, serve the default image
- serve_cache_mod_perl('',$r);
+ serve_cache_mod_perl('',$r,$timestamp);
return Apache2::Const::DECLINED();
} else {
- serve_cache_mod_perl($cache_location,$r);
+ serve_cache_mod_perl($cache_location,$r,$timestamp);
return Apache2::Const::DECLINED();
}
}
-our $magic;
-
sub serve_cache_mod_perl {
- my ($cache_location,$r) = @_;
+ my ($cache_location,$r,$timestamp) = @_;
if (not defined $cache_location or not length $cache_location) {
# serve the default image
$cache_location = $config{libravatar_default_image};