X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=app.psgi;h=4f4526b594754b201bd01c2ce5616a7dd1417c04;hb=d9f11916894f292e95891470bd43b513c1c5a1bc;hp=b1bd530dffa5fb4db7bb074a0005b5bb8a757921;hpb=37bc8c4416b152ad3ab5e0c6e9e24b1f94848295;p=gruntmaster-page.git

diff --git a/app.psgi b/app.psgi
index b1bd530..4f4526b 100644
--- a/app.psgi
+++ b/app.psgi
@@ -8,6 +8,10 @@ use Plack::App::Gruntmaster;
 use Plack::Builder;
 use Plack::Request;
 use Digest::SHA qw/sha256/;
+use Log::Log4perl;
+
+use constant ACCESSLOG_FORMAT => '%{X-Forwarded-For}i|%h %u "%r" %>s %b "%{Referer}i" "%{User-agent}i"';
+use constant CONTENT_SECURITY_POLICY => q,default-src 'none'; script-src 'self' www.google-analytics.com; style-src 'self'; img-src 'self'; connect-src 'self',;
 
 $Apache2::AuthzCaps::rootdir = $Apache2::Authen::Passphrase::rootdir;
 my $word = qr,(\w+),a;
@@ -20,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_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)
 	}
 }
@@ -61,15 +69,21 @@ 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');
+
 builder {
+	enable_if { $_[0]->{PATH_INFO} eq '/ok' } sub { sub{ [200, [], []] }};
+	enable 'AccessLog', format => ACCESSLOG_FORMAT, logger => sub { $access_logger->info(@_) };
 	enable 'ContentLength';
+	enable Header => set => ['Content-Security-Policy', CONTENT_SECURITY_POLICY];
 	enable_if { $_[0]->{PATH_INFO} =~ qr,^/static/,} Header => set => ['Cache-Control', 'public, max-age=604800'];
 	enable 'Static', path => qr,^/static/,;
-	enable 'Log4perl', category => 'plack', conf => 'log.conf';
+	enable 'Log4perl', category => 'plack';
 	enable \&require_admin;
 	enable_if \&some_auth_required, 'Auth::Basic', authenticator => \&authenticate, realm => 'Gruntmaster 6000';
 	Plack::App::Gruntmaster->to_app