Update logos

[gruntmaster-page.git] / app.psgi

diff --git a/app.psgi b/app.psgi
index 72558f139fff16a6e2514074d1cbf22d8ebf1ae1..45f746696087a41c88f558137d7d3ba8a04da040 100644 (file)
--- 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,27 @@ 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 '' if $cp->contest->stop >= time;
+       }
+       1
+}
+
 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;
+       return $db->problem($1)->owner->id if m,^/pb/$word, && !is_problem_in_contest $1, $env->{'gruntmaster.contest'};
+       return $db->problem($env->{'gruntmaster.problem'}) if $env->{'gruntmaster.problem'} && is_problem_private $env->{'gruntmaster.problem'};
+       return $db->problem($env->{'gruntmaster.problem'}) if $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;
+       return $db->job    ($1)->owner->id if m,^/log/(?:src/)?$number, && is_problem_private $db->job($1)->problem->id;
+       return $db->job    ($1)->owner->id if m,^/log/(?:src/)?$number, && $db->job($1)->contest && $db->job($1)->contest->stop > time;
        ''
 }
 
@@ -70,8 +86,8 @@ sub mangle_request {
                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.problem'} = $1 if s,^/pb/$word/,/,;
                        $env->{'gruntmaster.user'}    = $1 if s,^/us/$word/,/,;
                        $env->{'gruntmaster.page'}  //= -1 if m,^/log/$,;
                }