X-Git-Url: http://git.ieval.ro/?p=gruntmaster-page.git;a=blobdiff_plain;f=app.psgi;h=a6125407f259fff9c545d8c1e92bdc79596e9cdb;hp=856d82c20baec055ec268114cab49614efaac15e;hb=refs%2Fheads%2Fnodbic;hpb=f4c33eb4f0061f46aab156caf937f5bd0fe0955a

diff --git a/app.psgi b/app.psgi
index 856d82c..a612540 100644
--- a/app.psgi
+++ b/app.psgi
@@ -1,121 +1,61 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 use v5.14;
-no if $] >= 5.017011, warnings => 'experimental::smartmatch';
+use warnings;
 
-use Apache2::Authen::Passphrase qw/pwcheck/;
-use Apache2::AuthzCaps qw/hascaps/;
 use Gruntmaster::Data;
 use Plack::App::Gruntmaster;
 use Plack::Builder;
-use Plack::Request;
-use Digest::SHA qw/sha256/;
+use Plack::Util;
 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;
-	$_[0]->{'psgix.logger'}->({qw/level debug message/ => $_[1]})
-}
-
-sub some_auth_required {
-	my $r = Plack::Request->new($_[0]);
-	return 1 if $_[0]->{'gruntmaster.reqadmin'} || $r->path eq '/action/passwd' || $r->path eq '/submit';
-	return 1 if $r->path =~ m,^/ct/$word/pb/$word, && time < $db->contest($1)->stop;
-	''
-}
-
-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($env->{'gruntmaster.contest'})->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->id || $db->job($1)->contest && $db->contest($db->job($1)->contest)->start > time);
-	''
-}
-
-sub require_admin {
+sub CONTENT_SECURITY_POLICY () {
+	my $csp = <<CSP;
+default-src 'none'
+connect-src 'self'
+form-action 'self'
+frame-ancestors 'none'
+img-src 'self'
+referrer origin-when-cross-origin
+script-src 'self'
+style-src 'self'
+CSP
+	chomp $csp;
+	$csp =~ s/\n/; /gr;
+}
+
+sub add_database {
 	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)
+		dbinit $ENV{GRUNTMASTER_DSN} // 'dbi:Pg:' unless db;
+		$app->(@_)
 	}
 }
 
-sub mangle_request {
+sub add_headers {
 	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 $resp = $app->($_[0]);
+		my $hdrs = Plack::Util::headers($resp->[1]);
+		$hdrs->set('Content-Security-Policy', CONTENT_SECURITY_POLICY);
+		$hdrs->set('Cache-Control', 'public, max-age=604800') if $_[0]->{PATH_INFO} =~ qr,^/static/,;
+		$resp->[1] = $hdrs->headers;
+		$resp;
 	}
 }
 
-my %authen_cache;
-
-sub authenticate {
-	my ($user, $pass, $env) = @_;
-	my $cache_key = sha256 "$user:$pass";
-	my $time = $authen_cache{$cache_key} // 0;
-	if ($time >= time - 300) {
-		return 1;
-	} else {
-		delete $authen_cache{$cache_key};
-	}
-
-	return unless eval {
-		pwcheck $user, $pass;
-		1
-	};
-	$authen_cache{$cache_key} = time;
-
-	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');
+Log::Log4perl->init_once('log.conf');
 $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 \&add_headers;
 	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
+	enable \&add_database;
+	enable '+Plack::App::Gruntmaster::Auth',
+	  dbi_connect => [$ENV{GRUNTMASTER_DSN} // 'dbi:Pg:', '', ''],
+	  realm       => 'Gruntmaster 6000',
+	  mail_from   => $ENV{GRUNTMASTER_RESET_FROM};
+	Plack::App::Gruntmaster->run_if_script
 }