wip

diff --git a/TODO b/TODO
index 530044ebfe37bed434e8d4dfcd204e0c35c2a37d..e54d9044077b7ea8a16ac8209e13425f3555aa6b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,6 +1,9 @@
 REQUEST_METHOD=post CAHTEST_HOME=`pwd` ./test.cgi ; echo
 
 
+check path is blanked when coming in
+
+
 sort out debugging
 
 update last in db when we return undef from check_divert

diff --git a/cgi-auth-flexible.pm b/cgi-auth-flexible.pm
index 54c73cfe7ebfdcd0801baab1aa0cdab71d1c4bfa..382b845ddc0c45016c9b004fac989b374659f2eb 100644 (file)
--- a/cgi-auth-flexible.pm
+++ b/cgi-auth-flexible.pm
@@ -105,39 +105,63 @@ sub do_redirect_cgi ($$$$) {
               '<a href="'.escapeHTML($new_url).'">',
               $r->_gt("If you aren't redirected, click to continue."),
               "</a>",
-              $c->_ch('gen_end_html'));
+              $r->_ch('gen_end_html'));
 }
 
-sub gen_plain_login_form ($$) {
-    my ($c,$r, $params) = @_;
+sub gen_some_form ($$) {
+    my ($r, $params, $bodyfn) = @_;
+    # Calls $bodyfn->($c,$r) which returns @formbits
+    my $c = $r->{Cgi};
     my @form;
     push @form, ('<form method="POST" action="'.
-                escapeHTML($r->_ch('get_url')).'">'.
-                '<table>');
-    my $sz = 'size="'.$r->{S}{form_entry_size}.'"';
-    foreach my $up (@{ $r->{S}{username_param_names}}) {
-       push @form, ('<tr><td>',$r->_gt(ucfirst $up),'</td>',
-                    '<td><input type="text" '.$sz.
-                    ' name='.$up.'></td></tr>');
-    }
-    push @form, ('<tr><td>'.$r->_gt('Password').'</td>',
-                '<td><input type="password" '.$sz.
-                ' name="'.$r->{S}{password_param_name}.'"></td></tr>');
-    push @form, ('<tr><td colspan="2">',
-                '<input type="submit"'.
-                ' name="'.$r->{S}{login_submit_name}[0].'"'.
-                ' value="'.$r->_gt('Login').'"></td></tr>',
-                '</table>');
+                escapeHTML($r->_ch('get_url')).'">');
+    push @form, $bodyfn->($c,$r);
     foreach my $n (keys %$params) {
-       push @form, ('<input type="hidden"'.
-                    ' name="'.$n.'"'.
-                    ' value="'.$params->{$n}.'">');
+        foreach my $val (@{ $params->{$n} }) {
+            push @form, ('<input type="hidden"'.
+                         ' name="'.escapeHTML($n).'"'.
+                         ' value="'.escapeHTML($val).'">');
+        }
     }
     push @form, ('</form>');
     return join "\n", @form;
 }
 
-sub gen_login_link ($$) {
+sub gen_plain_login_form ($$) {
+    my ($c,$r, $params) = @_;
+    return $r->gen_some_form($params, sub {
+        my @form;
+        push @form, ('<table>');
+        my $sz = 'size="'.$r->{S}{form_entry_size}.'"';
+        foreach my $up (@{ $r->{S}{username_param_names}}) {
+            push @form, ('<tr><td>',$r->_gt(ucfirst $up),'</td>',
+                         '<td><input type="text" '.$sz.
+                         ' name='.$up.'></td></tr>');
+        }
+        push @form, ('<tr><td>'.$r->_gt('Password').'</td>',
+                     '<td><input type="password" '.$sz.
+                     ' name="'.$r->{S}{password_param_name}.'"></td></tr>');
+        push @form, ('<tr><td colspan="2">',
+                     '<input type="submit"'.
+                     ' name="'.$r->{S}{login_submit_name}[0].'"'.
+                     ' value="'.$r->_gt('Login').'"></td></tr>',
+                     '</table>');
+        return @form;
+    });
+}
+
+sub gen_postmainpage_form ($$$) {
+    my ($c,$r, $params) = @_;
+    return $r->gen_some_form($params, sub {
+        my @form;
+        push @form, ('<input type="submit"',
+                     ' name="'.$r->{S}{dummy_param_name}.'_submit"'.
+                     ' value="'.$r->_gt('Continue').'">');
+        return @form;
+    });
+}
+
+sub gen_plain_login_link ($$) {
     my ($c,$r, $params) = @_;
     my $url = $r->url_with_query_params($params);
     return ('<a href="'.escapeHTML($url).'">'.
@@ -165,6 +189,7 @@ sub new_verifier {
            login_form_timeout => 3600, # seconds
            key_rollover => 86400, # seconds
            assoc_param_name => 'caf_assochash',
+           dummy_param_name => 'caf_dummy',
            cookie_name => "caf_assocsecret",
            password_param_name => 'password',
            username_param_names => [qw(username)],
@@ -193,6 +218,7 @@ sub new_verifier {
            gen_end_html => sub { $_[0]->end_html(); },
            gen_login_form => \&gen_plain_login_form,
            gen_login_link => \&gen_plain_login_link,
+           gen_postmainpage_form => \&gen_postmainpage_form,
            gettext => sub { gettext($_[2]); },
            print => sub { print $_[2] or die $!; },
        },
@@ -279,7 +305,7 @@ print STDERR "DT fn eval ok\n";
 print STDERR "DT commit ok\n";
            1;
        }) {
-print STDERR "DT commit eval ok $rv\n";
+print STDERR "DT commit eval ok ",Dumper($rv);
            return $rv;
        }
 print STDERR "DT commit throw?\n";
@@ -718,16 +744,16 @@ sub check_ok ($) {
     my $cookie = $r->construct_cookie($cookiesecret);
 
     if (defined $cookiesecret) {
-        $params->{$r->{S}{assoc_param_name}} = $r->hash($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
        if ($kind eq 'REDIRECT-LOGGEDOUT') {
-           $params->{$r->{S}{loggedout_param_names}[0]} = 1;
+           $params->{$r->{S}{loggedout_param_names}[0]} = [ 1 ];
        } elsif ($kind eq 'REDIRECT-LOGOUT') {
-           $params->{$r->{S}{logout_param_names}[0]} = 1;
+           $params->{$r->{S}{logout_param_names}[0]} = [ 1 ];
        } elsif ($kind eq 'REDIRECT-LOGGEDIN') {
        } else {
            die;
@@ -745,7 +771,11 @@ sub check_ok ($) {
     } elsif ($kind =~ m/^SMALLPAGE-/) {
        $title = $r->_gt('Not logged in');
        push @body, $r->_gt($divert->{Message});
-       push @body, $r->_ch('gen_login_link');
+       push @body, $r->_ch('gen_login_link', $params);
+    } elsif ($kind =~ m/^MAINPAGEONLY$/) {
+        $title = $r->_gt('Entering secure site.');
+        push @body, $r->_gt($divert->{Message});
+        push @body, $r->_ch('gen_postmainpage_form', $params);
     } else {
        die $kind;
     }
@@ -920,7 +950,7 @@ sub secret_cookie_val ($) {
 sub secret_hidden_val ($) {
     my ($r) = @_;
     $r->_assert_checked();
-    return defined $r->{AssocSecret} ? r->hash($r->{AssocSecret}) : '';
+    return defined $r->{AssocSecret} ? $r->hash($r->{AssocSecret}) : '';
 }
 
 sub secret_hidden_html ($) {

diff --git a/test.cgi b/test.cgi
index 918b7f878c236278f0ae649caf1f84d34028d73a..71ff2fee27f0aa42f27a311dff6daef2ae8218f7 100755 (executable)
--- a/test.cgi
+++ b/test.cgi
@@ -38,4 +38,7 @@ Set-Cookie: $cookie
 
 <form method="POST" action="$url">
 $hiddenhtml
+<input type="submit" name="test_cgi_submit" value="Make sponges">
+<input type="submit" name="caf_logout" value="Logout">
+</form>
 END