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

diff --git a/app.psgi b/app.psgi
index 9908172..f975385 100644
--- a/app.psgi
+++ b/app.psgi
@@ -24,25 +24,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 $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_owner $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_owner $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)
 	}
 }
@@ -65,7 +69,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
 }