X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=app.psgi;h=b657a9abcd09cd6d0655faaf3be4ae93931d2504;hb=d3200993969efcd4d9c0ce6a5666a012815ad2d5;hp=9908172efb807320b8562f03bc201b43a6048c40;hpb=1d2cbe7de84c2a13df953866f1fcadfe1b140283;p=gruntmaster-page.git

diff --git a/app.psgi b/app.psgi
index 9908172..b657a9a 100644
--- 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,25 +25,26 @@ 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$,;
-	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 {
 	my $app = $_[0];
 	sub {
-		*__ANON__ = "require_admin_middleware";
+		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)
 	}
 }
@@ -65,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
 }
 
@@ -82,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
 }