Merge branch 'master' into gruntmaster

[gruntmaster-page.git] / app.psgi

diff --git a/app.psgi b/app.psgi
index 927653e4212324118578bf9ed9f86409c56965e4..2c264f9bc70fe7bfdd25cbb262642fe8bbc77959 100644 (file)
--- a/app.psgi
+++ b/app.psgi
@@ -6,13 +6,14 @@ 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 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,;
 
 my $db = Gruntmaster::Data->connect('dbi:Pg:');
 
@@ -20,7 +21,6 @@ tie my %auth, 'Tie::Hash::Expire', {expire_seconds => 300};
 
 sub authenticate {
        my ($user, $pass, $env) = @_;
-       say "Checking $user and $pass";
        my $key = sha256 "$user:$pass";
        $env->{'gruntmaster.user'} = $user;
        return 1 if exists $auth{$key};
@@ -28,6 +28,18 @@ sub authenticate {
        $auth{key} = 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('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');
 $ENV{DBIC_NULLABLE_KEY_NOWARN} = 1;
@@ -35,11 +47,10 @@ $ENV{DBIC_NULLABLE_KEY_NOWARN} = 1;
 builder {
        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 { shift->{HTTP_WWW_AUTHENTICATE} } 'Auth::Basic', authenticator => \&authenticate, realm => 'Gruntmaster 6000';
+       enable_if { shift->{HTTP_AUTHORIZATION} } 'Auth::Basic', authenticator => \&authenticate, realm => 'Gruntmaster 6000';
        enable_if { $_[0]->{PATH_INFO} eq '/ok' } sub { sub{ [200, [], []] }};
        enable sub { my $app = $_[0]; sub { $_[0]->{'gruntmaster.dbic'} = $db; $app->($_[0]) } };
        Plack::App::Gruntmaster->run_if_script