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=ec44c7a52816469be2e90d18a5892b835a31ec7f;hp=c5530e071886f2f359f106f8cdc8bf09cba1f112;hb=2ef4865c1dd278a4c1226c8cb81416a6fff9e74c;hpb=420e69289e89656d88b551ab7e7aebda12f497b9
diff --git a/cgi-auth-hybrid.pm b/cgi-auth-hybrid.pm
index c5530e0..ec44c7a 100644
--- a/cgi-auth-hybrid.pm
+++ b/cgi-auth-hybrid.pm
@@ -17,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);
@@ -32,7 +38,7 @@ our @EXPORT_OK;
use DBI;
use CGI;
-use Locale::Gettext;
+use Locale::gettext;
#---------- public utilities ----------
@@ -52,7 +58,7 @@ sub flatten_params ($) {
sub has_a_param ($$) {
my ($c,$cn) = @_;
foreach my $pn (@{ $r->{S}{$cn} }) {
- return 1 if $r->_cm('get_param')($pn);
+ return 1 if $r->_cm('get_param',$pn);
}
return 0;
}
@@ -82,6 +88,14 @@ sub construct_cookie ($$$) {
-secure => $r->{S}{encrypted_only});
}
+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) = @_;
my @ha = ('text/html',
@@ -89,7 +103,7 @@ sub do_redirect_cgi ($$$$) {
-location => $new_url);
push @ha, (-cookie => $cookie) if defined $cookie;
$r->_print($c->header(@ha),
- $r->_ch('gen_start_html')($r->_gt('Redirection')),
+ $r->_ch('gen_start_html',$r->_gt('Redirection')),
'',
$r->_gt("If you aren't redirected, click to continue."),
"",
@@ -137,9 +151,9 @@ sub gen_login_link ($$) {
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 => '',
@@ -161,7 +175,8 @@ sub new_verifier {
get_method => sub { $_[0]->request_method() },
get_url => sub { $_[0]->url(); },
is_login => sub { defined $_[1]->_rp('password_param_name') },
- login_ok => sub { die },
+ 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 },
@@ -175,7 +190,6 @@ sub new_verifier {
gen_login_form => \&gen_plain_login_form,
gen_login_link => \&gen_plain_login_link,
gettext => sub { gettext($_[2]); },
- };
},
Dbh => undef,
};
@@ -184,38 +198,45 @@ sub new_verifier {
die "unknown setting $k" unless exists $s->{S}{$k};
$s->{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 $u = umask 077;
- $dbh = DBI->open($s->{S}{assocdb_dsn}, $s->{S}{assocdb_user},
- $s->{S}{assocdb_password}, {
- AutoCommit => 0, RaiseError => 1,
- });
+ $dbh = DBI->connect($v->{S}{assocdb_dsn}, $v->{S}{assocdb_user},
+ $v->{S}{assocdb_password}, {
+ AutoCommit => 0, RaiseError => 1,
+ });
die "${assocdb_dsn} $! ?" unless $dbh;
- $s->{Dbh} = $dbh;
+ $v->{Dbh} = $dbh;
$dbh->do("BEGIN");
eval {
- $dbh->do("CREATE TABLE $s->{S}{assocdb_table} (".
+ $dbh->do("CREATE TABLE $v->{S}{assocdb_table} (".
" associdh VARCHAR PRIMARY KEY,".
" username VARCHAR,".
- " last INTEGER NOT NULL"
+ " last INTEGER NOT NULL".
")");
};
return $dbh;
}
+sub disconnect ($) {
+ my ($v) = @_;
+ my $dbh = $v->{Dbh};
+ return unless $dbh;
+ $dbh->disconnect();
+}
+
#---------- request object methods ----------
sub new_request {
@@ -246,8 +267,8 @@ sub _rp ($$@) {
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 _gt ($$) { 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
@@ -356,8 +377,6 @@ sub _print ($$) { my ($r, @t) = @_; return $r->_ch('print')(join '', @t); }
# fail
sub _check_divert_core ($) {
-fixme needs wrapping with something to make and commit a transaction
-wrapper should also store answers in the $r object for later retrieval
my ($r) = @_;
my $meth = $r->_ch('get_method');
@@ -433,10 +452,10 @@ wrapper should also store answers in the $r object for later retrieval
CookieVal => $parmv,
Params => $r->_chain_params() });
} else {
- return ((Kind => 'LOGIN-FRESH',
- Message => "You need to log in again.",
- CookieVal => $parmv,
- Params => { });
+ return ({ Kind => 'LOGIN-FRESH',
+ Message => "You need to log in again.",
+ CookieVal => $parmv,
+ Params => { } });
}
}
@@ -562,10 +581,10 @@ sub url_with_query_params ($$) {
sub check_ok ($) {
my ($r) = @_;
- my ($divert) = $authreq->check_divert();
+ my ($divert) = $r->check_divert();
return 1 if $divert;
- my $handled = $r->_ch('handle_divert')($divert);
+ my $handled = $r->_ch('handle_divert',$divert);
return 0 if $handled;
my $kind = $divert->{Kind};
@@ -585,7 +604,7 @@ sub check_ok ($) {
}
my $new_url = $r->url_with_query_params($params);
my $cookie = $r->construct_cookie($r, $cookieval);
- $r->_ch('do_redirect')($new_url, $cookie);
+ $r->_ch('do_redirect',$new_url, $cookie);
return 0;
}
@@ -602,7 +621,7 @@ sub check_ok ($) {
die $kind;
}
- $r->_print($r->_ch('start_html')($title),
+ $r->_print($r->_ch('start_html',$title),
@body,
$r->_ch('end_html'));
return 0;