wip fixes

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

diff --git a/cgi-auth-hybrid.pm b/cgi-auth-hybrid.pm
index 4f74cded4fe0e89a99f258640757b1cc4f03e000..7866bdc92ab54e2f4c31d7dc6a4aa93f219fcb68 100644 (file)
--- a/cgi-auth-hybrid.pm
+++ b/cgi-auth-hybrid.pm
@@ -37,9 +37,11 @@ BEGIN {
 our @EXPORT_OK;
 
 use DBI;
-use CGI;
+use CGI qw/escapeHTML/;
 use Locale::gettext;
 use URI;
+use IO::File;
+use Data::Dumper;
 
 #---------- public utilities ----------
 
@@ -106,7 +108,7 @@ sub gen_plain_login_form ($$) {
     my ($c,$r, $params) = @_;
     my @form;
     push @form, ('<form method="POST" action="'.
-                escapeHTML($r->_ch('get_url')).'>'.
+                escapeHTML($r->_ch('get_url')).'">'.
                 '<table>');
     my $sz = 'size="'.$r->{S}{form_entry_size}.'"';
     foreach my $up (@{ $r->{S}{username_param_names}}) {
@@ -182,6 +184,7 @@ sub new_verifier {
            gen_login_form => \&gen_plain_login_form,
            gen_login_link => \&gen_plain_login_link,
            gettext => sub { gettext($_[2]); },
+           print => sub { print $_[2] or die $!; },
        },
        Dbh => undef,
     };
@@ -238,26 +241,26 @@ sub _db_transaction ($$) {
     my $retries = 10;
     my $rv;
     my $dbh = $v->{Dbh};
-#print STDERR "DT entry\n";
+print STDERR "DT entry\n";
     for (;;) {
-#print STDERR "DT loop\n";
+print STDERR "DT loop\n";
        if (!eval {
            $rv = $fn->();
-#print STDERR "DT fn ok\n";
+print STDERR "DT fn ok\n";
            1;
        }) {
-#print STDERR "DT fn error\n";
+print STDERR "DT fn error\n";
            { local ($@); $dbh->rollback(); }
-#print STDERR "DT fn throwing\n";
+print STDERR "DT fn throwing\n";
            die $@;
        }
-#print STDERR "DT fn eval ok\n";
+print STDERR "DT fn eval ok\n";
        if (eval {
            $dbh->commit();
 print STDERR "DT commit ok\n";
            1;
        }) {
-print STDERR "DT commit eval ok\n";
+print STDERR "DT commit eval ok $rv\n";
            return $rv;
        }
 print STDERR "DT commit throw?\n";
@@ -287,6 +290,7 @@ sub new_request {
 sub _ch ($$@) { # calls an application hook
     my ($r,$methname, @args) = @_;
     my $methfunc = $r->{S}{$methname};
+    die "$methname ?" unless $methfunc;
     return $methfunc->($r->{Cgi}, $r, @args);
 }
 
@@ -328,7 +332,7 @@ print STDERR "CC $r $c $cookv $cookt\n";
 #    y, yN     value corresponds to logged-in user
 #    n, nN     value not in our db
 #    x, xN     t or y
-#    -         no value supplied
+#    -         no value supplied (represented in code as $cookt='')
 # if N differs the case applies only when the two values differ
 # (eg,   a1 y2   does not apply when the logged-in value is supplied twice)
 
@@ -407,8 +411,9 @@ print STDERR "CC $r $c $cookv $cookt\n";
     #                           revoke y2
     #                           treat as   -/n n POST
     #
-    #  -/n n   GET   n        cross-site link but user not logged in
+    #  -/n -/n GET   n        cross-site link but user not logged in
     #                           show login form with redirect to orig params
+    #                           generate fresh cookie
     #
     #  -/n n   GET    rmu     user not logged in
     #                           fail
@@ -419,6 +424,8 @@ print STDERR "CC $r $c $cookv $cookt\n";
     #  -/n n   POST   r u     user not logged in
     #                           fail
 
+#fixme make parameter values hash of cookie values
+
 sub _check_divert_core ($) {
     my ($r) = @_;
 
@@ -429,6 +436,8 @@ sub _check_divert_core ($) {
     my ($cookt,$cooku) = $r->_db_lookup($cookv);
     my $parmt = $r->_db_lookup($parmv);
 
+    print STDERR "_c_d_c cookt=$cookt parmt=$parmt\n";
+
     if ($r->_ch('is_logout')) {
        $r->_must_be_post();
        die unless $parmt;
@@ -489,15 +498,17 @@ sub _check_divert_core ($) {
     if ($cookt ne 'y') {
        die unless !$cookt || $cookt eq 'n';
        die unless !$parmt || $parmt eq 'n' || $parmt eq 'y';
+       my $newv = $r->_fresh_cookie();
        if ($meth eq 'GET') {
            return ({ Kind => 'LOGIN-INCOMINGLINK',
                      Message => "You need to log in again.",
-                     CookieVal => $parmv,
+                     CookieVal => $newv,
                      Params => $r->_chain_params() });
        } else {
+           $r->_db_revoke($parmv);
            return ({ Kind => 'LOGIN-FRESH',
                       Message => "You need to log in again.",
-                      CookieVal => $parmv,
+                      CookieVal => $newv,
                       Params => { } });
        }
     }
@@ -519,6 +530,7 @@ sub _check_divert_core ($) {
     die unless $cookv eq $parmv;
     $r->{Assoc} = $cookv;
     $r->{UserOK} = $cooku;
+    print STDERR "C-D-C OK\n";
     return undef;
 }
 
@@ -587,14 +599,14 @@ sub _db_record_login_ok ($$$) {
 
 sub check_divert ($) {
     my ($r) = @_;
-    my $divert;
     if (exists $r->{Divert}) {
         return $r->{Divert};
     }
     my $dbh = $r->{Dbh};
     $r->{Divert} = $r->_db_transaction(sub { $r->_check_divert_core(); });
     $dbh->commit();
-    return $divert;
+    print STDERR Dumper($r->{Divert});
+    return $r->{Divert};
 }
 
 sub get_divert ($) {
@@ -660,9 +672,10 @@ sub check_ok ($) {
        die $kind;
     }
 
-    $r->_print($r->_ch('start_html',$title),
+    $r->_print($r->{Cgi}->header('text/html'),
+              $r->_ch('gen_start_html',$title),
               @body,
-              $r->_ch('end_html'));
+              $r->_ch('gen_end_html'));
     return 0;
 }
 
@@ -678,11 +691,13 @@ sub _random ($$) {
     $!=0;
     read($rsf,$bin,$bytes) == $bytes or die "$rsp $!";
     close $rsf;
-    return unpack "H*", $bin;
+    my $out = unpack "H*", $bin;
+    print STDERR "_random out $out\n";
 }
 
 sub _fresh_cookie ($) {
     my ($r) = @_;
+    print STDERR "_fresh_cookie\n";
     my $bytes = ($r->{S}{associdlen} + 7) >> 3;
     return $r->_random($bytes);
 }
@@ -716,9 +731,9 @@ sub secret_hidden_html ($) {
 
 sub secret_cookie ($) {
     my ($r) = @_;
-print STDERR "SC\n";
+#print STDERR "SC\n";
     my $cookv = $r->construct_cookie($r->secret_val()); 
-print STDERR "SC=$cookv\n";
+#print STDERR "SC=$cookv\n";
     return $cookv;
 }