X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=app.psgi;h=d9d42bfcf2127e1e9c4c46db1433a119ec922cf2;hb=600e4c01f0fc265a61aea2830c26ed2bd6d77c73;hp=a661a3155e7591044fe704028481788aa6c79c51;hpb=2e2be9fd67d19611a43a37f39d4bb720f4357cf3;p=gruntmaster-page.git

diff --git a/app.psgi b/app.psgi
index a661a31..d9d42bf 100644
--- a/app.psgi
+++ b/app.psgi
@@ -12,7 +12,7 @@ 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',;
+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'; frame-src 'free.timeanddate.com',;
 
 $Apache2::AuthzCaps::rootdir = $Apache2::Authen::Passphrase::rootdir;
 my $word = qr,(\w+),a;
@@ -30,55 +30,6 @@ sub some_auth_required {
 	''
 }
 
-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];
-	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);
-	''
-}
-
-sub require_admin {
-	my $app = $_[0];
-	sub {
-		local *__ANON__ = "require_admin_middleware";
-		my $env = $_[0];
-		my $r = Plack::Request->new($env);
-		$env->{'gruntmaster.reqadmin'} = admin_required $r->path, $env;
-		$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 {
@@ -113,8 +64,6 @@ 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 sub { my $app = $_[0]; sub { $_[0]->{'gruntmaster.dbic'} = $db; $app->($_[0]) } };
 	Plack::App::Gruntmaster->to_app