Fix access to problems again

[gruntmaster-page.git] / app.psgi

diff --git a/app.psgi b/app.psgi
index 6834f2b45fe9a6e64d6a9b108a2dcf62deee3baa..4fe071941fa0b4f69ec44d7228c8c515c3cdf715 100644 (file)
--- a/app.psgi
+++ b/app.psgi
@@ -27,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;
        ''
 }
 
@@ -46,7 +46,10 @@ sub is_problem_private {
 sub is_problem_in_contest {
        my ($pb, $ct) = @_;
        return 1 if $db->contest_problems->find($ct, $pb);
-       return 1 unless defined $ct || $db->contest_problems->count({problem => $pb});
+       return '' if defined $ct;
+       for my $cp ($db->problem($pb)->contest_problems) {
+               return 1 if $cp->contest->stop <= time;
+       }
        ''
 }
 
@@ -54,8 +57,8 @@ 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'} || !is_problem_in_contest $1, $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->contest($db->job($1)->contest)->stop > 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);
        ''
 }