use DBI;
use CGI;
+use Locale::Gettext;
+
+#---------- default callbacks ----------
+
+sub has_a_param ($$) {
+ my ($c,$cn) = @_;
+ foreach my $pn (@{ $r->{S}{$cn} }) {
+ return 1 if $r->_cm('get_param')($pn);
+ }
+ return 0;
+}
+
+sub get_param_list ($$) {
+ my ($c) = @_;
+ my @p = ( );
+ foreach my $name ($c->param()) {
+ foreach my $val ($c->param($name)) {
+ push @p, $name, $val;
+ }
+ }
+ return @p;
+}
+
+sub get_cookie_domain ($$$) {
+ my ($c,$r) = @_;
+ my $uri = new URI $r->_ch('get_url');
+ return $uri->host();
+}
+
+sub construct_cookie ($$$) {
+ my ($c, $r, $cookv) = @_;
+ return $c->cookie(-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});
+}
+
+sub do_redirect_cgi ($$$$) {
+ my ($c, $r, $new_url, $cookie) = @_;
+ my @ha = ('text/html',
+ -status => '303 See other',
+ -location => $new_url);
+ push @ha, (-cookie => $cookie) if defined $cookie;
+ $r->_print($c->header(@ha),
+ $r->_ch('gen_start_html')($r->__('Redirection')),
+ '<a href="'.escapeHTML($new_url).'">',
+ $r->__("If you aren't redirected, click to continue."),
+ "</a>",
+ $c->_ch('gen_end_html'));
+}
+
+sub gen_plain_login_form ($$) {
+ my ($c,$r) = @_;
+ my @form;
+ push @form, ('<form method="POST" action="',
+ escapeHTML($r->_ch('get_url')).'>',
+ '<table>');
+ foreach my $up (@{ $r->{S}{username_param_names}}) {
+ push @form, '<tr><td>'.$r->
+ push @form
+ '<table>'.
+ '<tr>'
+ '<input type="text" name="'
+ '<input type="text" name="'.$r->{S}{password_param_name}.'">'.
#---------- verifier object methods ----------
random_source => '/dev/urandom',
associdlen => 128, # bits
login_timeout => 86400, # seconds
- param_name => 'cah_associd',
+ assoc_param_name => 'cah_associd',
+ password_param_name => 'password',
+ username_param_names => [qw(username)],
+ form_entry_size => 60,
+ logout_param_names => [qw(cah_logout)],
+ loggedout_param_names => [qw(cah_loggedout)],
promise_check_mutate => 0,
- cookie_name => 'cah_associd', # make undef to disable cookie
- get_param => sub { $_[0]->param($s->{S}{param_name}) },
- get_cookie => sub { $s->{S}{cookie_name}
- ? $_[0]->cookie($s->{S}{cookie_name})
- : '' },
+ get_param => sub { $_[0]->param($_[2]) },
+ get_param_list => sub { $_[1]->get_param_list() },
+ get_cookie => sub { $_[0]->cookie($s->{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 => 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 => 0,
+ gen_start_html => sub { $_[0]->start_html($_[2]); },
+ gen_end_html => sub { $_[0]->end_html(); },
+ gen_login_form => \&gen_plain_login_form,
+ gettext => sub { gettext($_[2]); },
+ };
},
Dbh => undef,
};
eval {
$dbh->do("CREATE TABLE $s->{S}{assocdb_table} (".
- " associd VARCHAR PRIMARY KEY,".
+ " associdh VARCHAR PRIMARY KEY,".
" username VARCHAR,".
- " last INTEGER"
+ " last INTEGER NOT NULL"
")");
};
return $dbh;
bless $r, ref $classbase;
}
-sub _cm ($$@) {
+sub _ch ($$@) { # calls an application hook
my ($r,$methname, @args) = @_;
my $methfunc = $r->{S}{$methname};
return $methfunc->($r->{Cgi}, $r, @args);
}
-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;
- 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;
+sub _rp ($$@) {
+ my ($r,$pnvb) = @_;
+ my $pn = $r->{S}{$pnvb};
+ my $p = scalar $r->_ch('get_param',$pn)
}
-sub _check_core ($) {
- my ($r) = @_;
- my $qassoc = $r->_cm('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->_cm('get_cookie');
- return undef unless defined $cassoc;
- $nassoc = $cassoc;
- if (defined $qassoc && $qassoc eq $cassoc) {
- $nmutate = 1;
- } else {
- return undef unless $r->{S}{promise_check_mutate};
- return undef unless $r->_cm('get_method') eq 'GET';
- $nmutate = 0;
- }
- }
+sub __ ($$) { my ($r, $t) = @_; return $r->_ch('gettext')($t); }
+sub _print ($$) { my ($r, @t) = @_; return $r->_ch('print')(join '', @t); }
# pages/param-sets are
# n normal non-mutating page
# 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 -
# 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
# (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
#
# -/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_divert_core ($) {
+fixme needs wrapping with something to make and commit a transaction
+ my ($r) = @_;
+
+ 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);
+
+ 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...",
+ Cookie => '',
+ 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.",
+ Cookie => '',
+ Params => [ ] });
+ }
+ if ($r->_ch('is_login')) {
+ $r->_must_be_post();
+ return ({ Kind => 'LOGIN-STALE',
+ Message => "Stale session; you need to log in again.",
+ Cookie => $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.",
+ Cookie => $r->_fresh_cookie(),
+ Params => $r->_chain_params() })
+ if !$cookt && $parmt eq 't';
+ return ({ Kind => 'LOGIN-BAD',
+ Message => "Incorrect username/password.",
+ Cookie => $cookv,
+ Params => $r->_chain_params() })
+ unless defined $username && length $username;
+ $r->_db_revoke($cookv)
+ if defined $cookv && !(defined $parmv && $cookv eq $parmv);
+ my $username = $r->_ch('login_ok');
+ $r->_db_record_login_ok($parmv,$username);
+ return ({ Kind => 'REDIRECT-LOGGEDIN',
+ Message => "Logging in...",
+ Cookie => $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';
+ if ($meth eq 'GET') {
+ return ({ Kind => 'LOGIN-INCOMINGLINK',
+ Message => "You need to log in again.",
+ Cookie => $parmv,
+ Params => $r->_chain_params() });
+ } else {
+ return ((Kind => 'LOGIN-FRESH',
+ Message => "You need to log in again.",
+ Cookie => $parmv,
+ Params => [ ]);
+ }
+ }
+
+ if (!$r->{S}{promise_check_mutate}) {
+ if ($meth ne 'POST') {
+ return ({ Kind => 'MAINPAGEONLY',
+ Message => 'Entering via cross-site link.',
+ Cookie => $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->{UserOK} = $cooku;
+ return undef;
+}
+
+sub _chain_params ($) {
+ my ($r) = @_;
+ my %elim = { };
+ foreach my $pncn (keys %{ $r->{S} }) {
+ 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 $param (@$names) {
+ $elim{$name} = 1;
+ }
+ }
+ my @p = $r->_ch('get_param_list');
+ my ($name,$val);
+ my @q = ();
+ while (@p) {
+ ($name,$val,@p) = @p;
+ next if $elim{$name};
+ push @q, $name, $val;
+ }
+ return @q;
+}
+
+sub _db_lookup ($$) {
+ # returns ($t,$username)
+ # where $t is one of "t" "y" "n", or "" (for -)
+ my ($r,$v) = @_;
+
my $dbh = $r->{Dbh};
+
my ($nusername, $nlast) =
$dbh->selectrow_array("SELECT username, last".
" FROM $r->{S}{assocdb_table}".
" WHERE associd = ?", {}, $nassoc);
- return undef unless defined $nusername;
+ return ('') unless defined $nusername;
+
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 _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);
+ $dbh->do("INSERT INTO $r->{S}{assocdb_table}".
+ " (associd, username, last) VALUES (?,?,?)", {},
+ $v, $user, time);
+}
+
+sub url_with_query_params ($@) {
+ my ($r, @params) = @_;
+ my $uri = URI->new($r->_ch('get_url'));
+ $uri->query_form(\@params);
+ return $uri->as_string();
+}
+
+sub check_ok ($) {
+ my ($r) = @_;
+
+ my ($divert) = $authreq->check_divert();
+ return 1 if $divert;
+
+ my $handled = $r->_ch('handle_divert')($divert);
+ return 0 if $handled;
+
+ my $kind = $divert->{Kind};
+ my $cookie = $divert->{Cookie};
+ my $params = $divert->{Params};
+
+ if ($kind =~ m/^REDIRECT-/) {
+ # for redirects, we honour stored NextParams and SetCookie,
+ # as we would for non-divert
+ if ($divert_kind eq 'REDIRECT-LOGGEDOUT') {
+ push @$params, $r->{S}{cah_loggedout}[0], 1;
+ } elsif ($divert_kind eq 'REDIRECT-LOGOUT') {
+ push @$params, $r->{S}{cah_logout}[0], 1;
+ } elsif ($divert_kind eq 'REDIRECT-LOGGEDIN') {
+ } else {
+ die;
+ }
+ my $new_url = $r->url_with_query_params(@$params);
+ $r->_ch('do_redirect')($new_url, $cookie);
+ return 0;
+ }
+ $kind =~ m/^SMALLPAGE|^LOGIN/ or die;
+
+ my ($title, @body);
+ if ($kind =~ m/^LOGIN-/) {
+ $title = $r->__('Login');
+ push @body, $r->__($divert->{Message});
+ push @body, $r->_ch('gen_login_form');
+ $body .= $r->_ch(
+
+ $r->_print(
+ $r->_ch('start_html')($title),
+
+
+
+ if ($kind =~ m/^SMALLPAGE
+
+if (defined $cookie) {
+ $r->_ch('header_out')($cookie);
+ }
+
+UP TO HERE
+
+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;
+ 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;
}
sub _check ($) {