X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=app.psgi;h=728e144e4cf0b742cf7f22765925419d51f350e1;hb=a8dc218ceb178e05b574deed4090503fa9be3502;hp=7dce99b972bbfd7fe9448ca2ac9172fff6ba5102;hpb=b5885a0b83c28fd6437ba42aa814eec645f92353;p=gruntmaster-page.git

diff --git a/app.psgi b/app.psgi
index 7dce99b..728e144 100644
--- a/app.psgi
+++ b/app.psgi
@@ -12,10 +12,24 @@ 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 => '%{X-Forwarded-For}i %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i"';
 
-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' https://static.mindcoding.ro https://www.google-analytics.com/collect
+referrer origin-when-cross-origin
+script-src https://static.mindcoding.ro/js.js https://www.google-analytics.com/analytics.js
+style-src https://static.mindcoding.ro/css/
+CSP
+	chomp $csp;
+	$csp =~ s/\n/; /gr;
+}
+
+my $db;
 
 tie my %auth, 'Tie::Hash::Expire', {expire_seconds => AUTH_TIMEOUT};
 
@@ -28,6 +42,16 @@ sub authenticate {
 	$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 {
 	my $app = $_[0];
 	sub {
@@ -51,7 +75,7 @@ builder {
 	enable \&add_headers;
 	enable 'Static', path => qr,^/static/,;
 	enable 'Log4perl', category => 'plack';
+	enable \&add_database;
 	enable_if { shift->{HTTP_AUTHORIZATION} } 'Auth::Basic', authenticator => \&authenticate, realm => 'Gruntmaster 6000';
-	enable sub { my $app = $_[0]; sub { $_[0]->{'gruntmaster.dbic'} = $db; $app->($_[0]) } };
 	Plack::App::Gruntmaster->run_if_script
 }