X-Git-Url: http://git.ieval.ro/?p=plack-app-gruntmaster.git;a=blobdiff_plain;f=app.psgi;h=8fbc2c01337e9f910105510c77bea4fc6b95bdad;hp=d9d42bfcf2127e1e9c4c46db1433a119ec922cf2;hb=19909af7912808638f003dbd9e8fc5904cf1ae54;hpb=600e4c01f0fc265a61aea2830c26ed2bd6d77c73

diff --git a/app.psgi b/app.psgi
index d9d42bf..8fbc2c0 100644
--- a/app.psgi
+++ b/app.psgi
@@ -1,70 +1,66 @@
-#!/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'; frame-src 'free.timeanddate.com',;
-
-$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 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;
 }
 
-my %authen_cache;
+my $db;
 
-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};
+sub add_database {
+	my $app = $_[0];
+	sub {
+		my ($env) = @_;
+		$db //= Gruntmaster::Data->connect($ENV{GRUNTMASTER_DSN} // 'dbi:Pg:');
+		$env->{'gruntmaster.dbic'} = $db;
+		$app->($env)
 	}
+}
 
-	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
+sub add_headers {
+	my $app = $_[0];
+	sub {
+		my $resp = $app->($_[0]);
+		my $hdrs = Plack::Util::headers($resp->[1]);
+		$hdrs->set('Content-Security-Policy', CONTENT_SECURITY_POLICY);
+		$hdrs->set('Link', '</static/cyborg.css>; rel=stylesheet') if $hdrs->get('Content-Type') =~ m,^text/html,;
+		$hdrs->set('Cache-Control', 'public, max-age=604800') if $_[0]->{PATH_INFO} =~ qr,^/static/,;
+		$resp->[1] = $hdrs->headers;
+		$resp;
+	}
 }
 
-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_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
 }