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;
+ return problem_owner $1 if m,^/pb/$word, && problem_private $1;
+ return job_user $1 if m,^/log/(?:job|src)/$word, && job_private $1;
+ return contest_owner $1 if m,^/ct/$word/(?:pb|log), && time < contest_start $1;
+ if (m,^/ct/$word/log/(?:job|src)/$word, && time < contest_end $1){
+ local $Gruntmaster::Data::contest = $1;
+ return job_user $2;
+ }
0
}
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)
}
}
};
$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
}