X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=app.psgi;h=be72e9b18b9bd2fa4dd7ea7317d41d84a44e035c;hb=e892a76a1aed693d33fba7f0015f42824ecf4dbb;hp=a4e0c34eca7da9c880ec0ee496a8e24e2be310c9;hpb=44397e8ab2732248e68f08ba72172b7055492a44;p=gruntmaster-page.git

diff --git a/app.psgi b/app.psgi
index a4e0c34..be72e9b 100644
--- a/app.psgi
+++ b/app.psgi
@@ -5,11 +5,8 @@ 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 %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i"';
@@ -22,24 +19,23 @@ 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/
+script-src https://static.mindcoding.ro/static/js.js https://www.google-analytics.com/analytics.js
+style-src https://static.mindcoding.ro/static/css/
 CSP
 	chomp $csp;
 	$csp =~ s/\n/; /gr;
 }
 
-our $db //= Gruntmaster::Data->connect($ENV{GRUNTMASTER_DSN} // 'dbi:Pg:');
+my $db;
 
-tie my %auth, 'Tie::Hash::Expire', {expire_seconds => AUTH_TIMEOUT};
-
-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 {
@@ -65,7 +61,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
 }