X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=app.psgi;h=f7c85ffec3149dbd1bba33486039966bb74dfd92;hb=6d4b4529219434f5d50dd28e17b6bda0e957864d;hp=7dce99b972bbfd7fe9448ca2ac9172fff6ba5102;hpb=b5885a0b83c28fd6437ba42aa814eec645f92353;p=plack-app-gruntmaster.git

diff --git a/app.psgi b/app.psgi
index 7dce99b..f7c85ff 100644
--- a/app.psgi
+++ b/app.psgi
@@ -5,27 +5,37 @@ no if $] >= 5.017011, warnings => 'experimental::smartmatch';
 use Gruntmaster::Data;
 use Plack::App::Gruntmaster;
 use Plack::Builder;
-use Plack::Request;
 use Plack::Util;
-use Digest::SHA qw/sha256/;
 use Log::Log4perl;
-use Tie::Hash::Expire;
 
 use constant AUTH_TIMEOUT => 5 * 60;
-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,;
+use constant ACCESSLOG_FORMAT => 'combined';
 
-our $db //= Gruntmaster::Data->connect($ENV{GRUNTMASTER_DSN} // 'dbi:Pg:');
+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;
+}
 
-tie my %auth, 'Tie::Hash::Expire', {expire_seconds => AUTH_TIMEOUT};
+my $db;
 
-sub authenticate {
-	my ($user, $pass, $env) = @_;
-	my $key = sha256 "$user:$pass";
-	$env->{'gruntmaster.user'} = $user;
-	return 1 if exists $auth{$key};
-	return unless $db->user($user) && $db->user($user)->check_passphrase($pass);
-	$auth{key} = 1;
+sub add_database {
+	my $app = $_[0];
+	sub {
+		my ($env) = @_;
+		$db //= Gruntmaster::Data->connect($ENV{GRUNTMASTER_DSN} // 'dbi:Pg:');
+		$env->{'gruntmaster.dbic'} = $db;
+		$app->($env)
+	}
 }
 
 sub add_headers {
@@ -34,6 +44,7 @@ sub add_headers {
 		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;
@@ -51,7 +62,10 @@ builder {
 	enable \&add_headers;
 	enable 'Static', path => qr,^/static/,;
 	enable 'Log4perl', category => 'plack';
-	enable_if { shift->{HTTP_AUTHORIZATION} } 'Auth::Basic', authenticator => \&authenticate, realm => 'Gruntmaster 6000';
-	enable sub { my $app = $_[0]; sub { $_[0]->{'gruntmaster.dbic'} = $db; $app->($_[0]) } };
+	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
 }