X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FApp%2FGruntmaster.pm;h=2c3b2a2c6c619b2f916976ad8b4cebbcbfa8d65e;hb=90f613d3964e01ed8cc18ca07a89ffff87f72f4c;hp=bfc2e27049b064f09bc4d7f6e1c4d4fb5b01c8bc;hpb=3c434a02d3cc1438e4944c2a143e4989ab0c74a6;p=plack-app-gruntmaster.git

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index bfc2e27..2c3b2a2 100644
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -53,7 +53,7 @@ use constant FORMAT_EXTENSION => {
 	SBCL => 'l',
 };
 
-use constant NOT_FOUND => [404, ['Content-Type' => 'text/plain'], ['Not found']];
+use constant NOT_FOUND => [404, ['X-Forever' => 1, 'Content-Type' => 'text/plain'], ['Not found']];
 use constant FORBIDDEN => [401, ['Content-Type' => 'text/plain', 'WWW-Authenticate' => 'Basic realm="Gruntmaster 6000"'], ['Forbidden']];
 
 sub development() { ($ENV{PLACK_ENV} // 'development') eq 'development' }
@@ -75,7 +75,7 @@ sub job     { db->job     ($_{job})     }
 sub user    { db->user    ($_{user})    }
 
 sub redirect { [301, ['X-Forever' => 1, 'Location' => $_[0]], []] }
-sub reply    { [200, ['Content-Type' => 'text/plain'], \@_] }
+sub reply    { [200, ['Content-Type' => 'text/plain; charset=utf-8'], \@_] }
 sub response {
 	my ($template, $title, $params, $maxage) = @_;
 	unless ($params) {
@@ -104,24 +104,27 @@ sub dispatch_request{
 			return NOT_FOUND unless -e "css/themes/$theme.css";
 			my $css = read_file "css/themes/$theme.css";
 			$css .= read_file $_ for <css/*.css>;
-			my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => 'text/css');
+			my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => 'text/css; charset=utf-8');
 			[200, \@headers, [development ? $css : CSS::Minifier::XS::minify $css]]
 		},
 
 		sub (/js.js) {
 			my $js;
 			$js .= read_file $_ for <js/*.js>;
-			my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => 'application/javascript');
+			my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => 'application/javascript; charset=utf-8');
 			[200, \@headers, [development ? $js : JavaScript::Minifier::XS::minify $js]]
 		},
 
+		sub (/robots.txt) { NOT_FOUND },
+		sub (/favicon.ico) { NOT_FOUND },
+
 		sub (/src/:job) {
 			return NOT_FOUND if !job;
 			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});
+			my @headers = ('X-Forever' => 1, 'Cache-Control' => "$privacy, max-age=604800", 'Content-Type' => CONTENT_TYPES->{job->extension});
 			push @headers, (Vary => 'Authorization') if $private;
 			[200, \@headers, [job->source]]
 		},
@@ -145,9 +148,9 @@ sub dispatch_request{
 				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';
+				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}};
-				[200, ['Content-Type' => 'text/html', @hdrs], [encode 'UTF-8', $ret]]
+				[200, ['Content-Type' => 'text/html; charset=utf-8', @hdrs], [encode 'UTF-8', $ret]]
 			},
 		},
 
@@ -162,7 +165,7 @@ sub dispatch_request{
 		},
 
 		sub (/ed/:contest) {
-			forbid contest->is_running;
+			forbid !contest->is_finished;
 			response ed => 'Editorial of ' . contest->name, db->problem_list(contest => $_{contest}, solution => 1);
 		},
 
@@ -210,7 +213,7 @@ sub dispatch_request{
 
 		sub (/) { redispatch_to '/index' },
 		sub (/favicon.ico) { redirect '/static/favicon.ico' },
-		sub (/:article) { [200, ['Content-Type' => 'text/html', '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=60', 'X-Forever' => 1], [render_article $_{article}, 'en']] }
 	},
 
 	sub (POST) {
@@ -223,7 +226,6 @@ sub dispatch_request{
 			db->users->create({id => $_{username}, name => $_{name}, email => $_{email}, phone => $_{phone}, town => $_{town}, university => $_{university}, country => $_{country}, level => $_{level}});
 			db->user($_{username})->set_passphrase($_{password});
 
-			purge '/us/';
 			reply 'Registered successfully';
 		},
 
@@ -260,7 +262,6 @@ sub dispatch_request{
 				owner => remote_user->id,
 			});
 
-			purge '/log/';
 			[303, [Location => '/log/' . $newjob->id], []]
 		},
 
@@ -278,6 +279,8 @@ website using the following information:
 Username: $_{username}
 Password: <your new password>
 Reset token: $token
+
+The token is valid for 24 hours.
 EOF
 			my $email = Email::Simple->create(
 				header => [
@@ -301,6 +304,7 @@ EOF
 			my $user = db->user($_{username});
 			return reply 'No such user' unless $user;
 			my ($token, $exp) = split ':', $_{token};
+			return reply 'Reset token is expired' if time >= $exp;
 			return reply 'Bad reset token' unless $user->make_reset_hmac($exp) eq $token;
 			$user->set_passphrase($_{password});
 			reply 'Password reset successfully';