X-Git-Url: http://git.ieval.ro/?p=plack-app-gruntmaster.git;a=blobdiff_plain;f=app.psgi;h=3a6be219ec8fe3f4a5a53a714247e9a8dbdcfa22;hp=85e8847a44e8b7420e8cefca46ec862075f06cfe;hb=1f64ef28e31c592b91d5d75850229e01e7f89b84;hpb=be1da3f93234c402d5679e6028ae8a2bb915185a

diff --git a/app.psgi b/app.psgi
index 85e8847..3a6be21 100644
--- a/app.psgi
+++ b/app.psgi
@@ -1,18 +1,12 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 use v5.14;
-no if $] >= 5.017011, warnings => 'experimental::smartmatch';
+use warnings;
 
 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 => 'combined';
 
 sub CONTENT_SECURITY_POLICY () {
 	my $csp = <<CSP;
@@ -29,26 +23,14 @@ CSP
 	$csp =~ s/\n/; /gr;
 }
 
-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;
-}
+my $dbinit;
 
 sub add_database {
 	my $app = $_[0];
 	sub {
-		my ($env) = @_;
-		$db //= Gruntmaster::Data->connect($ENV{GRUNTMASTER_DSN} // 'dbi:Pg:');
-		$env->{'gruntmaster.dbic'} = $db;
-		$app->($env)
+		Gruntmaster::Data::init $ENV{GRUNTMASTER_DSN} // 'dbi:Pg:' unless $dbinit;
+		$dbinit = 1;
+		$app->(@_)
 	}
 }
 
@@ -65,17 +47,18 @@ sub add_headers {
 }
 
 Log::Log4perl->init_once('log.conf');
-my $access_logger = Log::Log4perl->get_logger('access');
 $ENV{DBIC_NULLABLE_KEY_NOWARN} = 1;
 
 builder {
 	enable_if { $_[0]->{PATH_INFO} eq '/ok' } sub { sub{ [200, [], []] }};
-	enable 'AccessLog', format => ACCESSLOG_FORMAT, logger => sub { $access_logger->info(@_) };
 	enable 'ContentLength';
 	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 '+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
 }