From: Marius Gavrilescu <marius@ieval.ro>
Date: Wed, 25 Feb 2015 20:28:54 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=f2ea44d7760ab1a725cac836fff9e7cd5c893700;hp=750b40cb7cf4c9dbf2b85c18e3d0db172441facd;p=plack-app-gruntmaster.git

Merge branch 'master' into newmc

Conflicts:
	app.psgi
---

diff --git a/app.psgi b/app.psgi
index 42be500..ab5ca00 100644
--- a/app.psgi
+++ b/app.psgi
@@ -13,7 +13,21 @@ use Tie::Hash::Expire;
 
 use constant AUTH_TIMEOUT => 5 * 60;
 use constant ACCESSLOG_FORMAT => '%{X-Forwarded-For}i %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i"';
-use constant CONTENT_SECURITY_POLICY => q,default-src 'none'; script-src 'self' static.mindcoding.ro www.google-analytics.com; style-src 'self' static.mindcoding.ro; img-src 'self' static.mindcoding.ro www.google-analytics.com; connect-src 'self',;
+
+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 'self' https://static.mindcoding.ro/js.js https://www.google-analytics.com/analytics.js
+style-src 'self' https://static.mindcoding.ro/css/
+CSP
+	chomp $csp;
+	$csp =~ s/\n/; /gr;
+}
 
 our $db //= Gruntmaster::Data->connect($ENV{GRUNTMASTER_DSN} // 'dbi:Pg:');