Bump version and update Changes

[plack-middleware-auth-complex.git] / lib / Plack / Middleware / Auth / Complex.pm

diff --git a/lib/Plack/Middleware/Auth/Complex.pm b/lib/Plack/Middleware/Auth/Complex.pm
index f30f412f4cc01cf5f29f7351ad05e7e5a9694555..4436e5a81321c59b827140f55e22f2efe84ac677 100644 (file)
--- a/lib/Plack/Middleware/Auth/Complex.pm
+++ b/lib/Plack/Middleware/Auth/Complex.pm
@@ -4,14 +4,15 @@ use 5.014000;
 use strict;
 use warnings;
 
-our $VERSION = '0.000_001';
-$VERSION = eval $VERSION;  # see L<perlmodstyle>
+our $VERSION = '0.001';
 
 use parent qw/Plack::Middleware/;
+use re '/s';
 
 use Authen::Passphrase;
 use Authen::Passphrase::BlowfishCrypt;
 use Bytes::Random::Secure qw/random_bytes/;
+use Carp qw/croak/;
 use DBI;
 use Digest::SHA qw/hmac_sha1_base64 sha256/;
 use Email::Simple;
@@ -30,7 +31,7 @@ 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,
        register_url      => '/action/register',
        passwd_url        => '/action/passwd',
        request_reset_url => '/action/request-reset',
@@ -48,33 +49,34 @@ sub new {
 
 sub init {
        my ($self) = @_;
-       $self->{dbh} = DBI->connect(@{$self->{dbi_connect}})              or die $DBI::errstr;
-       $self->{post_connect_cb}->($self) if $self->{post_connect_cb};
-       $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->{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 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;
        }
        my $cachekey = sha256 "$username:$passphrase";
-       return $self->{cache}{$cachekey} if exists $self->{cache}{$cachekey};
+       return $self->{cache}{$cachekey} if exists $self->{cache}{$cachekey}; # uncoverable branch true
        my $user = $self->get_user($username);
        return 0 unless $user;
        my $ret = Authen::Passphrase->from_rfc2307($user->{passphrase})->match($passphrase);
@@ -93,12 +95,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;
+       $self->{hmackey} //= random_bytes 512; # uncoverable condition false
        my $user = $self->get_user($username);
        my $message = join ' ', $username, $user->{passphrase}, @data;
        hmac_sha1_base64 $message, $self->{hmackey};
@@ -107,8 +109,8 @@ sub make_reset_hmac {
 sub mail_body {
        my ($self, $username, $token) = @_;
        my $hours = $self->{token_max_age} / 60 / 60;
-       $hours .= $hours == 1 ? ' hour' : ' hours';
-       <<EOF;
+       $hours .= $hours == 1 ? ' hour' : ' hours'; # uncoverable branch false
+       <<"EOF";
 Someone has requested a password reset for your account.
 
 To reset your password, please submit the reset password form on the
@@ -175,7 +177,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('Username must match ' . $self->{username_regex}) 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 +205,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 +222,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;
@@ -384,7 +384,7 @@ 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 register_url