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

diff --git a/app.psgi b/app.psgi
index 5bed878..a612540 100644
--- a/app.psgi
+++ b/app.psgi
@@ -1,64 +1,61 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 use v5.14;
+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;
-
-$Apache2::AuthzCaps::rootdir = $Apache2::Authen::Passphrase::rootdir;
-my $word = qr,(\w+),a;
-
-sub debug {
-	local $Log::Log4perl::caller_depth = $Log::Log4perl::caller_depth + 1;
-	$_[0]->{'psgix.logger'}->({qw/level debug message/ => $_[1]})
+use Plack::Util;
+use Log::Log4perl;
+
+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 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
-}
-
-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
+sub add_database {
+	my $app = $_[0];
+	sub {
+		dbinit $ENV{GRUNTMASTER_DSN} // 'dbi:Pg:' unless db;
+		$app->(@_)
+	}
 }
 
-sub require_admin {
+sub add_headers {
 	my $app = $_[0];
 	sub {
-		*__ANON__ = "require_admin_middleware";
-		my $env = $_[0];
-		my $r = Plack::Request->new($env);
-		$env->{'gruntmaster.reqadmin'} = 1 if admin_required $r->path;
-		$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;
 	}
 }
 
-sub authenticate {
-	my ($user, $pass, $env) = @_;
-	return unless eval {
-		pwcheck $user, $pass;
-		1
-	};
-
-	return if $env->{'gruntmaster.reqadmin'} && !hascaps $user, 'gmadm';
-	1
-}
+Log::Log4perl->init_once('log.conf');
+$ENV{DBIC_NULLABLE_KEY_NOWARN} = 1;
 
 builder {
+	enable_if { $_[0]->{PATH_INFO} eq '/ok' } sub { sub{ [200, [], []] }};
 	enable 'ContentLength';
-	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', conf => 'log.conf';
-	enable \&require_admin;
-	enable_if \&some_auth_required, 'Auth::Basic', authenticator => \&authenticate, realm => 'Gruntmaster 6000';
-	Plack::App::Gruntmaster->to_app
+	enable 'Log4perl', category => 'plack';
+	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
 }