use DBI;
use CGI;
-sub new {
+#---------- verifier object methods ----------
+
+sub new_verifier {
my $class = shift;
my $s = {
S => {
associdlen => 128, # bits
login_timeout => 86400, # seconds
param_name => 'cah_associd',
+ promise_check_mutate => 0,
cookie_name => 'cah_associd', # make undef to disable cookie
- cgi => undef,
- get_param => sub { $s->_c()->param($s->{S}{param_name}) },
+ get_param => sub { $_[0]->param($s->{S}{param_name}) },
get_cookie => sub { $s->{S}{cookie_name}
- ? $s->_c()->cookie($s->{S}{cookie_name})
+ ? $_[0]->cookie($s->{S}{cookie_name})
: '' },
- get_method => sub { $s->_c()->request_method() },
+ get_method => sub { $_[0]->request_method() },
},
- D => undef,
+ Dbh => undef,
};
my ($k,$v);
while (($k,$v,@_) = @_) {
$s->{S}{$k} = $v;
}
bless $s, $class;
+ $s->_dbopen();
return $s;
}
-sub _c ($) {
- my ($s) = @_;
- return $s->{S}{cgi};
-}
-
sub _dbopen ($) {
my ($s) = @_;
- my $dbh = $s->{D};
+ my $dbh = $s->{Dbh};
return $dbh if $dbh;
$s->{S}{assocdb_dsn} ||= "dbi:SQLite:dbname=$s->{S}{assocdb_path}";
AutoCommit => 0, RaiseError => 1,
});
die "${assocdb_dsn} $! ?" unless $dbh;
- $s->{D} = $dbh;
+ $s->{Dbh} = $dbh;
$dbh->do("BEGIN");
return $dbh;
}
+#---------- request object methods ----------
+
+sub new_request {
+ my ($classbase, $cgi, @extra) = @_;
+ if (!ref $classbase) {
+ $classbase = $classbase->new_verifier(@extra);
+ } else {
+ die if @extra;
+ }
+ my $r = {
+ S => $classbase->{S},
+ Dbh => $classbase->{Dbh},
+ Cgi => $cgi,
+ };
+ bless $r, ref $classbase;
+}
+
+sub _cm ($$@) {
+ my ($r,$methname, @args) = @_;
+ my $methfunc = $r->{S}{$methname};
+ return $methfunc->($r->{Cgi}, $r, @args);
+}
+
sub record_login ($$) {
- my ($s,$nusername) = @_;
- my $rsp = $s->{S}{random_source};
+ my ($r,$nusername) = @_;
+ my $rsp = $r->{S}{random_source};
my $rsf = new IO::File $rsp, '<' or die "$rsp $!";
- my $bytes = ($s->{S}{associdlen} + 7) >> 3;
+ 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 = $s->_dbopen();
- $dbh->do("INSERT INTO $s->{S}{assocdb_table}".
+ my $dbh = $r->{Dbh};
+ $dbh->do("INSERT INTO $r->{S}{assocdb_table}".
" (associd, username, last) VALUES (?,?,?)", {},
$nassoc, $nusername, time);
$dbh->do("COMMIT");
- $s->{U} = $nusername;
- $s->{A} = $nassoc;
+ $r->{U} = $nusername;
+ $r->{A} = $nassoc;
}
sub _check ($) {
- my ($s) = @_;
- my $qassoc = $s->{S}{param_get}();
- if (!defined $qassoc) {
- $qassoc = $s->{S}{cookie_get}();
+ 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;
- return undef unless $s->{S}{get_method}() eq 'GET';
+ $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;
+ }
}
- my $dbh = $s->_dbopen();
+ my $dbh = $r->{Dbh};
my ($nusername, $nlast) =
$dbh->selectrow_array("SELECT username, last".
- " FROM $s->{S}{assocdb_table}".
- " WHERE associd = ?", {}, $qassoc);
+ " FROM $r->{S}{assocdb_table}".
+ " WHERE associd = ?", {}, $nassoc);
return undef unless defined $nusername;
- my $timeout = $s->{S}{login_timeout};
+ my $timeout = $r->{S}{login_timeout};
return undef unless !defined $timeout || time <= $nlast + $timeout;
- return ($nusername, $qassoc);
+ # hooray
+ return ($nusername, $nassoc, $nmutate);
}
sub check ($) {
- my ($s) = @_;
+ my ($r) = @_;
- my ($nusername, $qassoc) = $s->_check() or return undef;
+ my ($nusername, $nassoc, $nmutate) = $r->_check() or return undef;
- # hooray
- $dbh->do("UPDATE $s->{S}{assocdb_table}".
+ $dbh->do("UPDATE $r->{S}{assocdb_table}".
" SET last = ?".
- " WHERE associd = ?", {}, time, $qassoc);
+ " WHERE associd = ?", {}, time, $nassoc);
$dbh->do("COMMIT");
- $s->{U} = $nusername;
- $s->{A} = $qassoc;
- return $username;
+ $r->{Username} = $nusername;
+ $r->{Assoc} = $nassoc;
+ $r->{Mutate} = $nmutate;
+ return $nusername;
+}
+
+sub check_mutate ($) {
+ my ($r) = @_;
}
sub logout ($) {
- my ($s) = @_;
+ my ($r) = @_;
- if (my ($nusername, $qassoc) = $s->_check()) {
- $dbh->do("DELETE FROM $s->{S}{assocdb_table}".
- " WHERE associd = ?", {}, $qassoc);
- $dbh->do("COMMIT");
- }
+ 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 username ($) {
- my ($s) = @_;
- return $s->{U};
+ my ($r) = @_;
+ return $r->{Username};
sub hiddenv ($) {
- my ($s) = @_;
- return defined $s->{A} ? $s->{A} : '';
+ my ($r) = @_;
+ return defined $r->{A} ? $r->{A} : '';
}
sub hiddena ($) {
- my ($s) = @_;
- return (-name => $s->{param_name},
- -default => $s->hiddenv());
+ my ($r) = @_;
+ return (-name => $r->{param_name},
+ -default => $r->hiddenv());
}
sub hiddenh ($) {
- my ($s) = @_;
- return hidden($s->hiddena());
+ my ($r) = @_;
+ return hidden($r->hiddena());
}
sub cookieac ($) {
- my ($s) = @_;
- return (-name => $s->{cookie_name},
+ my ($r) = @_;
+ return (-name => $r->{cookie_name},
-value => hiddenv());
~ian / cgi-auth-flexible.git / blobdiff