X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=cgi-auth-flexible.git;a=blobdiff_plain;f=cgi-auth-hybrid.pm;h=21a8fb523e875ef82339283e2de05542ca332edf;hp=af0e08359441601ec4e8e8ec5442607a156e377c;hb=5a7abf23fbc32d553a0e9369f6827f1b83c2ab43;hpb=bf40b8616e19346bb283dc19af15b2d603d58ef1
diff --git a/cgi-auth-hybrid.pm b/cgi-auth-hybrid.pm
index af0e083..21a8fb5 100644
--- a/cgi-auth-hybrid.pm
+++ b/cgi-auth-hybrid.pm
@@ -2,6 +2,7 @@
# This is part of CGI::Auth::Hybrid, a perl CGI authentication module.
# Copyright (C) 2012 Ian Jackson.
+# Copyright (C) 2012 Citrix.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -16,6 +17,12 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see .
+use strict;
+use warnings;
+
+package CGI::Auth::Hybrid;
+require Exporter;
+
BEGIN {
use Exporter ();
our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
@@ -30,25 +37,115 @@ 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 ----------
+
+sub flatten_params ($) {
+ my ($p) = @_;
+ my @p;
+ foreach my $k (keys %$p) {
+ foreach my $v (@{ $p->{$k} }) {
+ push @p, $k, $v;
+ }
+ }
+ return @p;
+}
#---------- default callbacks ----------
-sub _def_is_logout ($$) {
- my ($c,$r) = @_;
- foreach my $pn (@{ $r->{S}{logout_param_names} }) {
- return 1 if $r->_cm('get_param')($pn);
+sub has_a_param ($$) {
+ my ($r,$cn) = @_;
+ foreach my $pn (@{ $r->{S}{$cn} }) {
+ return 1 if $r->_ch('get_param',$pn);
}
return 0;
}
+sub get_params ($) {
+ my ($r) = @_;
+ my %p;
+ my $c = $r->{Cgi};
+ foreach my $name ($c->param()) {
+ $p{$name} = [ $c->param($name) ];
+ }
+ return \%p;
+}
+
+sub get_cookie_domain ($$$) {
+ my ($c,$r) = @_;
+ my $uri = new URI $r->_ch('get_url');
+ return $uri->host();
+}
+
+sub login_ok_password ($$) {
+ my ($c, $r) = @_;
+ my $username_params = $r->{S}{username_param_names};
+ my $username = $r->_ch('get_param',$username_params->[0]);
+ my $password = $r->_rp('password_param_name');
+ return $r->_ch('username_password_ok', $username, $password);
+}
+
+sub do_redirect_cgi ($$$$) {
+ my ($c, $r, $new_url, $cookie) = @_;
+ $r->_print($c->header($r->_cgi_header_args($cookie,
+ -status => '303 See other',
+ -location => $new_url)),
+ $r->_ch('gen_start_html',$r->_gt('Redirection')),
+ '',
+ $r->_gt("If you aren't redirected, click to continue."),
+ "",
+ $c->_ch('gen_end_html'));
+}
+
+sub gen_plain_login_form ($$) {
+ my ($c,$r, $params) = @_;
+ my @form;
+ push @form, ('');
+ return join "\n", @form;
+}
+
+sub gen_login_link ($$) {
+ my ($c,$r, $params) = @_;
+ my $url = $r->url_with_query_params($params);
+ return (''.
+ $r->_gt('Log in again to continue.').
+ '');
+}
+
#---------- verifier object methods ----------
sub new_verifier {
my $class = shift;
- my $s = {
+ my $verifier = {
S => {
- assocdb_path => 'cah-assocs.db';
+ assocdb_path => 'cah-assocs.db',
assocdb_dsn => undef,
assocdb_user => '',
assocdb_password => '',
@@ -57,56 +154,120 @@ sub new_verifier {
associdlen => 128, # bits
login_timeout => 86400, # seconds
assoc_param_name => 'cah_associd',
+ cookie_name => "cah_associd",
password_param_name => 'password',
- logout_param_names => [qw(logout)],
+ username_param_names => [qw(username)],
+ form_entry_size => 60,
+ logout_param_names => [qw(cah_logout)],
+ login_submit_name => [qw(cah_login)],
+ loggedout_param_names => [qw(cah_loggedout)],
promise_check_mutate => 0,
get_param => sub { $_[0]->param($_[2]) },
- get_cookie => sub { $_[0]->cookie($s->{S}{cookie_name}) },
+ get_params => sub { $_[1]->get_params() },
+ get_cookie => sub { $_[0]->cookie($_[1]->{S}{cookie_name}) },
get_method => sub { $_[0]->request_method() },
+ get_url => sub { $_[0]->url(); },
is_login => sub { defined $_[1]->_rp('password_param_name') },
- login_ok => sub { die },
- is_logout => \&_def_is_logout,
+ login_ok => \&login_ok_password,
+ username_password_ok => sub { die },
+ is_logout => sub { $_[1]->has_a_param('logout_param_names') },
+ is_loggedout => sub { $_[1]->has_a_param('loggedout_param_names') },
is_page => sub { return 1 },
+ handle_divert => sub { return 0 },
+ do_redirect => \&do_redirect_cgi, # this hook is allowed to throw
+ cookie_path => "/",
+ get_cookie_domain => \&get_cookie_domain,
+ encrypted_only => 1,
+ gen_start_html => sub { $_[0]->start_html($_[2]); },
+ gen_end_html => sub { $_[0]->end_html(); },
+ 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,
};
my ($k,$v);
while (($k,$v,@_) = @_) {
- die "unknown setting $k" unless exists $s->{S}{$k};
- $s->{S}{$k} = $v;
+ die "unknown setting $k" unless exists $verifier->{S}{$k};
+ $verifier->{S}{$k} = $v;
}
- bless $s, $class;
- $s->_dbopen();
- return $s;
+ bless $verifier, $class;
+ $verifier->_dbopen();
+ return $verifier;
}
sub _dbopen ($) {
- my ($s) = @_;
- my $dbh = $s->{Dbh};
+ my ($v) = @_;
+ my $dbh = $v->{Dbh};
return $dbh if $dbh;
- $s->{S}{assocdb_dsn} ||= "dbi:SQLite:dbname=$s->{S}{assocdb_path}";
+ $v->{S}{assocdb_dsn} ||= "dbi:SQLite:dbname=$v->{S}{assocdb_path}";
+ my $dsn = $v->{S}{assocdb_dsn};
my $u = umask 077;
- $dbh = DBI->open($s->{S}{assocdb_dsn}, $s->{S}{assocdb_user},
- $s->{S}{assocdb_password}, {
- AutoCommit => 0, RaiseError => 1,
- });
- die "${assocdb_dsn} $! ?" unless $dbh;
- $s->{Dbh} = $dbh;
-
- $dbh->do("BEGIN");
+ $dbh = DBI->connect($dsn, $v->{S}{assocdb_user},
+ $v->{S}{assocdb_password}, {
+ AutoCommit => 0,
+ RaiseError => 1,
+ ShowErrorStatement => 1,
+ });
+ die "$dsn $! ?" unless $dbh;
+ $v->{Dbh} = $dbh;
eval {
- $dbh->do("CREATE TABLE $s->{S}{assocdb_table} (".
- " associdh VARCHAR PRIMARY KEY,".
- " username VARCHAR,".
- " last INTEGER NOT NULL"
- ")");
+ $v->_db_transaction(sub {
+ local ($dbh->{PrintError}) = 0;
+ $dbh->do("CREATE TABLE $v->{S}{assocdb_table} (".
+ " associd VARCHAR PRIMARY KEY,".
+ " username VARCHAR,".
+ " last INTEGER NOT NULL".
+ ")");
+ });
};
return $dbh;
}
+sub disconnect ($) {
+ my ($v) = @_;
+ my $dbh = $v->{Dbh};
+ return unless $dbh;
+ $dbh->disconnect();
+}
+
+sub _db_transaction ($$) {
+ my ($v, $fn) = @_;
+ my $retries = 10;
+ my $rv;
+ my $dbh = $v->{Dbh};
+print STDERR "DT entry\n";
+ for (;;) {
+print STDERR "DT loop\n";
+ if (!eval {
+ $rv = $fn->();
+print STDERR "DT fn ok\n";
+ 1;
+ }) {
+print STDERR "DT fn error\n";
+ { local ($@); $dbh->rollback(); }
+print STDERR "DT fn throwing\n";
+ die $@;
+ }
+print STDERR "DT fn eval ok\n";
+ if (eval {
+ $dbh->commit();
+print STDERR "DT commit ok\n";
+ 1;
+ }) {
+print STDERR "DT commit eval ok $rv\n";
+ return $rv;
+ }
+print STDERR "DT commit throw?\n";
+ die $@ if !--$retries;
+print STDERR "DT loop again\n";
+ }
+}
+
#---------- request object methods ----------
sub new_request {
@@ -117,6 +278,7 @@ sub new_request {
die if @extra;
}
my $r = {
+ V => $classbase,
S => $classbase->{S},
Dbh => $classbase->{Dbh},
Cgi => $cgi,
@@ -127,13 +289,32 @@ 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);
}
sub _rp ($$@) {
my ($r,$pnvb) = @_;
- my $pn = $r->{S}{"${pnvb}_param_name"};
- my $p = $r->_ch('get_param',$pn)
+ my $pn = $r->{S}{$pnvb};
+ my $p = scalar $r->_ch('get_param',$pn)
+}
+
+sub _gt ($$) { my ($r, $t) = @_; return $r->_ch('gettext',$t); }
+sub _print ($$) { my ($r, @t) = @_; return $r->_ch('print', join '', @t); }
+
+sub construct_cookie ($$$) {
+ my ($r, $cookv) = @_;
+ return undef unless $cookv;
+ my $c = $r->{Cgi};
+my @ca = (-name => $r->{S}{cookie_name},
+ -value => $cookv,
+ -path => $r->{S}{cookie_path},
+ -domain => $r->_ch('get_cookie_domain'),
+ -expires => '+'.$r->{S}{login_timeout}.'s',
+ -secure => $r->{S}{encrypted_only});
+ my $cookie = $c->cookie(@ca);
+print STDERR "CC $r $c $cookv $cookie (@ca).\n";
+ return $cookie;
}
# pages/param-sets are
@@ -143,7 +324,7 @@ sub _rp ($$@) {
# u update of information by JS, mutating
# i login
# o logout
-
+# O "you have just logged out" page load
# in cook and par,
# a, aN anything including -
@@ -151,7 +332,7 @@ sub _rp ($$@) {
# 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)
@@ -161,12 +342,15 @@ sub _rp ($$@) {
# no) cookie.
# Case analysis, cookie mode, app promises re mutate:
- # cook par meth form
+ # cook parm meth form
#
# any - POST nrmuoi bug or attack, fail
# any - GET rmuoi bug or attack, fail
# any any GET muoi bug or attack, fail
- # any t any nrmuo bug or attack, fail
+ # any t any nrmu bug or attack, fail
+ #
+ # - - GET O "just logged out" page
+ # (any other) O bug or attack, fail
#
# a1 a2 POST o logout
# if a1 is valid, revoke it
@@ -176,15 +360,19 @@ sub _rp ($$@) {
# (which contains link to login form)
#
# - t POST i complain about cookies being disabled
+ # (with link to login form)
#
- # - n POST i complain about stale login form
+ # any n POST i complain about stale login form
# show new login form
#
- # x1 x2 POST i login (or switch user)
- # revoke x1 if it was valid and !=x2
- # upgrade x2 to y2 in our db (setting username)
- # set cookie to x2
- # redirect to GET of remaining params
+ # x1 t2 POST i login (or switch user)
+ # if bad
+ # show new login form
+ # if good
+ # revoke x1 if it was valid and !=t2
+ # upgrade t2 to y2 in our db (setting username)
+ # set cookie to t2
+ # redirect to GET of remaining params
#
# t1 a2 ANY nrmu treat as - a2 ANY
#
@@ -223,139 +411,337 @@ sub _rp ($$@) {
# 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
#
- # -/n n POST nrmu user not logged in
+ # -/n n POST n m user not logged in
+ # show login form
+ #
+ # -/n n POST r u user not logged in
# fail
-sub _check_core ($) {
+sub _check_divert_core ($) {
my ($r) = @_;
- my $qassoc = $r->_ch('get_param');
- my ($nassoc,$nmutate);
- if (!defined $r->{S}{cookie_name}) {
- # authentication is by hidden form parameter only
- return undef unless defined $qassoc;
- $nassoc = $qassoc;
- $nmutate = 1;
- } else {
- # authentication is by cookie
- # the cookie suffices for read-only GET requests
- # for mutating and non-GET requests we require hidden param too
- my $cassoc = $r->_ch('get_cookie');
- return undef unless defined $cassoc;
- $nassoc = $cassoc;
- if (defined $qassoc && $qassoc eq $cassoc) {
- $nmutate = 1;
+
+ my $meth = $r->_ch('get_method');
+ my $cookv = $r->_ch('get_cookie');
+ my $parmv = $r->_rp('assoc_param_name');
+
+ 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;
+ $r->_db_revoke($cookv);
+ $r->_db_revoke($parmv);
+ return ({ Kind => 'REDIRECT-LOGGEDOUT',
+ Message => "Logging out...",
+ CookieVal => '',
+ Params => { } });
+ }
+ if ($r->_ch('is_loggedout')) {
+ die unless $meth eq 'GET';
+ die unless $cookt;
+ die unless $parmt;
+ return ({ Kind => 'SMALLPAGE-LOGGEDOUT',
+ Message => "You have been logged out.",
+ CookieVal => '',
+ Params => { } });
+ }
+ if ($r->_ch('is_login')) {
+ $r->_must_be_post();
+ return ({ Kind => 'LOGIN-STALE',
+ Message => "Stale session; you need to log in again.",
+ CookieVal => $r->_fresh_cookie(),
+ Params => { } })
+ if $parmt eq 'n';
+ die unless $parmt eq 't' || $parmt eq 'y';
+ return ({ Kind => 'SMALLPAGE-NOCOOKIE',
+ Message => "You do not seem to have cookies enabled. ".
+ "You must enable cookies as we use them for login.",
+ CookieVal => $r->_fresh_cookie(),
+ Params => $r->_chain_params() })
+ if !$cookt && $parmt eq 't';
+ my $username = $r->_ch('login_ok');
+ return ({ Kind => 'LOGIN-BAD',
+ Message => "Incorrect username/password.",
+ CookieVal => $cookv,
+ Params => $r->_chain_params() })
+ unless defined $username && length $username;
+ $r->_db_revoke($cookv)
+ if defined $cookv && !(defined $parmv && $cookv eq $parmv);
+ $r->_db_record_login_ok($parmv,$username);
+ return ({ Kind => 'REDIRECT-LOGGEDIN',
+ Message => "Logging in...",
+ CookieVal => $parmv,
+ Params => $r->_chain_params() });
+ }
+ if ($cookt eq 't') {
+ $cookt = '';
+ }
+ die if $parmt eq 't';
+
+ if ($cookt eq 'y' && $parmt eq 'y' && $cookv ne $parmv) {
+ $r->_db_revoke($parmv) if $meth eq 'POST';
+ $parmt = 'n';
+ }
+
+ 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 => $newv,
+ Params => $r->_chain_params() });
} else {
- return undef unless $r->{S}{promise_check_mutate};
- return undef unless $r->_ch('get_method') eq 'GET';
- $nmutate = 0;
+ $r->_db_revoke($parmv);
+ return ({ Kind => 'LOGIN-FRESH',
+ Message => "You need to log in again.",
+ CookieVal => $newv,
+ Params => { } });
}
}
-UP TO HERE
+ if (!$r->{S}{promise_check_mutate}) {
+ if ($meth ne 'POST') {
+ return ({ Kind => 'MAINPAGEONLY',
+ Message => 'Entering via cross-site link.',
+ CookieVal => $cookv,
+ Params => { } });
+ # NB caller must then ignore params & path!
+ # if this is too hard they can spit out a small form
+ # with a "click to continue"
+ }
+ }
+
+ die unless $cookt eq 'y';
+ die unless $parmt eq 'y';
+ die unless $cookv eq $parmv;
+ $r->{Assoc} = $cookv;
+ $r->{UserOK} = $cooku;
+ print STDERR "C-D-C OK\n";
+ return undef;
+}
+
+sub _chain_params ($) {
+ my ($r) = @_;
+ my %p = %{ $r->_ch('get_params') };
+ foreach my $pncn (keys %{ $r->{S} }) {
+ my $names;
+ if ($pncn =~ m/_param_name$/) {
+ my $name = $r->{S}{$pncn};
+ die "$pncn ?" if ref $name;
+ $names = [ $name ];
+ } elsif ($pncn =~ m/_param_names$/) {
+ $names = $r->{S}{$pncn};
+ } else {
+ next;
+ }
+ foreach my $name (@$names) {
+ delete $p{$name};
+ }
+ }
+ return \%p;
+}
+
+sub _db_lookup ($$) {
+ my ($r,$v) = @_;
+ # returns ($t,$username)
+ # where $t is one of "t" "y" "n", or "" (for -)
my $dbh = $r->{Dbh};
- my ($nusername, $nlast) =
- $dbh->selectrow_array("SELECT username, last".
+
+ my $row = $dbh->selectrow_arrayref("SELECT username, last".
" FROM $r->{S}{assocdb_table}".
- " WHERE associd = ?", {}, $nassoc);
- return undef unless defined $nusername;
+ " WHERE associd = ?", {}, $v);
+ return ('') unless defined $row;
+
+ my ($nusername, $nlast) = @$row;
+
my $timeout = $r->{S}{login_timeout};
- return undef unless !defined $timeout || time <= $nlast + $timeout;
+ return ('n') unless !defined $timeout || time <= $nlast + $timeout;
+
+ return ('t') unless defined $nusername;
# hooray
- return ($nusername, $nassoc, $nmutate);
+ return ('y', $nusername);
}
-sub record_login ($$) {
- my ($r,$nusername) = @_;
- my $rsp = $r->{S}{random_source};
- my $rsf = new IO::File $rsp, '<' or die "$rsp $!";
- my $bytes = ($r->{S}{associdlen} + 7) >> 3;
- my $nassocbin;
- $!=0;
- read($rsf,$nassocbin,$bytes) == $bytes or die "$rsp $!";
- close $rsf;
- my $nassoc = unpack "H*", $nassocbin;
+sub _db_revoke ($$) {
+ # revokes $v if it's valid; no-op if it's not
+ my ($r,$v) = @_;
+
+ my $dbh = $r->{Dbh};
+
+ $dbh->do("DELETE FROM $r->{S}{assocdb_table}".
+ " WHERE associd = ?", {}, $v);
+}
+
+sub _db_record_login_ok ($$$) {
+ my ($r,$v,$user) = @_;
+ $r->_db_revoke($v);
my $dbh = $r->{Dbh};
$dbh->do("INSERT INTO $r->{S}{assocdb_table}".
" (associd, username, last) VALUES (?,?,?)", {},
- $nassoc, $nusername, time);
- $dbh->do("COMMIT");
- $r->{U} = $nusername;
- $r->{A} = $nassoc;
+ $v, $user, time);
}
-sub _check ($) {
+sub check_divert ($) {
my ($r) = @_;
-
- return if exists $r->{Username};
- ($r->{Username}, $r->{Assoc}, $r->{Mutate}) = $r->_check();
-
- if (defined $r->{Assoc}) {
- $dbh->do("UPDATE $r->{S}{assocdb_table}".
- " SET last = ?".
- " WHERE associd = ?", {}, time, $nassoc);
- $dbh->do("COMMIT");
+ if (exists $r->{Divert}) {
+ return $r->{Divert};
}
+ my $dbh = $r->{Dbh};
+ $r->{Divert} = $r->_db_transaction(sub { $r->_check_divert_core(); });
+ $dbh->commit();
+ print STDERR Dumper($r->{Divert});
+ return $r->{Divert};
}
-sub logout ($) {
+sub get_divert ($) {
my ($r) = @_;
+ die "unchecked" unless exists $r->{Divert};
+ return $r->{Divert};
+}
- my ($nusername, $nassoc, $nmutate) = $r->_check();
- return undef unless $nmutate;
- $dbh->do("DELETE FROM $r->{S}{assocdb_table}".
- " WHERE associd = ?", {}, $nassoc);
- $dbh->do("COMMIT");
- return $nusername;
+sub get_username ($) {
+ my ($r) = @_;
+ my $divert = $r->get_divert();
+ return undef if $divert;
+ return $r->{UserOK};
}
-sub check ($) {
+sub url_with_query_params ($$) {
+ my ($r, $params) = @_;
+ my $uri = URI->new($r->_ch('get_url'));
+ $uri->query_form(flatten_params($params));
+ return $uri->as_string();
+}
+
+sub _cgi_header_args ($$@) {
+ my ($r, $cookie, @ha) = @_;
+ unshift @ha, qw(-type text/html);
+ push @ha, (-cookie => $cookie) if defined $cookie;
+ print STDERR "_cgi_header_args ",join('|',@ha),".\n";
+ return @ha;
+}
+
+sub check_ok ($) {
my ($r) = @_;
- $r->_check();
- return !!defined $r->{Username};
+
+ my ($divert) = $r->check_divert();
+ return 1 if !$divert;
+
+ my $handled = $r->_ch('handle_divert',$divert);
+ return 0 if $handled;
+
+ my $kind = $divert->{Kind};
+ my $cookieval = $divert->{CookieVal};
+ my $params = $divert->{Params};
+ my $cookie = $r->construct_cookie($cookieval);
+
+ 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;
+ } elsif ($kind eq 'REDIRECT-LOGOUT') {
+ $params->{$r->{S}{logout_param_names}[0]} = 1;
+ } elsif ($kind eq 'REDIRECT-LOGGEDIN') {
+ } else {
+ die;
+ }
+ my $new_url = $r->url_with_query_params($params);
+ $r->_ch('do_redirect',$new_url, $cookie);
+ return 0;
+ }
+
+ my ($title, @body);
+ if ($kind =~ m/^LOGIN-/) {
+ $title = $r->_gt('Login');
+ push @body, $r->_gt($divert->{Message});
+ push @body, $r->_ch('gen_login_form', $params);
+ } elsif ($kind =~ m/^SMALLPAGE-/) {
+ $title = $r->_gt('Not logged in');
+ push @body, $r->_gt($divert->{Message});
+ push @body, $r->_ch('gen_login_link');
+ } else {
+ die $kind;
+ }
+
+ $r->_print($r->{Cgi}->header($r->_cgi_header_args($cookie)),
+ $r->_ch('gen_start_html',$title),
+ (join "\n", @body),
+ $r->_ch('gen_end_html'));
+ return 0;
}
-sub check_mutate ($) {
+sub _random ($$) {
+ my ($r, $bytes) = @_;
+ my $v = $r->{V};
+ my $rsf = $v->{RandomHandle};
+ my $rsp = $r->{S}{random_source};
+ if (!$rsf) {
+ $v->{RandomHandle} = $rsf = new IO::File $rsp, '<' or die "$rsp $!";
+ }
+ my $bin;
+ $!=0;
+ read($rsf,$bin,$bytes) == $bytes or die "$rsp $!";
+ close $rsf;
+ my $out = unpack "H*", $bin;
+ print STDERR "_random out $out\n";
+ return $out;
+}
+
+sub _fresh_cookie ($) {
my ($r) = @_;
- $r->check();
- return $r->{Mutate};
+ print STDERR "_fresh_cookie\n";
+ my $bytes = ($r->{S}{associdlen} + 7) >> 3;
+ return $r->_random($bytes);
}
-sub username ($) {
+sub _assert_checked ($) {
my ($r) = @_;
- $r->check();
- return $r->{Username};
+ die "unchecked" unless exists $r->{Divert};
+}
-sub hidden_val ($) {
+sub check_mutate ($) {
my ($r) = @_;
- $r->check();
- return defined $r->{Assoc} ? $r->{Assoc} : '';
+ $r->_assert_checked();
+ die if $r->{Divert};
+ my $meth = $r->_ch('get_method');
+ die "mutating non-POST" if $meth ne 'POST';
}
-#---------- simple wrappers ----------
+#---------- output ----------
-sub hidden_hargs ($) {
+sub secret_val ($) {
my ($r) = @_;
- return (-name => $r->{S}{param_name},
- -default => $r->hidden_val());
+ $r->_assert_checked();
+ return defined $r->{Assoc} ? $r->{Assoc} : '';
}
-sub hidden_html ($) {
+sub secret_hidden_html ($) {
my ($r) = @_;
- return hidden($r->hidden_hargs());
+ return $r->{Cgi}->hidden(-name => $r->{S}{assoc_param_name},
+ -default => $r->secret_val());
}
-sub cookiea_cargs ($) {
+sub secret_cookie ($) {
my ($r) = @_;
- return (-name => $r->{S}{cookie_name},
- -value => hidden_val());
+#print STDERR "SC\n";
+ my $cookv = $r->construct_cookie($r->secret_val());
+#print STDERR "SC=$cookv\n";
+ return $cookv;
}
__END__
@@ -377,7 +763,7 @@ CGI::Auth::Hybrid - web authentication optionally using cookies
$authreq->check_ok() or return;
blah blah blah
- $authreq->mutating();
+ $authreq->check_mutate();
blah blah blah
=head1 USAGE PATTERN FOR FANCY APPLICATIONS
@@ -392,3 +778,6 @@ CGI::Auth::Hybrid - web authentication optionally using cookies
}
}
+ blah blah blah
+ $authreq->check_mutate();
+ blah blah blah