wip, finish path handling, seems to work well now

[cgi-auth-flexible.git] / cgi-auth-flexible.pm

diff --git a/cgi-auth-flexible.pm b/cgi-auth-flexible.pm
index 0ea969d648f46d33b091531476eb40bdf132844a..af4c30b48b2c7938412f6208172fe218da46305d 100644 (file)
--- a/cgi-auth-flexible.pm
+++ b/cgi-auth-flexible.pm
@@ -54,6 +54,7 @@ sub flatten_params ($) {
     my ($p) = @_;
     my @p;
     foreach my $k (keys %$p) {
+        next if $k eq '';
        foreach my $v (@{ $p->{$k} }) {
            push @p, $k, $v;
        }
@@ -113,10 +114,13 @@ sub gen_some_form ($$) {
     # Calls $bodyfn->($c,$r) which returns @formbits
     my $c = $r->{Cgi};
     my @form;
+    my $pathinfo = '';
+    $pathinfo .= $params->{''}[0] if $params->{''};
     push @form, ('<form method="POST" action="'.
-                escapeHTML($r->_ch('get_url')).'">');
+                escapeHTML($r->_ch('get_url').$pathinfo).'">');
     push @form, $bodyfn->($c,$r);
     foreach my $n (keys %$params) {
+        next if $n eq '';
         foreach my $val (@{ $params->{$n} }) {
             push @form, ('<input type="hidden"'.
                          ' name="'.escapeHTML($n).'"'.
@@ -143,7 +147,7 @@ sub gen_plain_login_form ($$) {
                      ' name="'.$r->{S}{password_param_name}.'"></td></tr>');
         push @form, ('<tr><td colspan="2">',
                      '<input type="submit"'.
-                     ' name="'.$r->{S}{login_submit_name}[0].'"'.
+                     ' name="'.$r->{S}{dummy_param_name_prefix}.'login"'.
                      ' value="'.$r->_gt('Login').'"></td></tr>',
                      '</table>');
         return @form;
@@ -155,7 +159,7 @@ sub gen_postmainpage_form ($$$) {
     return $r->gen_some_form($params, sub {
         my @form;
         push @form, ('<input type="submit"',
-                     ' name="'.$r->{S}{dummy_param_name}.'_submit"'.
+                     ' name="'.$r->{S}{dummy_param_name_prefix}.'submit"'.
                      ' value="'.$r->_gt('Continue').'">');
         return @form;
     });
@@ -189,17 +193,17 @@ sub new_verifier {
            login_form_timeout => 3600, # seconds
            key_rollover => 86400, # seconds
            assoc_param_name => 'caf_assochash',
-           dummy_param_name => 'caf_dummy',
+           dummy_param_name_prefix => 'caf__',
            cookie_name => "caf_assocsecret",
            password_param_name => 'password',
            username_param_names => [qw(username)],
            form_entry_size => 60,
            logout_param_names => [qw(caf_logout)],
-           login_submit_name => [qw(caf_login)],
            loggedout_param_names => [qw(caf_loggedout)],
            promise_check_mutate => 0,
            get_param => sub { $_[0]->param($_[2]) },
            get_params => sub { $_[1]->get_params() },
+           get_path_info => sub { $_[0]->path_info() },
            get_cookie => sub { $_[0]->cookie($_[1]->{S}{cookie_name}) },
            get_method => sub { $_[0]->request_method() },
            get_url => sub { $_[0]->url(); },
@@ -523,8 +527,8 @@ sub _check_divert_core ($) {
             return ({ Kind => 'SMALLPAGE-NOCOOKIE',
                       Message => "You do not seem to have cookies enabled.  ".
                           "You must enable cookies as we use them for login.",
-                          CookieSecret => $r->_fresh_secret(),
-                          Params => $r->_chain_params() })
+                      CookieSecret => $r->_fresh_secret(),
+                      Params => $r->chain_params() })
         }
         if (!$cookt || $cookt eq 'n' || $cookh ne $parmh) {
             $r->_db_revoke($cookh);
@@ -539,13 +543,13 @@ sub _check_divert_core ($) {
             return ({ Kind => 'LOGIN-BAD',
                       Message => "Incorrect username/password.",
                       CookieSecret => $cooks,
-                      Params => $r->_chain_params() })
+                      Params => $r->chain_params() })
         }
        $r->_db_record_login_ok($parmh,$username);
        return ({ Kind => 'REDIRECT-LOGGEDIN',
                  Message => "Logging in...",
                  CookieSecret => $cooks,
-                 Params => $r->_chain_params() });
+                 Params => $r->chain_params() });
     }
     if ($cookt eq 't') {
        $cookt = '';
@@ -565,7 +569,7 @@ sub _check_divert_core ($) {
            return ({ Kind => 'LOGIN-INCOMINGLINK',
                      Message => "You need to log in.",
                      CookieSecret => $news,
-                     Params => $r->_chain_params() });
+                     Params => $r->chain_params() });
        } else {
            $r->_db_revoke($parmh);
            return ({ Kind => 'LOGIN-FRESH',
@@ -588,15 +592,17 @@ sub _check_divert_core ($) {
     }
 
     die unless $cookt eq 'y';
-    die unless $parmt eq 'y';
-    die unless $cookh eq $parmh;
+    unless ($r->{S}{promise_check_mutate} && $meth eq 'GET') {
+        die unless $parmt eq 'y';
+        die unless $cookh eq $parmh;
+    }
     $r->{AssocSecret} = $cooks;
     $r->{UserOK} = $cooku;
     print STDERR "C-D-C OK\n";
     return undef;
 }
 
-sub _chain_params ($) {
+sub chain_params ($) {
     my ($r) = @_;
     my %p = %{ $r->_ch('get_params') };
     foreach my $pncn (keys %{ $r->{S} }) {
@@ -614,6 +620,12 @@ sub _chain_params ($) {
            delete $p{$name};
        }
     }
+    my $dummy_prefix = $r->{S}{dummy_param_name_prefix};
+    foreach my $name (grep /^$dummy_prefix/, keys %p) {
+        delete $p{$name};
+    }
+    die if exists $p{''};
+    $p{''} = [ $r->_ch('get_path_info') ];
     return \%p;
 }
 
@@ -717,6 +729,7 @@ sub url_with_query_params ($$) {
     my ($r, $params) = @_;
 print STDERR "PARAMS ",Dumper($params);
     my $uri = URI->new($r->_ch('get_url'));
+    $uri->path($uri->path() . $params->{''}[0]) if $params->{''};
     $uri->query_form(flatten_params($params));
     return $uri->as_string();
 }
@@ -743,10 +756,6 @@ sub check_ok ($) {
     my $params = $divert->{Params};
     my $cookie = $r->construct_cookie($cookiesecret);
 
-    if (defined $cookiesecret) {
-        $params->{$r->{S}{assoc_param_name}} = [ $r->hash($cookiesecret) ];
-    }
-
     if ($kind =~ m/^REDIRECT-/) {
        # for redirects, we honour stored NextParams and SetCookie,
        # as we would for non-divert
@@ -763,6 +772,10 @@ sub check_ok ($) {
        return 0;
     }
 
+    if (defined $cookiesecret) {
+        $params->{$r->{S}{assoc_param_name}} = [ $r->hash($cookiesecret) ];
+    }
+
     my ($title, @body);
     if ($kind =~ m/^LOGIN-/) {
        $title = $r->_gt('Login');