X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=app.psgi;h=4fe071941fa0b4f69ec44d7228c8c515c3cdf715;hb=33c62e70ae9ad4afdda494c9550d6adc859cbce4;hp=8d1d1ec9fa39bea51aaa2d79ff309c34fb641f75;hpb=fcc0ac4b3e1add54072e879339d36945bd4ac297;p=plack-app-gruntmaster.git

diff --git a/app.psgi b/app.psgi
index 8d1d1ec..4fe0719 100644
--- a/app.psgi
+++ b/app.psgi
@@ -15,7 +15,8 @@ use constant ACCESSLOG_FORMAT => '%{X-Forwarded-For}i|%h %u "%r" %>s %b "%{Refer
 use constant CONTENT_SECURITY_POLICY => q,default-src 'none'; script-src 'self' www.google-analytics.com; style-src 'self'; img-src 'self' www.google-analytics.com; connect-src 'self',;
 
 $Apache2::AuthzCaps::rootdir = $Apache2::Authen::Passphrase::rootdir;
-my $word = qr,(\w+),a;
+my $word   = qr,(\w+),a;
+my $number = qr,(\d+),a;
 my $db = Gruntmaster::Data->connect('dbi:Pg:');
 
 sub debug {
@@ -26,7 +27,7 @@ sub debug {
 sub some_auth_required {
 	my $r = Plack::Request->new($_[0]);
 	return 1 if $_[0]->{'gruntmaster.reqadmin'} || $r->path eq '/action/passwd' || $r->path eq '/submit';
-	return 1 if $r->path =~ m,^/ct/$word/pb/$word, && time < $db->contest($1)->stop;
+	return 1 if $r->path =~ m,^/pb/$word, && $_[0]->{'gruntmaster.contest'} && time < $db->contest($_[0]->{'gruntmaster.contest'})->stop;
 	''
 }
 
@@ -42,12 +43,22 @@ sub is_problem_private {
 	$prv
 }
 
+sub is_problem_in_contest {
+	my ($pb, $ct) = @_;
+	return 1 if $db->contest_problems->find($ct, $pb);
+	return '' if defined $ct;
+	for my $cp ($db->problem($pb)->contest_problems) {
+		return 1 if $cp->contest->stop <= time;
+	}
+	''
+}
+
 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);
+	return $db->problem($1)->owner->id if m,^/pb/$word, && (is_problem_private $1 || !is_problem_in_contest $1, $env->{'gruntmaster.contest'} ) || $env->{'gruntmaster.problem'} && (is_problem_private $env->{'gruntmaster.problem'} || !is_problem_in_contest $env->{'gruntmaster.problem'}, $env->{'gruntmaster.contest'});
+	return $db->job    ($1)->owner->id if m,^/log/(?:src/)?$number, && ($db->job($1)->private || is_problem_private $db->job($1)->problem->id || $db->job($1)->contest && $db->job($1)->contest->stop > time);
 	''
 }