Prepare for Dancer2 port

[gruntmaster-page.git] / app.psgi

diff --git a/app.psgi b/app.psgi
index b657a9abcd09cd6d0655faaf3be4ae93931d2504..0d58450a91b44c977b7a761bd1f483af2e9df98a 100644 (file)
--- 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/;
@@ -24,31 +25,11 @@ 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 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;
-       ''
-}
-
-sub require_admin {
-       my $app = $_[0];
-       sub {
-               local *__ANON__ = "require_admin_middleware";
-               my $env = $_[0];
-               my $r = Plack::Request->new($env);
-               $env->{'gruntmaster.reqadmin'} = admin_required $r->path;
-               $app->($env)
-       }
-}
-
 my %authen_cache;
 
 sub authenticate {
@@ -73,6 +54,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, [], []] }};
@@ -82,7 +64,6 @@ 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