Commit changes that were in 1.002

[catagits/Catalyst-Authentication-Credential-HTTP.git] / t / basic.t

diff --git a/t/basic.t b/t/basic.t
index 3973b5f..ffd07e7 100644 (file)
--- a/t/basic.t
+++ b/t/basic.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use strict;
 use warnings;
-use Test::More tests => 22;
+use Test::More tests => 24;
 use Test::MockObject::Extends;
 use Test::MockObject;
 use Test::Exception;
@@ -10,6 +10,7 @@ use HTTP::Headers;
 my $m; BEGIN { use_ok($m = "Catalyst::Authentication::Credential::HTTP") }
 can_ok( $m, "authenticate" );
 can_ok( $m, "authorization_required_response" );
+
 my $req = Test::MockObject->new;
 my $req_headers = HTTP::Headers->new;
 $req->set_always( headers => $req_headers );
@@ -20,15 +21,13 @@ my $content_type;
 $res->mock(content_type => sub { $content_type = $_[1] });
 my $body;
 my $headers;
-#$res->mock(headers => sub { use Data::Dumper; warn Dumper(\@_); $headers = $_[1]; });
 $res->mock(body => sub { $body = $_[1] });
 my $res_headers = HTTP::Headers->new;
 $res->set_always( headers => $res_headers );
-my $realm = Test::MockObject->new;
-my $find_user_opts;
 my $user = Test::MockObject->new;
-my $user_pw;
-$user->mock( check_password => sub { $user_pw = $_[1]; return 1; } );
+$user->mock(get => sub { return shift->{$_[0]} });
+my $find_user_opts;
+my $realm = Test::MockObject->new;
 $realm->mock( find_user => sub { $find_user_opts = $_[1]; return $user; });
 $realm->mock( name => sub { 'foo' } );
 my $c = Test::MockObject->new;
@@ -46,18 +45,34 @@ $c->set_always( req => $req );
 $c->set_always( res => $res );
 $c->set_always( request => $req );
 $c->set_always( response => $res );
-my $config = { type => 'any' };
-my $raw_self = $m->new($config, $c, $realm);
-my $self = Test::MockObject::Extends->new( $raw_self );
-eval {
-    $self->authenticate($c, $realm);
-};
-is($@, $Catalyst::DETACH, 'Calling authenticate for http auth without header detaches');
+
+sub new_self {
+    my $config = { @_ };
+    my $raw_self = $m->new($config, $c, $realm);
+    return Test::MockObject::Extends->new( $raw_self );
+}
+
+# Normal auth, simple as possible.
+# No credentials
+my $self = new_self( type => 'any', password_type => 'clear', password_field => 'password' );
+throws_ok {
+    $self->authenticate( $c, $realm );
+} qr/^ $Catalyst::DETACH $/x, 'Calling authenticate for http auth without header detaches';
+$user->{password} = 'bar';
+
+# Wrong credentials
+$req_headers->authorization_basic( qw/foo quux/ );
+throws_ok {
+    $self->authenticate( $c, $realm );
+} qr/^ $Catalyst::DETACH $/x, 'Calling authenticate for http auth without header detaches';
+
+# Correct credentials
 $req_headers->authorization_basic( qw/foo bar/ );
 ok($self->authenticate($c, $realm), "auth successful with header");
 is($authenticated, 1, 'authenticated once');
-is($user_pw, 'bar', 'password delegated');
 is_deeply( $find_user_opts, { username => 'foo'}, "login delegated");
+
+# Test all the headers look good.
 $req_headers->clear;
 $c->clear;
 throws_ok {
@@ -71,9 +86,24 @@ like( ($res_headers->header('WWW-Authenticate'))[0], qr/realm="foo"/, "WWW-Authe
 like( ($res_headers->header('WWW-Authenticate'))[1], qr/^Basic/, "WWW-Authenticate header set: basic");
 like( ($res_headers->header('WWW-Authenticate'))[1], qr/realm="foo"/, "WWW-Authenticate header set: basic realm");
 
+# Check password_field works
+{
+    my $self = new_self( type => 'any', password_type => 'clear', password_field => 'the_other_password' );
+    local $user->{password} = 'bar';
+    local $user->{the_other_password} = 'the_other_password';
+    $req_headers->authorization_basic( qw/foo the_other_password/ );
+    ok($self->authenticate($c, $realm), "auth successful with header and alternate password field");
+    $c->clear;
+    $req_headers->authorization_basic( qw/foo bar/ );
+    throws_ok {
+        $self->authenticate( $c, $realm );
+    } qr/^ $Catalyst::DETACH $/x, "detached on bad password (different password field)";
+}
+
+$req_headers->clear;
 throws_ok {
     $self->authenticate( $c, $realm, { realm => 'myrealm' }); # Override realm object's name method by doing this.
-} qr/^ $Catalyst::DETACH $/x, "detached on no authorization required with bad auth";
+} qr/^ $Catalyst::DETACH $/x, "detached on no authorization supplied, overridden realm value";
 is( $status, 401, "401 status code" );
 is( $content_type, 'text/plain' );
 is( $body, 'Authorization required.' );