X-Git-Url: http://git.ieval.ro/?p=plack-app-gruntmaster.git;a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster.pm;h=c9965d08a46894e02b5aa61cdbf89087c28d9000;hp=35d788e8887c7e5589c38ffd19d3b80d7fe66e06;hb=6533844f1a2ec6b162b696c31a623a4dc8ee72bb;hpb=8798626b0e96a4d1eb423f7f70ece78a2fcb4ae7

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index 35d788e..c9965d0 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',
+	rb => 'application/x-ruby',
 	l => 'text/plain',
 };
 
@@ -48,6 +49,7 @@ use constant FORMAT_EXTENSION => {
 	PASCAL => 'pas',
 	PERL => 'pl',
 	PYTHON => 'py',
+	RUBY => 'rb',
 	SBCL => 'l',
 };
 
@@ -69,7 +71,7 @@ sub problem { db->problem ($_{problem}) }
 sub job     { db->job     ($_{job})     }
 sub user    { db->user    ($_{user})    }
 
-sub redirect { [301, ['X-Forever' => 1, 'Location' => $_[0]], []] }
+sub redirect { [301, ['X-Forever' => 1, 'Cache-Control' => 'public, max-age=86400', 'Location' => $_[0]], []] }
 sub reply    { [200, ['Content-Type' => 'text/plain; charset=utf-8'], \@_] }
 sub response {
 	my ($template, $title, $params, $maxage) = @_;
@@ -79,7 +81,7 @@ sub response {
 	}
 	$params->{time} = time;
 	$params->{args} = {%_};
-	bless {template => $template, title => $title, params => $params, maxage => ($maxage // 1)}, __PACKAGE__.'::Response'
+	bless {template => $template, title => $title, params => $params, maxage => ($maxage // 3600)}, __PACKAGE__.'::Response'
 }
 
 sub forbid {
@@ -107,27 +109,16 @@ sub dispatch_request{
 			[200, \@headers, [job->source]]
 		},
 
-		sub (?:contest=) {
-			return NOT_FOUND if !contest;
-			forbid contest->is_pending;
-			response_filter { return shift }
-		},
-
-		sub (?:problem=) {
-			return NOT_FOUND if !problem;
-			forbid problem->is_private;
-			response_filter { return shift }
-		},
-
 		sub (?:format~) {
 			my $format = lc ($_{format} // '');
 			response_filter {
 				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';
+				my $vary = 'X-Static';
+				$vary .= ', Authorization' if $privacy eq 'private';
+				my @hdrs = ('X-Forever' => 1, 'Cache-Control' => "$privacy, max-age=$r->{maxage}", Vary => $vary);
 				return [200, ['Content-Type' => 'application/json; charset=utf-8', @hdrs], [encode_json $r->{params}]] if $format eq 'json';
-				my $ret = render $r->{template}, 'en', title => $r->{title}, %{$r->{params}};
+				my $ret = render $r->{template}, 'en', title => $r->{title}, %{$r->{params}}, maybe static => $env->{HTTP_X_STATIC} + 1;
 				[200, ['Content-Type' => 'text/html; charset=utf-8', @hdrs], [encode 'UTF-8', $ret]]
 			},
 		},
@@ -145,71 +136,71 @@ sub dispatch_request{
 		sub (/ed/:contest) {
 			forbid !contest->is_finished;
 			my $pblist = db->problem_list(contest => $_{contest}, solution => 1);
-			response ed => 'Editorial of ' . contest->name, {%$pblist, editorial => contest->editorial};
+			response ed => 'Editorial of ' . contest->name, {%$pblist, editorial => contest->editorial}, contest->is_finished(time - 86400) ? 60 : ();
 		},
 
 		sub (/login) {
 			forbid !remote_user;
-
-			my $return = $env->{HTTP_REFERER} // '/';
-			[303, ['Set-Cookie' => "username=".remote_user->id, Location => $return], []]
+			[200, ['Content-Type' => 'text/plain; charset=UTF-8', 'Cache-Control' => 'private, max-age=300', Vary => 'Authorization'], [$env->{REMOTE_USER}]]
 		},
 
 		sub (/ct/:contest/log/st) { redirect "/st/$_{contest}" },
 
 		sub (/us/)                                        { response us => 'Users', {us => db->user_list} },
-		sub (/ct/  + ?:owner~)                            { response ct => 'Contests', db->contest_list(%_) },
-		sub (/log/ + ?:contest~&:owner~&:page~&:problem~&:private~) {
+		sub (/ct/  + ?:owner~)                            { response ct => 'Contests', db->contest_list(%_), 300 },
+		sub (/log/ + ?:contest~&:owner~&:page~&:problem~&:private~&:result~) {
 			forbid $_{private};
-			response log => 'Job list', {%{db->job_list(%_)}, maybe contest => $_{contest},}
+			response log => 'Job list', db->job_list(%_), 5
 		},
 		sub (/pb/  + ?:owner~&:contest~&:private~)                  {
 			forbid $_{private};
-			response pb => 'Problems', {%{db->problem_list(%_)}, maybe contest => $_{contest}}
+			forbid contest && contest->is_pending;
+			response pb => 'Problems', db->problem_list(%_)
 		},
 
 		sub (/us/:user)    { response us_entry => user->name, db->user_entry($_{user}) },
-		sub (/ct/:contest) { response ct_entry => contest->name, db->contest_entry($_{contest}) },
+		sub (/ct/:contest) { response ct_entry => contest->name, db->contest_entry($_{contest}), 60 },
 		sub (/log/:job)    {
 			forbid job->private;
-			response log_entry => "Job  $_{job}", db->job_entry($_{job})
+			response log_entry => "Job  $_{job}", db->job_entry($_{job}), 10
 		},
 		sub (/pb/:problem + ?contest~) {
 			my (undef, undef, $contest) = @_;
 			$_{contest} = $contest;
-			return NOT_FOUND if !contest && !problem->is_in_archive || contest && !db->contest_problems->find($_{contest}, $_{problem});
-			forbid problem->is_private;
-			if (contest && contest->is_running) {
+			return NOT_FOUND if contest && !db->contest_problems->find($_{contest}, $_{problem});
+			forbid problem->private && !contest;
+			if (contest) {
+				return redirect "/pb/$_{problem}" unless contest->is_running;
 				forbid !remote_user;
 				$privacy = 'private';
 			}
-			response pb_entry => problem->name, {%{db->problem_entry($_{problem}, $_{contest}, remote_user && remote_user->id)}, maybe contest => $_{contest}};
+			response pb_entry => problem->name, db->problem_entry($_{problem}, $_{contest}, remote_user && remote_user->id), $_{contest} ? 10 : ();
 		},
 		sub (/sol/:problem) {
-			forbid !problem->is_in_archive;
+			forbid problem->private;
 			response sol => 'Solution of ' . problem->name, {solution => db->problem($_{problem})->solution};
 		},
 
 		sub (/) { redispatch_to '/index' },
 		sub (/favicon.ico) { redirect '/static/favicon.ico' },
-		sub (/:article) { [200, ['Content-Type' => 'text/html; charset=utf-8', 'Cache-Control' => 'public, max-age=60', 'X-Forever' => 1], [render_article $_{article}, 'en']] }
+		sub (/:article) { [200, ['Content-Type' => 'text/html; charset=utf-8', 'Cache-Control' => 'public, max-age=3600', 'X-Forever' => 1, Vary => 'X-Static'], [render_article $_{article}, 'en', maybe static => $env->{HTTP_X_STATIC}]] }
 	},
 
 	sub (POST) {
 		sub (/action/submit + %:problem=&:contest~&:prog_format=&:source_code~ + *prog~) {
 			my (undef, undef, $prog) = @_;
 			forbid !remote_user;
+			my $private = (problem->private && !contest) ? 1 : 0;
 			return reply 'This contest has finished' if contest && contest->is_finished;
-			return reply 'This contest has not yet started' if !admin && contest && contest->is_pending;
-			return reply 'This problem does not belong to this contest' if !contest && !problem->is_in_archive || contest && !db->contest_problems->find($_{contest}, $_{problem});
+			return reply 'This contest has not yet started' if contest && contest->is_pending;
+			return reply 'This problem is private' if !admin && $private;
+			return reply 'This problem does not belong to this contest' if contest && !db->contest_problems->find($_{contest}, $_{problem});
 			return reply 'Maximum source size is 10KB' if ($prog ? $prog->size : length $_{source_code}) > 10 * 1024;
 			return reply 'You must wait 30 seconds between jobs' if !admin && time <= remote_user->lastjob + 30;
 			remote_user->update({lastjob => time});
 
 			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},
 				private => $private,