X-Git-Url: http://git.ieval.ro/?p=gruntmaster-page.git;a=blobdiff_plain;f=app.psgi;h=927653e4212324118578bf9ed9f86409c56965e4;hp=d9d42bfcf2127e1e9c4c46db1433a119ec922cf2;hb=594d53ba258320b2b98ec4413a808366237f5e40;hpb=600e4c01f0fc265a61aea2830c26ed2bd6d77c73

diff --git a/app.psgi b/app.psgi
index d9d42bf..927653e 100644
--- a/app.psgi
+++ b/app.psgi
@@ -2,54 +2,30 @@
 use v5.14;
 no if $] >= 5.017011, warnings => 'experimental::smartmatch';
 
-use Apache2::Authen::Passphrase qw/pwcheck/;
-use Apache2::AuthzCaps qw/hascaps/;
 use Gruntmaster::Data;
 use Plack::App::Gruntmaster;
 use Plack::Builder;
 use Plack::Request;
 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',;
 
-$Apache2::AuthzCaps::rootdir = $Apache2::Authen::Passphrase::rootdir;
-my $word = qr,(\w+),a;
 my $db = Gruntmaster::Data->connect('dbi:Pg:');
 
-sub debug {
-	local $Log::Log4perl::caller_depth = $Log::Log4perl::caller_depth + 1;
-	$_[0]->{'psgix.logger'}->({qw/level debug message/ => $_[1]})
-}
-
-sub some_auth_required {
-	my $r = Plack::Request->new($_[0]);
-	return 1 if $_[0]->{'gruntmaster.reqadmin'} || $r->path eq '/action/passwd' || $r->path eq '/submit';
-	return 1 if $r->path =~ m,^/ct/$word/pb/$word, && time < $db->contest($1)->stop;
-	''
-}
-
-my %authen_cache;
+tie my %auth, 'Tie::Hash::Expire', {expire_seconds => 300};
 
 sub authenticate {
 	my ($user, $pass, $env) = @_;
-	my $cache_key = sha256 "$user:$pass";
-	my $time = $authen_cache{$cache_key} // 0;
-	if ($time >= time - 300) {
-		return 1;
-	} else {
-		delete $authen_cache{$cache_key};
-	}
-
-	return unless eval {
-		pwcheck $user, $pass;
-		1
-	};
-	$authen_cache{$cache_key} = time;
-
-	return if $env->{'gruntmaster.reqadmin'} && $env->{'gruntmaster.reqadmin'} ne $user && !hascaps $user, 'gmadm';
-	1
+	say "Checking $user and $pass";
+	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;
 }
 
 Log::Log4perl->init('log.conf');
@@ -57,14 +33,14 @@ 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 Header => set => ['Content-Security-Policy', CONTENT_SECURITY_POLICY];
 	enable_if { $_[0]->{PATH_INFO} =~ qr,^/static/,} Header => set => ['Cache-Control', 'public, max-age=604800'];
 	enable 'Static', path => qr,^/static/,;
 	enable 'Log4perl', category => 'plack';
-	enable_if \&some_auth_required, 'Auth::Basic', authenticator => \&authenticate, realm => 'Gruntmaster 6000';
+	enable_if { shift->{HTTP_WWW_AUTHENTICATE} } '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->to_app
+	Plack::App::Gruntmaster->run_if_script
 }