X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster.pm;h=0bc46445e1f2ca0f7a491767090a65456cb8c652;hb=76454bdeec03a57088847b339c601ca47f1f9284;hp=0edfe5abd99615f54778a703cef7b8ee354663ce;hpb=645cfb7d047f81aa613d6d68436a972f5db103ee;p=plack-app-gruntmaster.git

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index 0edfe5a..0bc4644 100644
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -34,6 +34,7 @@ use constant CONTENT_TYPES => +{
 	pas => 'text/x-pascal',
 	pl => 'text/x-perl',
 	py => 'text/x-python',
+	l => 'text/plain',
 };
 
 use constant FORMAT_EXTENSION => {
@@ -47,6 +48,7 @@ use constant FORMAT_EXTENSION => {
 	PASCAL => 'pas',
 	PERL => 'pl',
 	PYTHON => 'py',
+	SBCL => 'l',
 };
 
 use constant NOT_FOUND => [404, ['Content-Type' => 'text/plain'], ['Not found']];
@@ -113,8 +115,12 @@ sub dispatch_request{
 
 		sub (/src/:job) {
 			return NOT_FOUND if !job;
-			forbid job->private || job->problem->private || job->contest && job->contest->is_running;
-			my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => CONTENT_TYPES->{job->format});
+			my $isowner = remote_user && remote_user->id eq job->rawowner;
+			my $private = job->private || job->problem->private || job->contest && job->contest->is_running;
+			forbid !$isowner && $private;
+			my $privacy = $private ? 'private' : 'public';
+			my @headers = ('X-Forever' => 1, 'Cache-Control' => "$privacy, max-age=604800", 'Content-Type' => CONTENT_TYPES->{job->format});
+			push @headers, (Vary => 'Authorization') if $private;
 			[200, \@headers, [job->source]]
 		},
 
@@ -136,6 +142,7 @@ sub dispatch_request{
 				my ($r) = @_;
 				return $r if ref $r ne 'Plack::App::Gruntmaster::Response';
 				my @hdrs = ('X-Forever' => 1, 'Cache-Control' => "$privacy, max-age=$r->{maxage}");
+				push @hdrs, Vary => 'Authorization' if $privacy eq 'private';
 				return [200, ['Content-Type' => 'application/json', @hdrs], [encode_json $r->{params}]] if $format eq 'json';
 				my $ret = render $r->{template}, 'en', title => $r->{title}, %{$r->{params}};
 				[200, ['Content-Type' => 'text/html', @hdrs], [encode 'UTF-8', $ret]]
@@ -238,9 +245,11 @@ sub dispatch_request{
 
 			my $source = $prog ? read_file $prog->path : $_{source_code};
 			unlink $prog->path if $prog;
+			my $private = (problem->private && !$_{contest}) ? 1 : 0;
+			$private = 1 if contest && contest->is_pending;
 			my $newjob = db->jobs->create({
 				maybe contest => $_{contest},
-				maybe private => problem->private && !$_{contest},
+				private => $private,
 				date => time,
 				extension => FORMAT_EXTENSION->{$_{prog_format}},
 				format => $_{prog_format},