X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=app.psgi;h=2f92d9ac68da1b13cded09d5a2fcaecd5541ad25;hb=58a0ba09590653e5afceb39431f7fa893d26c86f;hp=56022bc727880ff490ff33545981890d1c635c50;hpb=819b82bbd1ade0d09e0b928bc80bb21eec7376d1;p=gruntmaster-page.git

diff --git a/app.psgi b/app.psgi
index 56022bc..2f92d9a 100644
--- 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/;
@@ -11,9 +12,11 @@ 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;
+my $db = Gruntmaster::Data->connect('dbi:Pg:');
 
 sub debug {
 	local $Log::Log4perl::caller_depth = $Log::Log4perl::caller_depth + 1;
@@ -23,29 +26,47 @@ 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$,;
-	0
+	return 1 if $r->path =~ m,^/ct/$word/pb/$word, && time < $db->contest($1)->stop;
+	''
 }
 
 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;
-	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 {
-		*__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)
 	}
 }
 
+sub mangle_request {
+	my $app = $_[0];
+	sub {
+		local *__ANON__ = 'mangle_request_middleware';
+		my $env = $_[0];
+		my ($number, $word) = (qr,(\d+),a, qr,(\w+),a);
+		for ($env->{PATH_INFO}) {
+			$env->{'gruntmaster.page'}    = $1 if s,/page/$number$,/,;
+			$env->{'gruntmaster.problem'} = $1 if s,^/pb/$word/,/,;
+			$env->{'gruntmaster.contest'} = $1 if s,^/ct/$word/,/,;
+			$env->{'gruntmaster.user'}    = $1 if s,^/us/$word/,/,;
+			$env->{'gruntmaster.page'}  //= -1 if m,^/log/$,;
+		}
+		$app->($env);
+	}
+}
+
 my %authen_cache;
 
 sub authenticate {
@@ -64,21 +85,25 @@ 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');
+$ENV{DBIC_NULLABLE_KEY_NOWARN} = 1;
 
 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';
 	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
 }