Fix standings and contest logs

[gruntmaster-page.git] / app.psgi

diff --git a/app.psgi b/app.psgi
index 0222a168b80d395e95aaeeaf54f470459df90988..de07be799a9cac8c3e6cc5014ef95ef2b5ce49cc 100644 (file)
--- a/app.psgi
+++ b/app.psgi
@@ -12,10 +12,11 @@ use Digest::SHA qw/sha256/;
 use Log::Log4perl;
 
 use constant ACCESSLOG_FORMAT => '%{X-Forwarded-For}i|%h %u "%r" %>s %b "%{Referer}i" "%{User-agent}i"';
-use constant CONTENT_SECURITY_POLICY => q,default-src 'none'; script-src 'self' www.google-analytics.com; style-src 'self'; img-src 'self'; connect-src 'self',;
+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 {
@@ -45,9 +46,9 @@ sub is_problem_private {
 sub admin_required {
        local $_ = $_[0];
        my $env = $_[1];
-       return $db->contest($1)->owner->id if $env->{'gruntmaster.contest'} && $db->contest($env->{'gruntmaster.contest'})->start > time;
+       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->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)->start > time);
        ''
 }
 
@@ -70,8 +71,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/$,;
                }