X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FWebDAV.pm;h=71cd8ba13ea8f45763e8360d62e7ab814b67b314;hp=09f10e519cd1ebd312be7e6a51d84f0a58b6a008;hb=060aaacf0d15a03ed7287cf81169f630a1a1f95b;hpb=fd1e8cc4d43ed344438cb93e203ca146fe243487

diff --git a/perl/Sesse/pr0n/WebDAV.pm b/perl/Sesse/pr0n/WebDAV.pm
index 09f10e5..71cd8ba 100644
--- a/perl/Sesse/pr0n/WebDAV.pm
+++ b/perl/Sesse/pr0n/WebDAV.pm
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 use Sesse::pr0n::Common qw(error dberror);
-use Digest::SHA1;
+use Digest::SHA;
 use MIME::Base64;
 use Apache2::Request;
 use Apache2::Upload;
@@ -11,7 +11,7 @@ use Apache2::Upload;
 sub handler {
 	my $r = shift;
 	my $dbh = Sesse::pr0n::Common::get_dbh();
-	
+			
 	$r->headers_out->{'DAV'} = "1,2";
 
 	# We only handle depth=0, depth=1 (cf. the RFC)
@@ -368,7 +368,7 @@ EOF
 		} else {
 			# check if we have a "shadow file" for this
 			if (defined($autorename) && $autorename eq "autorename/") {
-				my $ref = $dbh->selectrow_hashref('SELECT id FROM shadow_files WHERE host=? AND event=? AND filename=? AND expires_at > now()',
+				my $ref = $dbh->selectrow_hashref('SELECT id FROM shadow_files WHERE vhost=? AND event=? AND filename=? AND expires_at > now()',
 					undef, $r->get_server_name, $event, $filename);
 				if (defined($ref)) {
 				 	($fname, $size, $mtime) = Sesse::pr0n::Common::stat_image_from_id($r, $ref->{'id'});
@@ -405,6 +405,9 @@ EOF
 		
 		my ($event, $autorename, $filename) = ($1, $2, $3);
 		my $size = $r->headers_in->{'content-length'};
+		if (!defined($size)) {
+			$size = $r->headers_in->{'x-expected-entity-length'};
+		}
 		my $orig_filename = $filename;
 
 		# Remove evil characters
@@ -423,7 +426,7 @@ EOF
 		# gnome-vfs and mac os x love to make zero-byte files,
 		# make them happy
 		# 
-		if ($r->headers_in->{'content-length'} == 0 || $filename =~ /^\.(_|DS_Store)/) {
+		if ($size == 0 || $filename =~ /^\.(_|DS_Store)/) {
 			$dbh->do('DELETE FROM fake_files WHERE expires_at <= now() OR (event=? AND vhost=? AND filename=?);',
 				undef, $event, $r->get_server_name, $filename)
 				or dberror($r, "Couldn't prune fake_files");
@@ -436,7 +439,7 @@ EOF
 			$r->log->info("Fake upload of $event/$filename");
 			return Apache2::Const::OK;
 		}
-
+			
 		# Get the new ID
 		my $ref = $dbh->selectrow_hashref("SELECT NEXTVAL('imageid_seq') AS id;");
 		my $newid = $ref->{'id'};
@@ -445,13 +448,18 @@ EOF
 		}
 		
 		# Autorename if we need to
-		if (defined($autorename) && $autorename eq "autorename/") {
-			my $ref = $dbh->selectrow_hashref("SELECT COUNT(*) AS numfiles FROM images WHERE vhost=? AND event=? AND filename=?",
-				undef, $r->get_server_name, $event, $filename)
-				or dberror($r, "Couldn't check for existing files");
-			if ($ref->{'numfiles'} > 0) {
+		$ref = $dbh->selectrow_hashref("SELECT COUNT(*) AS numfiles FROM images WHERE vhost=? AND event=? AND filename=?",
+		                               undef, $r->get_server_name, $event, $filename)
+			or dberror($r, "Couldn't check for existing files");
+		if ($ref->{'numfiles'} > 0) {
+			if (defined($autorename) && $autorename eq "autorename/") {
 				$r->log->info("Renaming $filename to $newid.jpeg");
 				$filename = "$newid.jpeg";
+			} else {
+				$r->status(403);
+				$r->content_type('text/plain; charset=utf-8');
+				$r->print("File $filename already exists in event $event, cannot overwrite");
+				return Apache2::Const::OK;
 			}
 		}
 		
@@ -468,18 +476,16 @@ EOF
 					
 				$dbh->do('INSERT INTO images (id,vhost,event,uploadedby,takenby,filename) VALUES (?,?,?,?,?,?)',
 					undef, $newid, $r->get_server_name, $event, $user, $takenby, $filename);
-				$dbh->do('UPDATE last_picture_cache SET last_update=CURRENT_TIMESTAMP WHERE vhost=? AND event=?',
-					undef, $r->get_server_name, $event);
 				Sesse::pr0n::Common::purge_cache($r, "/$event/");
 
 				# Now save the file to disk
+				Sesse::pr0n::Common::ensure_disk_location_exists($r, $newid);	
 				$fname = Sesse::pr0n::Common::get_disk_location($r, $newid);
 				open NEWFILE, ">$fname"
 					or die "$fname: $!";
 
 				my $buf;
-				my $content_length = $r->headers_in->{'content-length'};
-				if ($r->read($buf, $content_length)) {
+				if ($r->read($buf, $size)) {
 					print NEWFILE $buf or die "write($fname): $!";
 				}
 
@@ -565,7 +571,7 @@ EOF
 			my $ref = $q->fetchrow_hashref;
 
 			if ($ref->{'cnt'} == 0) {
-				my @errors = Sesse::pr0n::Common::add_new_event($dbh, $ne_id, $ne_date, $ne_desc, $r->get_server_name);
+				my @errors = Sesse::pr0n::Common::add_new_event($r, $dbh, $ne_id, $ne_date, $ne_desc);
 				if (scalar @errors > 0) {
 					die "Couldn't add new event $ne_id: " . join(', ', @errors);
 				}
@@ -607,8 +613,6 @@ EOF
 			eval {
 				$dbh->do('INSERT INTO images (id,vhost,event,uploadedby,takenby,filename) VALUES (?,?,?,?,?,?)',
 					undef, $newid, $r->get_server_name, $event, $user, $takenby, $filename);
-				$dbh->do('UPDATE last_picture_cache SET last_update=CURRENT_TIMESTAMP WHERE vhost=? AND event=?',
-					undef, $r->get_server_name, $event);
 
 				# Now save the file to disk
 				$fname = Sesse::pr0n::Common::get_disk_location($r, $newid);
@@ -662,7 +666,7 @@ EOF
 
 		my ($event, $autorename, $filename) = ($1, $2, $3);
 		$autorename = '' if (!defined($autorename));
-		my $sha1 = Digest::SHA1::sha1_base64("/$event/$autorename$filename");
+		my $sha1 = Digest::SHA::sha1_base64("/$event/$autorename$filename");
 
 		$r->status(200);
 		$r->content_type('text/xml; charset=utf-8');