X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FPlack%2FMiddleware%2FAuth%2FComplex.pm;h=59d9bc3b8df46972f6fb2d59c5afc081e09fc880;hb=61456017abf30a3c00c25b53ac7ca4c8c90741eb;hp=fe545482597db1e9ed2c1f1e8737b61842c69550;hpb=9d9f40679564ebf365c9e4eaa47c0d2a550b16b4;p=plack-middleware-auth-complex.git

diff --git a/lib/Plack/Middleware/Auth/Complex.pm b/lib/Plack/Middleware/Auth/Complex.pm
index fe54548..59d9bc3 100644
--- a/lib/Plack/Middleware/Auth/Complex.pm
+++ b/lib/Plack/Middleware/Auth/Complex.pm
@@ -4,14 +4,17 @@ use 5.014000;
 use strict;
 use warnings;
 
-our $VERSION = '0.000_001';
-$VERSION = eval $VERSION;  # see L<perlmodstyle>
+our $VERSION = '0.002';
 
 use parent qw/Plack::Middleware/;
+use re '/s';
 
 use Authen::Passphrase;
 use Authen::Passphrase::BlowfishCrypt;
-use Bytes::Random::Secure qw/random_bytes/;
+use Data::Entropy qw/entropy_source/;
+use Data::Entropy::Source;
+use Data::Entropy::RawSource::Local;
+use Carp qw/carp croak/;
 use DBI;
 use Digest::SHA qw/hmac_sha1_base64 sha256/;
 use Email::Simple;
@@ -20,6 +23,18 @@ use MIME::Base64 qw/decode_base64/;
 use Plack::Request;
 use Tie::Hash::Expire;
 
+sub make_entropy_source {
+	if (-e '/dev/urandom') {
+		Data::Entropy::Source->new(
+			Data::Entropy::RawSource::Local->new('/dev/urandom'),
+			'sysread'
+		)
+	} else {
+		carp "/dev/urandom not found, using insecure random source\n";
+		entropy_source
+	}
+}
+
 sub default_opts {(
 	dbi_connect       => ['dbi:Pg:', '', ''],
 	select_user       => 'SELECT passphrase, email FROM users WHERE id = ?',
@@ -30,7 +45,8 @@ sub default_opts {(
 	cache_fail        => 0,
 	cache_max_age     => 5 * 60,
 	token_max_age     => 60 * 60,
-	username_regex    => qr/^\w{2,20}$/a,
+	username_regex    => qr/^\w{2,20}$/as,
+	invalid_username  => 'Invalid username',
 	register_url      => '/action/register',
 	passwd_url        => '/action/passwd',
 	request_reset_url => '/action/request-reset',
@@ -41,35 +57,36 @@ sub new {
 	my ($class, $opts) = @_;
 	my %self = $class->default_opts;
 	%self = (%self, %$opts);
+	$self{entropy_source} //= make_entropy_source;
 	my $self = bless \%self, $class;
-	$self->init;
 	$self
 }
 
 sub init {
 	my ($self) = @_;
-	$self->{dbh} = DBI->connect(@{$self->{dbi_connect}})              or die $DBI::errstr;
+	$self->{dbh} = DBI->connect(@{$self->{dbi_connect}})              or croak $DBI::errstr;
 	$self->{post_connect_cb}->($self) if $self->{post_connect_cb}; # uncoverable branch false
-	$self->{insert_sth} = $self->{dbh}->prepare($self->{insert_user}) or die $self->{dbh}->errstr;
-	$self->{select_sth} = $self->{dbh}->prepare($self->{select_user}) or die $self->{dbh}->errstr;
-	$self->{update_sth} = $self->{dbh}->prepare($self->{update_pass}) or die $self->{dbh}->errstr;
+	$self->{insert_sth} = $self->{dbh}->prepare($self->{insert_user}) or croak $self->{dbh}->errstr;
+	$self->{select_sth} = $self->{dbh}->prepare($self->{select_user}) or croak $self->{dbh}->errstr;
+	$self->{update_sth} = $self->{dbh}->prepare($self->{update_pass}) or croak $self->{dbh}->errstr;
 }
 
 sub create_user {
 	my ($self, $parms) = @_;
 	my %parms = $parms->flatten;
-	$self->{insert_sth}->execute($parms{username}, $self->hash_passphrase($parms{password}), $parms{email})
+	$self->{insert_sth}->execute($parms{username}, $self->hash_passphrase($parms{password}), $parms{email}) or croak $self->{insert_sth}->errstr;
 }
 
 sub get_user {
 	my ($self, $user) = @_;
-	$self->{select_sth}->execute($user) or die $self->{sth}->errstr;
+	$self->{select_sth}->execute($user) or croak $self->{select_sth}->errstr;
 	$self->{select_sth}->fetchrow_hashref
 }
 
 sub check_passphrase {
 	my ($self, $username, $passphrase) = @_;
 	unless ($self->{cache}) {
+		## no critic (ProhibitTies)
 		tie my %cache, 'Tie::Hash::Expire', {expire_seconds => $self->{cache_max_age}};
 		$self->{cache} = \%cache;
 	}
@@ -93,12 +110,12 @@ sub hash_passphrase {
 
 sub set_passphrase {
 	my ($self, $username, $passphrase) = @_;
-	$self->{update_sth}->execute($self->hash_passphrase($passphrase), $username)
+	$self->{update_sth}->execute($self->hash_passphrase($passphrase), $username) or croak $self->{update_sth}->errstr;
 }
 
 sub make_reset_hmac {
 	my ($self, $username, @data) = @_;
-	$self->{hmackey} //= random_bytes 512; # uncoverable condition false
+	$self->{hmackey} //= $self->{entropy_source}->get_bits(8 * 512); # uncoverable condition false
 	my $user = $self->get_user($username);
 	my $message = join ' ', $username, $user->{passphrase}, @data;
 	hmac_sha1_base64 $message, $self->{hmackey};
@@ -108,7 +125,7 @@ sub mail_body {
 	my ($self, $username, $token) = @_;
 	my $hours = $self->{token_max_age} / 60 / 60;
 	$hours .= $hours == 1 ? ' hour' : ' hours'; # uncoverable branch false
-	<<EOF;
+	<<"EOF";
 Someone has requested a password reset for your account.
 
 To reset your password, please submit the reset password form on the
@@ -175,7 +192,7 @@ sub call_register {
 		return $self->bad_request("Missing parameter $_") unless $parms{$_};
 	}
 
-	return $self->bad_request('Username must match ' . $self->{username_regex}) unless $parms{username} =~ /$self->{username_regex}/;
+	return $self->bad_request($self->{invalid_username}) unless $parms{username} =~ $self->{username_regex};
 	return $self->bad_request('Username already in use') if $self->get_user($parms{username});
 	return $self->bad_request('The two passwords do not match') unless $parms{password} eq $parms{confirm_password};
 
@@ -203,13 +220,11 @@ sub call_request_reset {
 	return $self->internal_server_error('Password resets are disabled') unless $self->{mail_from};
 	my $username = $req->param('username');
 	my $user = $self->get_user($username) or return $self->bad_request('No such user');
-	my $ok = 0;
 	eval {
 		$self->send_reset_email($username);
-		$ok = 1;
-	};
-	return $self->reply('Email sent') if $ok;
-	return $self->internal_server_error($@);
+		1
+	} or return $self->internal_server_error($@);
+	$self->reply('Email sent');
 }
 
 sub call_reset {
@@ -222,7 +237,7 @@ sub call_reset {
 
 	my $user = $self->get_user($parms{username}) or return $self->bad_request('No such user');
 	return $self->bad_request('The two passwords do not match') unless $parms{new_password} eq $parms{confirm_new_password};
-	my ($token, $exp) = split ':', $parms{token};
+	my ($token, $exp) = split /:/, $parms{token};
 	my $goodtoken = $self->make_reset_hmac($parms{username}, $exp);
 	return $self->bad_request('Bad reset token') unless $token eq $goodtoken;
 	return $self->bad_request('Reset token has expired') if time >= $exp;
@@ -232,6 +247,12 @@ sub call_reset {
 
 sub call {
 	my ($self, $env) = @_;
+
+	unless ($self->{init_done}) {
+		$self->init;
+		$self->{init_done} = 1;
+	}
+
 	my $auth = $env->{HTTP_AUTHORIZATION};
 	if ($auth && $auth =~ /^Basic (.*)$/i) {
 		my ($user, $pass) = split /:/, decode_base64($1), 2;
@@ -326,6 +347,14 @@ This URL performs a password reset.
 Arrayref of arguments to pass to DBI->connect. Defaults to
 C<['dbi:Pg', '', '']>.
 
+=item entropy_source
+
+C<Data::Entropy::Source> object to get random numbers from. By default
+uses F</dev/urandom> via C<Data::Entropy::RawSource::Local> if
+possible, or the default entropy source otherwise. A warning is
+printed if the default entropy source is used, to supress it set this
+argument to the default entropy source.
+
 =item post_connect_cb
 
 Callback (coderef) that is called just after connecting to the
@@ -384,7 +413,12 @@ Password reset token validity, in seconds. Defaults to 1 hour.
 =item username_regex
 
 Regular expression that matches valid usernames. Defaults to
-C<qr/^\w{2,20}$/a>.
+C<qr/^\w{2,20}$/as>.
+
+=item invalid_username
+
+Error message returned when the username does not match
+username_regex. Defaults to C<'Invalid username'>
 
 =item register_url
 
@@ -420,7 +454,7 @@ Creates a new AuthComplex object.
 
 =item B<init>
 
-Called at the end of the constructor. The default implementation
+Called when the first request is received. The default implementation
 connects to the database, calls C<post_connect_cb> and prepares the
 SQL statements.
 
@@ -486,19 +520,19 @@ Returns a 401 Authorization required response.
 
 =item B<call_register>(I<$req>)
 
-Handles the C</register> endpoint. I<$req> is a Plack::Request object.
+Handles the C</action/register> endpoint. I<$req> is a Plack::Request object.
 
 =item B<call_passwd>(I<$req>)
 
-Handles the C</passwd> endpoint. I<$req> is a Plack::Request object.
+Handles the C</action/passwd> endpoint. I<$req> is a Plack::Request object.
 
 =item B<call_request_reset>(I<$req>)
 
-Handles the C</request-reset> endpoint. I<$req> is a Plack::Request object.
+Handles the C</action/request-reset> endpoint. I<$req> is a Plack::Request object.
 
 =item B<call_reset>(I<$req>)
 
-Handles the C</reset> endpoint. I<$req> is a Plack::Request object.
+Handles the C</action/reset> endpoint. I<$req> is a Plack::Request object.
 
 =back
 
@@ -508,7 +542,7 @@ Marius Gavrilescu, E<lt>marius@ieval.roE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2015 by Marius Gavrilescu
+Copyright (C) 2015-2017 by Marius Gavrilescu
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself, either Perl version 5.20.1 or,