From Redis to Postgres - Part 1 (Getting started)

[gruntmaster-page.git] / app.psgi

diff --git a/app.psgi b/app.psgi
index 62a6f790815f47cbac9fa032b6fce550314c392e..b657a9abcd09cd6d0655faaf3be4ae93931d2504 100644 (file)
--- a/app.psgi
+++ b/app.psgi
@@ -15,6 +15,7 @@ use constant CONTENT_SECURITY_POLICY => q,default-src 'none'; script-src 'self'
 
 $Apache2::AuthzCaps::rootdir = $Apache2::Authen::Passphrase::rootdir;
 my $word = qr,(\w+),a;
+my $db = Gruntmaster::Data->connect('dbi:Pg:');
 
 sub debug {
        local $Log::Log4perl::caller_depth = $Log::Log4perl::caller_depth + 1;
@@ -24,17 +25,17 @@ 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 $r->path =~ m,^/ct/$word/pb/$word, && time < contest_end $1;
-       0
+       return 1 if $r->path =~ m,^/ct/$word/pb/$word, && time < $db->contest($1)->stop;
+       ''
 }
 
 sub admin_required {
        local $_ = $_[0];
-       return 1 if m,^/pb/$word, && problem_private $1;
-       return 1 if m,^/log/(?:job|src)/$word, && job_private $1;
-       return 1 if m,^/ct/$word/(?:pb|log), && time < contest_start $1;
-       return 1 if m,^/ct/$word/log/src, && time < contest_end $1;
-       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;
+       ''
 }
 
 sub require_admin {
@@ -43,7 +44,7 @@ sub require_admin {
                local *__ANON__ = "require_admin_middleware";
                my $env = $_[0];
                my $r = Plack::Request->new($env);
-               $env->{'gruntmaster.reqadmin'} = 1 if admin_required $r->path;
+               $env->{'gruntmaster.reqadmin'} = admin_required $r->path;
                $app->($env)
        }
 }
@@ -66,7 +67,7 @@ sub authenticate {
        };
        $authen_cache{$cache_key} = time;
 
-       return if $env->{'gruntmaster.reqadmin'} && !hascaps $user, 'gmadm';
+       return if $env->{'gruntmaster.reqadmin'} && $env->{'gruntmaster.reqadmin'} ne $user && !hascaps $user, 'gmadm';
        1
 }
 
@@ -83,5 +84,6 @@ builder {
        enable 'Log4perl', category => 'plack';
        enable \&require_admin;
        enable_if \&some_auth_required, 'Auth::Basic', authenticator => \&authenticate, realm => 'Gruntmaster 6000';
+       enable sub { my $app = $_[0]; sub { $_[0]->{'gruntmaster.dbic'} = $db; $app->($_[0]) } };
        Plack::App::Gruntmaster->to_app
 }