use HTML::Entities;
use URI::Escape;
use File::Basename;
+use Crypt::Eksblowfish::Bcrypt;
BEGIN {
use Exporter ();
require Sesse::pr0n::Config_local;
};
- $VERSION = "v2.80";
+ $VERSION = "v2.81";
@ISA = qw(Exporter);
@EXPORT = qw(&error &dberror);
%EXPORT_TAGS = qw();
$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 {
}
sub get_cache_location {
- my ($r, $id, $width, $height, $infobox) = @_;
+ my ($r, $id, $width, $height, $infobox, $dpr) = @_;
my $dir = POSIX::floor($id / 256);
if ($infobox eq 'both') {
} elsif ($infobox eq 'nobox') {
return get_base($r) . "cache/$dir/$id-$width-$height-nobox.jpg";
} else {
- return get_base($r) . "cache/$dir/$id-$width-$height-box.png";
+ if ($dpr == 1) {
+ return get_base($r) . "cache/$dir/$id-$width-$height-box.png";
+ } else {
+ return get_base($r) . "cache/$dir/$id-$width-$height-box\@$dpr.png";
+ }
}
}
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::SHA::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);
$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) = @_;
}
sub ensure_cached {
- my ($r, $filename, $id, $dbwidth, $dbheight, $infobox, $xres, $yres, @otherres) = @_;
+ my ($r, $filename, $id, $dbwidth, $dbheight, $infobox, $dpr, $xres, $yres, @otherres) = @_;
my ($new_dbwidth, $new_dbheight);
}
}
- my $cachename = get_cache_location($r, $id, $xres, $yres, $infobox);
+ my $cachename = get_cache_location($r, $id, $xres, $yres, $infobox, $dpr);
my $err;
if (! -r $cachename or (-M $cachename > -M $fname)) {
# If we are in overload mode (aka Slashdot mode), refuse to generate
if (defined($xres) && defined($yres)) {
($width, $height) = scale_aspect($width, $height, $xres, $yres);
}
- $height = 24;
+ $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)) {
+ if (make_infobox($img, $info, $r, $dpr)) {
$img->Quantize(colors=>16, dither=>'False');
# Since the image is grayscale, ImageMagick overrides us and writes this
while (defined($xres) && defined($yres)) {
my ($nxres, $nyres) = (shift @otherres, shift @otherres);
- my $cachename = get_cache_location($r, $id, $xres, $yres, $infobox);
+ my $cachename = get_cache_location($r, $id, $xres, $yres, $infobox, $dpr);
my $cimg;
if (defined($nxres) && defined($nyres)) {
if (($nwidth >= 800 || $nheight >= 600 || $xres == -1) && $infobox ne 'nobox') {
my $info = Image::ExifTool::ImageInfo($fname);
- make_infobox($cimg, $info, $r);
+ make_infobox($cimg, $info, $r, 1);
}
# Strip EXIF tags etc.
}
sub make_infobox {
- my ($img, $info, $r) = @_;
+ my ($img, $info, $r, $dpr) = @_;
# The infobox is of the form
# "Time - date - focal length, shutter time, aperture, sensitivity, exposure bias - flash",
$font = '/usr/share/fonts/truetype/msttcorefonts/Arial.ttf';
}
- my (undef, undef, $h, undef, $w) = ($img->QueryFontMetrics(text=>$part->[0], font=>$font, pointsize=>12));
+ my (undef, undef, $h, undef, $w) = ($img->QueryFontMetrics(text=>$part->[0], font=>$font, pointsize=>12*$dpr));
$tw += $w;
$th = $h if ($h > $th);
return 0 if ($tw > $img->Get('columns'));
my $x = 0;
- my $y = $img->Get('rows') - 24;
+ my $y = $img->Get('rows') - 24*$dpr;
# Hit exact DCT blocks
$y -= ($y % 8);
my $points = sprintf "%u,%u %u,%u", $x, $y, ($img->Get('columns') - 1), ($img->Get('rows') - 1);
my $lpoints = sprintf "%u,%u %u,%u", $x, $y, ($img->Get('columns') - 1), $y;
$img->Draw(primitive=>'rectangle', stroke=>'white', fill=>'white', points=>$points);
- $img->Draw(primitive=>'line', stroke=>'black', points=>$lpoints);
+ $img->Draw(primitive=>'line', stroke=>'black', strokewidth=>$dpr, points=>$lpoints);
# Start writing out the text
$x = ($img->Get('columns') - $tw) / 2;
- my $room = ($img->Get('rows') - 1 - $y - $th);
- $y = ($img->Get('rows') - 1) - $room/2;
+ my $room = ($img->Get('rows') - $dpr - $y - $th);
+ $y = ($img->Get('rows') - $dpr) - $room/2;
for my $part (@parts) {
my $font;
} else {
$font = '/usr/share/fonts/truetype/msttcorefonts/Arial.ttf';
}
- $img->Annotate(text=>$part->[0], font=>$font, pointsize=>12, x=>int($x), y=>int($y));
- $x += ($img->QueryFontMetrics(text=>$part->[0], font=>$font, pointsize=>12))[4];
+ $img->Annotate(text=>$part->[0], font=>$font, pointsize=>12*$dpr, x=>int($x), y=>int($y));
+ $x += ($img->QueryFontMetrics(text=>$part->[0], font=>$font, pointsize=>12*$dpr))[4];
}
return 1;
projects / pr0n / blobdiff