X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FCommon.pm;h=77cf431a977dbc598e28df9fa2f4336ecb36f8e6;hp=63190b14295aadc1d10df6d19d0480cd5e672eec;hb=acc5b53241d0e971595d6017c60f54a6bc057c41;hpb=a8507a180fdcb9e5e78dd689d1be1fa08401441e

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index 63190b1..77cf431 100644
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -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.80";
+	$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 {
@@ -219,7 +220,7 @@ sub get_disk_location {
 }
 
 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') {
@@ -227,7 +228,11 @@ sub get_cache_location {
 	} 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";
+		}
 	}
 }
 
@@ -390,10 +395,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::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);
@@ -410,9 +423,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) = @_;	
 
@@ -717,7 +760,7 @@ sub read_original_image {
 }
 
 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);
 
@@ -728,7 +771,7 @@ sub ensure_cached {
 		}
 	}
 
-	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
@@ -761,12 +804,12 @@ sub ensure_cached {
 			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
@@ -799,7 +842,7 @@ sub ensure_cached {
 
 		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)) {
@@ -824,7 +867,7 @@ sub ensure_cached {
 
 			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.
@@ -880,7 +923,7 @@ sub get_mimetype_from_filename {
 }
 
 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",
@@ -1009,7 +1052,7 @@ sub make_infobox {
 			$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);
@@ -1018,7 +1061,7 @@ sub make_infobox {
 	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);
@@ -1026,13 +1069,13 @@ sub make_infobox {
 	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;
@@ -1041,8 +1084,8 @@ sub make_infobox {
 		} 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;