From 2e2be9fd67d19611a43a37f39d4bb720f4357cf3 Mon Sep 17 00:00:00 2001 From: Marius Gavrilescu Date: Mon, 24 Mar 2014 08:56:23 +0200 Subject: [PATCH] Make admin_required work with new routes --- app.psgi | 26 +++++++++++++++++++------- lib/Gruntmaster/Page/Generic.pm | 3 +-- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/app.psgi b/app.psgi index 2f92d9a..a661a31 100644 --- 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($1)->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 || $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) } } @@ -101,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 } diff --git a/lib/Gruntmaster/Page/Generic.pm b/lib/Gruntmaster/Page/Generic.pm index 36ca445..35d89ad 100644 --- a/lib/Gruntmaster/Page/Generic.pm +++ b/lib/Gruntmaster/Page/Generic.pm @@ -63,8 +63,7 @@ sub entry { my ($thing, $lang, $env, $id) = @_; my %thing = %$thing; debug $env => "Rsname is $thing{rsname} and id is $id"; - $thing{makers} //= sub { db(shift)->resultset($thing{rsname}) }; - my %params = map {+ rs => $_, $_->get_columns } $thing{makers}->($env)->find($id); + my %params = map {+ rs => $_, $_->get_columns } db($env)->resultset($thing{rsname})->find($id); $thing{mangle}->(local $_ = \%params) if exists $thing{mangle}; wantarray ? %params : \%params } -- 2.39.2