X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=app.psgi;h=0d58450a91b44c977b7a761bd1f483af2e9df98a;hb=e03e380bb1f61aca398e88f863514e4a937c12ce;hp=62a6f790815f47cbac9fa032b6fce550314c392e;hpb=acef92e8dd279c526d98f61408f5d7f326348eab;p=gruntmaster-page.git

diff --git a/app.psgi b/app.psgi
index 62a6f79..0d58450 100644
--- a/app.psgi
+++ b/app.psgi
@@ -1,5 +1,6 @@
 #!/usr/bin/perl -w
 use v5.14;
+no if $] >= 5.017011, warnings => 'experimental::smartmatch';
 
 use Apache2::Authen::Passphrase qw/pwcheck/;
 use Apache2::AuthzCaps qw/hascaps/;
@@ -15,6 +16,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;
@@ -23,29 +25,9 @@ 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
-}
-
-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
-}
-
-sub require_admin {
-	my $app = $_[0];
-	sub {
-		local *__ANON__ = "require_admin_middleware";
-		my $env = $_[0];
-		my $r = Plack::Request->new($env);
-		$env->{'gruntmaster.reqadmin'} = 1 if admin_required $r->path;
-		$app->($env)
-	}
+	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;
+	''
 }
 
 my %authen_cache;
@@ -66,12 +48,13 @@ 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
 }
 
 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, [], []] }};
@@ -81,7 +64,7 @@ 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 \&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
 }