diff options
-rw-r--r-- | tests/lighttpd.htpasswd | 1 | ||||
-rwxr-xr-x | tests/mod-auth.t | 25 |
2 files changed, 22 insertions, 4 deletions
diff --git a/tests/lighttpd.htpasswd b/tests/lighttpd.htpasswd index eed7dd26..edd7509b 100644 --- a/tests/lighttpd.htpasswd +++ b/tests/lighttpd.htpasswd @@ -1,3 +1,4 @@ des:12tMnfw882VDQ md5:$1$md5$kIa7Juuiv8zja0ILQPR36/ sha:{SHA}2PRZAyDhNDqRW2OUFwZQqPNdaSY= +apr-md5:$apr1$w2kLqmDN$uMe8ZCfMRT81wf43Y1hny0 diff --git a/tests/mod-auth.t b/tests/mod-auth.t index 576ee4eb..cc03aa8a 100755 --- a/tests/mod-auth.t +++ b/tests/mod-auth.t @@ -8,7 +8,7 @@ BEGIN { use strict; use IO::Socket; -use Test::More tests => 17; +use Test::More tests => 19; use LightyTest; my $tf = LightyTest->new(); @@ -83,10 +83,27 @@ EOF $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 401 } ]; ok($tf->handle_http($t) == 0, 'Basic-Auth: Valid Auth-token - htpasswd (sha, wrong password)'); +$t->{REQUEST} = ( <<EOF +GET /server-config HTTP/1.0 +Host: auth-htpasswd.example.org +Authorization: Basic YXByLW1kNTphcHItbWQ1 +EOF + ); +$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ]; +ok($tf->handle_http($t) == 0, 'Basic-Auth: Valid Auth-token - htpasswd (apr-md5)'); + +$t->{REQUEST} = ( <<EOF +GET /server-config HTTP/1.0 +Host: auth-htpasswd.example.org +Authorization: Basic YXByLW1kNTphcHItbWQ2 +EOF + ); +$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 401 } ]; +ok($tf->handle_http($t) == 0, 'Basic-Auth: Valid Auth-token - htpasswd (apr-md5, wrong password)'); SKIP: { - skip "no md5 for crypt under cygwin", 1 if $^O eq 'cygwin'; - skip "no md5 for crypt under darwin", 1 if $^O eq 'darwin'; + skip "no crypt-md5 under cygwin", 1 if $^O eq 'cygwin'; + skip "no crypt-md5 under darwin", 1 if $^O eq 'darwin'; $t->{REQUEST} = ( <<EOF GET /server-config HTTP/1.0 Host: auth-htpasswd.example.org @@ -94,7 +111,7 @@ Authorization: Basic bWQ1Om1kNQ== EOF ); $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ]; -ok($tf->handle_http($t) == 0, 'Basic-Auth: Valid Auth-token - htpasswd (md5)'); +ok($tf->handle_http($t) == 0, 'Basic-Auth: Valid Auth-token - htpasswd (crypt-md5)'); } $t->{REQUEST} = ( <<EOF |