From: Marius Gavrilescu <marius@ieval.ro>
Date: Sat, 26 Apr 2014 07:20:51 +0000 (+0300)
Subject: Prepare for Dancer2 port
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=e03e380bb1f61aca398e88f863514e4a937c12ce;p=gruntmaster-page.git

Prepare for Dancer2 port
---

diff --git a/app.psgi b/app.psgi
index 856d82c..0d58450 100644
--- a/app.psgi
+++ b/app.psgi
@@ -30,55 +30,6 @@ sub some_auth_required {
 	''
 }
 
-sub is_problem_private {
-	my $pb = $_[0];
-	return 1 if $db->problem($pb)->private;
-	my $prv = 0;
-	for my $cp ($db->problem($pb)->contest_problems) {
-		$prv = 1;
-		return '' if $cp->contest->start <= time;
-	}
-
-	$prv
-}
-
-sub admin_required {
-	local $_ = $_[0];
-	my $env = $_[1];
-	return $db->contest($env->{'gruntmaster.contest'})->owner->id if $env->{'gruntmaster.contest'} && $db->contest($env->{'gruntmaster.contest'})->start > time;
-	return $db->problem($1)->owner->id if m,^/pb/$word, && is_problem_private $1 || $env->{'gruntmaster.problem'} && is_problem_private $env->{'gruntmaster.problem'};
-	return $db->job    ($1)->owner->id if m,^/log/(?:src/)?$word, && ($db->job($1)->private || is_problem_private $db->job($1)->problem->id || $db->job($1)->contest && $db->contest($db->job($1)->contest)->start > time);
-	''
-}
-
-sub require_admin {
-	my $app = $_[0];
-	sub {
-		local *__ANON__ = "require_admin_middleware";
-		my $env = $_[0];
-		my $r = Plack::Request->new($env);
-		$env->{'gruntmaster.reqadmin'} = admin_required $r->path, $env;
-		$app->($env)
-	}
-}
-
-sub mangle_request {
-	my $app = $_[0];
-	sub {
-		local *__ANON__ = 'mangle_request_middleware';
-		my $env = $_[0];
-		my ($number, $word) = (qr,(\d+),a, qr,(\w+),a);
-		for ($env->{PATH_INFO}) {
-			$env->{'gruntmaster.page'}    = $1 if s,/page/$number$,/,;
-			$env->{'gruntmaster.problem'} = $1 if s,^/pb/$word/,/,;
-			$env->{'gruntmaster.contest'} = $1 if s,^/ct/$word/,/,;
-			$env->{'gruntmaster.user'}    = $1 if s,^/us/$word/,/,;
-			$env->{'gruntmaster.page'}  //= -1 if m,^/log/$,;
-		}
-		$app->($env);
-	}
-}
-
 my %authen_cache;
 
 sub authenticate {
@@ -113,8 +64,6 @@ builder {
 	enable_if { $_[0]->{PATH_INFO} =~ qr,^/static/,} Header => set => ['Cache-Control', 'public, max-age=604800'];
 	enable 'Static', path => qr,^/static/,;
 	enable 'Log4perl', category => 'plack';
-	enable \&mangle_request;
-	enable \&require_admin;
 	enable_if \&some_auth_required, 'Auth::Basic', authenticator => \&authenticate, realm => 'Gruntmaster 6000';
 	enable sub { my $app = $_[0]; sub { $_[0]->{'gruntmaster.dbic'} = $db; $app->($_[0]) } };
 	Plack::App::Gruntmaster->to_app
diff --git a/lib/Gruntmaster/Page/CSS.pm b/lib/Gruntmaster/Page/CSS.pm
deleted file mode 100644
index 912e948..0000000
--- a/lib/Gruntmaster/Page/CSS.pm
+++ /dev/null
@@ -1,15 +0,0 @@
-package Gruntmaster::Page::CSS;
-
-use Gruntmaster::Page::Base;
-use CSS::Minifier::XS qw/minify/;
-
-sub generate{
-	my ($self, $format, $env, $theme) = @_;
-	debug $env => "theme is $theme";
-	return [404, ['Content-Type' => 'text/plain'], [ 'Not found' ]] unless -e "css/themes/$theme.css";
-	my $css = read_file "css/themes/$theme.css";
-	$css .= read_file $_ for <css/*.css>;
-	[200, ['Content-Type' => 'text/css', 'Cache-Control' => 'public, max-age=604800', 'X-Forever' => 1], [minify $css] ]
-}
-
-1
diff --git a/lib/Gruntmaster/Page/JS.pm b/lib/Gruntmaster/Page/JS.pm
deleted file mode 100644
index f51000e..0000000
--- a/lib/Gruntmaster/Page/JS.pm
+++ /dev/null
@@ -1,14 +0,0 @@
-package Gruntmaster::Page::JS;
-
-use Gruntmaster::Page::Base;
-use JavaScript::Minifier::XS qw/minify/;
-
-sub generate{
-	my ($self, $format, $env) = @_;
-	debug $env => "";
-	my $js;
-	$js .= read_file $_ for <js/*.js>;
-	[200, ['Content-Type' => 'application/javascript', 'Cache-Control' => 'public, max-age=604800', 'X-Forever' => 1], [minify $js] ]
-}
-
-1
diff --git a/lib/Gruntmaster/Page/Passwd.pm b/lib/Gruntmaster/Page/Passwd.pm
deleted file mode 100644
index 3a7522e..0000000
--- a/lib/Gruntmaster/Page/Passwd.pm
+++ /dev/null
@@ -1,18 +0,0 @@
-package Gruntmaster::Page::Passwd;
-
-use Gruntmaster::Page::Base;
-use Apache2::Authen::Passphrase qw/pwcheck pwset/;
-
-sub generate{
-	my ($self, $format, $env) = @_;
-	my $r = Plack::Request->new($env);
-	my ($oldpass, $newpass, $confirm) = map {scalar $r->param($_)} 'password', 'new_password', 'confirm_new_password';
-
-	return reply 'Incorrect password' unless eval { pwcheck $r->user, $oldpass; 1 };
-	return reply 'The two passwords do not match' unless $newpass eq $confirm;
-
-	pwset $r->user, $newpass;
-	reply 'Password changed successfully';
-}
-
-1
diff --git a/lib/Gruntmaster/Page/Src.pm b/lib/Gruntmaster/Page/Src.pm
deleted file mode 100644
index 4fc2550..0000000
--- a/lib/Gruntmaster/Page/Src.pm
+++ /dev/null
@@ -1,22 +0,0 @@
-package Gruntmaster::Page::Src;
-
-use Gruntmaster::Page::Base;
-
-use constant CONTENT_TYPES => +{
-	c => 'text/x-csrc',
-	cpp => 'text/x-c++src',
-	cs => 'text/x-chsarp', # Used by GNOME. Not in mime.types.
-	java => 'text/x-java',
-	pas => 'text/x-pascal',
-	pl => 'text/x-perl',
-	py => 'text/x-python',
-};
-
-sub generate{
-	my ($self, $format, $env, $job, $ext) = @_;
-	debug $env => "Job is $job and extension is $ext";
-
-	[200, ['Content-Type' => CONTENT_TYPES->{$ext}, 'Cache-Control' => 'max-age=604800', 'X-Forever' => 1], [db($env)->job($job)->source] ]
-}
-
-1
diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index e009d79..8c8875d 100644
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -7,8 +7,11 @@ use parent qw/Plack::Component/;
 no if $] >= 5.017011, warnings => 'experimental::smartmatch';
 our $VERSION = '5999.000_001';
 
+use Apache2::Authen::Passphrase qw/pwcheck pwset/;
+use CSS::Minifier::XS;
 use File::Slurp qw/read_file/;
 use HTTP::Negotiate qw/choose/;
+use JavaScript::Minifier::XS;
 use Plack::Request;
 use Gruntmaster::Page::Generic;
 
@@ -22,8 +25,7 @@ sub call {
 		my ($re, $obj) = @$handler;
 		my @args;
 		next unless @args = $r->path =~ m/^$re$/a;
-		my $format = choose $obj->variants, $r->headers;
-		return $obj->generate($format, $env, map { $_ // '' } @args);
+		return $obj->($env, map { $_ // '' } @args);
 	}
 
 	if ($r->method eq 'GET' || $r->method eq 'HEAD') {
@@ -43,46 +45,181 @@ sub call {
 	[404, ['Content-Type' => 'text/plain'], ['Not found']]
 }
 
-sub get  {
-	my ($re, $obj) = @_;
-	eval "require Gruntmaster::Page::$obj" or die $@;
-	push @{$handlers{GET }}, [ $re, "Gruntmaster::Page::$obj" ]
-}
+sub get  { push @{$handlers{GET }}, [ @_ ] }
+sub post { push @{$handlers{POST}}, [ @_ ] }
+sub db   { $_[0]->{'gruntmaster.dbic'} }
+sub reply { [200, ['Content-Type' => 'text/plain', 'Cache-Control' => 'no-cache'], [ @_ ] ] }
+sub admin { 0 }
 
-sub post {
-	my ($re, $obj) = @_;
-	eval "require Gruntmaster::Page::$obj" or die $@;
-	push @{$handlers{POST}}, [ $re, "Gruntmaster::Page::$obj" ]
+sub old_handler {
+	my ($pkg) = @_;
+	$pkg = "Gruntmaster::Page::$pkg";
+	eval "require $pkg" or die $@;
+	sub {
+		my ($env, @args) = @_;
+		my $format = choose $pkg->variants, Plack::Request->new($env)->headers;
+		$pkg->generate($format, $env, @args)
+	}
 }
 
+use constant CONTENT_TYPES => +{
+	c => 'text/x-csrc',
+	cpp => 'text/x-c++src',
+	cs => 'text/x-csharp', # Used by GNOME. Not in mime.types.
+	java => 'text/x-java',
+	pas => 'text/x-pascal',
+	pl => 'text/x-perl',
+	py => 'text/x-python',
+};
+use constant NOT_FOUND => [404, ['Content-Type' => 'text/plain'], ['Not found']];
+use constant FORBIDDEN => [403, ['Content-Type' => 'text/plain'], ['Forbidden']];
+
 BEGIN{
 	my $word   = qr,(\w+),a;
 	my $number = qr,(\d+),a;
 
-	sub generic {
-		for my $thing (@_) {
-			my $pkg = ucfirst $thing;
-			get  qr,/$thing/,             => $pkg;
-			get  qr,/$thing/read,         => "${pkg}::Read";
-			get  qr,/$thing/$word,        => "${pkg}::Entry";
-#			post qr,/$thing/$word/create, => "${pkg}::Entry::Create";
-			get  qr,/$thing/$word/read,   => "${pkg}::Entry::Read";
-#			post qr,/$thing/$word/update, => "${pkg}::Entry::Update";
-#			post qr,/$thing/$word/delete, => "${pkg}::Entry::Delete";
-		}
-	}
+	get qr,/css/$word\.css, => sub {
+		my ($env, $theme) = @_;
+		return [404, ['Content-Type' => 'text/plain'], [ 'Not found' ]] unless -e "css/themes/$theme.css";
+		my $css = read_file "css/themes/$theme.css";
+		$css .= read_file $_ for <css/*.css>;
+		[200, ['Content-Type' => 'text/css', 'Cache-Control' => 'public, max-age=604800', 'X-Forever' => 1], [CSS::Minifier::XS::minify $css] ]
+	};
+
+	get qr,/js\.js, => sub {
+		my $js;
+		$js .= read_file $_ for <js/*.js>;
+		[200, ['Content-Type' => 'application/javascript', 'Cache-Control' => 'public, max-age=604800', 'X-Forever' => 1], [JavaScript::Minifier::XS::minify $js] ]
+	};
+
+	get qr,/log/src/$number\.$word, => sub {
+		my ($env, $job, $ext) = @_;
+		$job = db($env)->job($job);
+		return NOT_FOUND if $job->contest;
+		return FORBIDDEN if !admin && ($job->private || $job->problem->private);
+		[200, ['Content-Type' => CONTENT_TYPES->{$ext}, 'Cache-Control' => 'max-age=604800', 'X-Forever' => 1], [$job->source] ]
+	};
+
+	get qr,/ct/$word/log/src/$number\.$word, => sub {
+		my ($env, $ct, $job, $ext) = @_;
+		$job = db($env)->job($job);
+		$ct = db($env)->contest($ct);
+		return NOT_FOUND if $job->contest->id ne $ct->id;
+		return FORBIDDEN if !admin && ($job->private || !$ct->is_finished);
+		[200, ['Content-Type' => CONTENT_TYPES->{$ext}, 'Cache-Control' => 'max-age=604800', 'X-Forever' => 1], [$job->source] ]
+	};
+
+	get qr,/ct/$word/log/st, => sub {
+		my($env, $ct) = @_;
+		$env->{'gruntmaster.contest'} = $ct;
+		old_handler('St')->($env);
+	};
+
+	get qr,/us/, => old_handler 'Us';
+	get qr,/us/$word, => old_handler 'Us::Entry';
+
+	get qr,/pb/, => old_handler 'Pb';
+
+	get qr,/us/$word/pb/, => sub {
+		my ($env, $us) = @_;
+		$env->{'gruntmaster.user'} = $us;
+		old_handler('Pb')->($env);
+	};
+
+	get qr,/ct/$word/pb/, => sub {
+		my ($env, $ct) = @_;
+		return FORBIDDEN if !admin && db($env)->contest($ct)->is_pending;
+		$env->{'gruntmaster.contest'} = $ct;
+		old_handler('Pb')->($env);
+	};
+
+	get qr,/pb/$word, => sub {
+		my ($env, $pb) = @_;
+		return NOT_FOUND if !db($env)->problem($pb)->is_in_archive;
+		return FORBIDDEN if !admin && db($env)->problem($pb)->private;
+		old_handler('Pb::Entry')->(@_);
+	};
+
+	get qr,/ct/$word/pb/$word, => sub{
+		my ($env, $ct, $pb) = @_;
+		return NOT_FOUND if !db($env)->contest_problems->find($ct, $pb);
+		return FORBIDDEN if !admin && db($env)->contest($ct)->is_pending;
+		$env->{'gruntmaster.contest'} = $ct;
+		old_handler('Pb::Entry')->($env, $pb);
+	};
+
+	post qr,/pb/$word/submit, => sub {
+		my ($env, $pb) = @_;
+		return NOT_FOUND if !db($env)->problem($pb)->is_in_archive;
+		old_handler('Submit')->($env, $pb);
+	};
+
+	post qr,/ct/$word/pb/$word/submit, => sub {
+		my ($env, $ct, $pb) = @_;
+		return NOT_FOUND if !db($env)->contest_problems->find($ct, $pb);
+		return FORBIDDEN if !admin && db($env)->contest($ct)->is_pending;
+		$env->{'gruntmaster.contest'} = $ct;
+		old_handler('Submit')->($env, $pb);
+	};
+
+	get qr,/log/(?:page-$number)?, => sub {
+		my ($env, $page) = @_;
+		$env->{'gruntmaster.page'} = $page || -1;
+		old_handler('Log')->($env)
+	};
+
+	get qr,/ct/$word/log/(?:page-$number)?, => sub {
+		my ($env, $ct, $page) = @_;
+		return FORBIDDEN if !admin && db($env)->contest($ct)->is_pending;
+		$env->{'gruntmaster.contest'} = $ct;
+		$env->{'gruntmaster.page'} = $page || -1;
+		old_handler('Log')->($env)
+	};
+
+	get qr,/pb/$word/log/(?:page-$number)?, => sub {
+		my ($env, $pb, $page) = @_;
+		#return FORBIDDEN if !admin && db($pb)-> TODO
+		$env->{'gruntmaster.problem'} = $pb;
+		$env->{'gruntmaster.page'} = $page || -1;
+		old_handler('Log')->($env)
+	};
+
+	get qr,/us/$word/log/(?:page-$number)?, => sub {
+		my ($env, $us, $page) = @_;
+		$env->{'gruntmaster.user'} = $us;
+		$env->{'gruntmaster.page'} = $page || -1;
+		old_handler('Log')->($env);
+	};
+
+	get qr,/log/$number, => sub{
+		my ($env, $job) = @_;
+		my $j = db($env)->job($job);
+		return FORBIDDEN if !admin && ($j->private || $j->problem->private || ($j->contest && !$j->contest->is_finished));
+		old_handler('Log::Entry')->($env, $job);
+	};
+
+	get qr,/ct/, => old_handler 'Ct';
+
+	get qr,/ct/$word, => sub {
+		my ($env, $ct) = @_;
+		return FORBIDDEN if !admin && db($env)->contest($ct)->is_pending;
+		old_handler('Ct::Entry')->($env, $ct);
+	};
+
+	post qr,/action/passwd, => sub {
+		my ($env) = @_;
+		my $r = Plack::Request->new($env);
+		my ($oldpass, $newpass, $confirm) = map {scalar $r->param($_)} 'password', 'new_password', 'confirm_new_password';
 
-	get qr,/css/$word\.css, => 'CSS';
-	get qr,/js\.js, => 'JS';
+		return reply 'Incorrect password' unless eval { pwcheck $r->user, $oldpass; 1 };
+		return reply 'The two passwords do not match' unless $newpass eq $confirm;
 
-	get qr,/log/st, => 'St';
-	generic qw/us ct pb log/;
+		pwset $r->user, $newpass;
+		reply 'Password changed successfully';
+	};
 
-	get qr,/log/src/$number\.$word, => 'Src';
-	post qr,/submit, => 'Submit';
+	post qr,/action/register, => old_handler 'Register';
 
-	post qr,/action/register, => 'Register';
-	post qr,/action/passwd, => 'Passwd';
 }
 
 1;
diff --git a/tmpl/log.en b/tmpl/log.en
index f2c7983..14f6a89 100644
--- a/tmpl/log.en
+++ b/tmpl/log.en
@@ -12,6 +12,6 @@
 </table>
 
 <ul class="pager">
-<%perl if (__CURRENT__->{page} > 1) { %><li class="previous"><a href="<%perl __OUT__ __CURRENT__->{page} - 1; %>">Previous</a><%perl } %>
-<%perl if (__CURRENT__->{page} < __CURRENT__->{pages} - 1) { %><li class="next"><a href="<%perl __OUT__ __CURRENT__->{page} + 1; %>">Next</a><%perl } %>
+<%perl if (__CURRENT__->{page} > 1) { %><li class="previous"><a href="page-<%perl __OUT__ __CURRENT__->{page} - 1; %>">Previous</a><%perl } %>
+<%perl if (__CURRENT__->{page} < __CURRENT__->{pages} - 1) { %><li class="next"><a href="page-<%perl __OUT__ __CURRENT__->{page} + 1; %>">Next</a><%perl } %>
 </ul>