Import some changes from the mindcoding branch

[gruntmaster-page.git] / app.psgi

diff --git a/app.psgi b/app.psgi
index 2e3f6405c7b7848c5ee1e8ffde433430f92e2260..856d82c20baec055ec268114cab49614efaac15e 100644 (file)
--- a/app.psgi
+++ b/app.psgi
@@ -25,17 +25,29 @@ 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 =~ m,/pb/$word/submit$,;
+       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;
        ''
 }
 
+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];
-       return $db->problem($1)->owner if m,^/pb/$word, && $db->problem($1)->private;
-       return $db->job    ($1)->owner if m,^/log/(?:job|src)/$word, && $db->job($1)->private;
-       return $db->contest($1)->owner if m,^/ct/$word/(?:pb|log), && time < $db->contest($1)->start;
-       return $db->job    ($2)->owner if m,^/ct/$word/log/(?:job|src)/$word, && time < $db->contest($1)->stop;
+       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);
        ''
 }
 
@@ -45,7 +57,7 @@ sub require_admin {
                local *__ANON__ = "require_admin_middleware";
                my $env = $_[0];
                my $r = Plack::Request->new($env);
-               $env->{'gruntmaster.reqadmin'} = admin_required $r->path;
+               $env->{'gruntmaster.reqadmin'} = admin_required $r->path, $env;
                $app->($env)
        }
 }
@@ -61,6 +73,7 @@ sub mangle_request {
                        $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);
        }
@@ -90,6 +103,7 @@ sub authenticate {
 
 Log::Log4perl->init('log.conf');
 my $access_logger = Log::Log4perl->get_logger('access');
+$ENV{DBIC_NULLABLE_KEY_NOWARN} = 1;
 
 builder {
        enable_if { $_[0]->{PATH_INFO} eq '/ok' } sub { sub{ [200, [], []] }};
@@ -99,9 +113,9 @@ 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 \&mangle_request;
        enable sub { my $app = $_[0]; sub { $_[0]->{'gruntmaster.dbic'} = $db; $app->($_[0]) } };
        Plack::App::Gruntmaster->to_app
 }