X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=cgi-auth-flexible.git;a=blobdiff_plain;f=cgi-auth-flexible.pm;h=8eeea922f0ebd7e5b03347b2b1f44cb8f6d091c5;hp=65a929fda48af18210b7f45c7509298df6353299;hb=3397af1fd7971910021122bf14d481abcf748fef;hpb=d1ac338fe76009ab1f28e8a43665e67d5d2341f6 diff --git a/cgi-auth-flexible.pm b/cgi-auth-flexible.pm index 65a929f..8eeea92 100644 --- a/cgi-auth-flexible.pm +++ b/cgi-auth-flexible.pm @@ -31,8 +31,6 @@ BEGIN { @ISA = qw(Exporter); @EXPORT = qw(); %EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2! ], - - @EXPORT_OK = qw(@default_db_setup_stmts); } our @EXPORT_OK; @@ -202,18 +200,6 @@ sub gen_plain_footer_html ($$) { ''); } -our @default_db_setup_stmts = - ("CREATE TABLE $v->{S}{db_prefix}_assocs (". - " assochash VARCHAR PRIMARY KEY,". - " username VARCHAR NOT NULL,". - " last INTEGER NOT NULL". - ")" - , - "CREATE INDEX $v->{S}{db_prefix}_assocs_timeout_index". - " ON $v->{S}{db_prefix}_assocs". - " (last)" - ); - #---------- licence and source code ---------- sub srcdump_dump ($$$) { @@ -367,6 +353,7 @@ sub srcdump_dirscan_prepare ($$) { }; my %dirsdone; foreach my $item ($v->_ch('srcdump_listitems')) { + next unless defined $item; if ($item eq '.' && $v->{S}{srcdump_filter_cwd}) { my @bad = grep { !m#^/# } values %INC; die "filtering . from srcdump items and \@INC but already". @@ -431,15 +418,14 @@ sub new_verifier { my $verifier = { S => { dir => undef, - assocdb_dbh => undef, # must have AutoCommit=0, RaiseError=1 - assocdb_path => 'caf-assocs.db', + db_dbh => undef, # must have AutoCommit=0, RaiseError=1 + db_path => 'caf.db', keys_path => 'caf-keys', srcdump_path => 'caf-srcdump', - assocdb_dsn => undef, - assocdb_user => '', - assocdb_password => '', + db_dsn => undef, + db_user => '', + db_password => '', db_prefix => 'caf', - assocdb_setup_stmts => [@_default_db_setup_statements], random_source => '/dev/urandom', secretbits => 128, # bits hash_algorithm => "SHA-256", @@ -492,11 +478,11 @@ sub new_verifier { }, srcdump_process_item => \&srcdump_process_item, srcdump_vcs_dirs => [qw(.git .hg .bzr .svn)], - srcdump_vcsscript => [git => " + srcdump_vcsscript => {git => " git ls-files -z git ls-files -z --others --exclude-from=.gitignore find .git -print0 - "], + "}, srcdump_byvcs => \&srcdump_byvcs, srcdump_novcs => \&srcdump_novcs, srcdump_excludes => [qw(*~ *.bak *.tmp), '#*#'], @@ -514,6 +500,17 @@ sub new_verifier { exists $verifier->{S}{$k}; $verifier->{S}{$k} = $v; } + $verifier->{S}{db_setup_stmts} //= + ["CREATE TABLE $verifier->{S}{db_prefix}_assocs (". + " assochash VARCHAR PRIMARY KEY,". + " username VARCHAR NOT NULL,". + " last INTEGER NOT NULL". + ")" + , + "CREATE INDEX $verifier->{S}{db_prefix}_assocs_timeout_index". + " ON $verifier->{S}{db_prefix}_assocs". + " (last)" + ]; bless $verifier, $class; $verifier->_dbopen(); $verifier->_ch('srcdump_prepare'); @@ -536,17 +533,17 @@ sub _dbopen ($) { my $dbh = $v->{Dbh}; return $dbh if $dbh; - $dbh = $v->{S}{assocdb_dbh}; + $dbh = $v->{S}{db_dbh}; if ($dbh) { die if $dbh->{AutoCommit}; die unless $dbh->{RaiseError}; } else { - $v->{S}{assocdb_dsn} ||= "dbi:SQLite:dbname=".$v->_get_path('assocdb'); - my $dsn = $v->{S}{assocdb_dsn}; + $v->{S}{db_dsn} ||= "dbi:SQLite:dbname=".$v->_get_path('db'); + my $dsn = $v->{S}{db_dsn}; my $u = umask 077; - $dbh = DBI->connect($dsn, $v->{S}{assocdb_user}, - $v->{S}{assocdb_password}, { + $dbh = DBI->connect($dsn, $v->{S}{db_user}, + $v->{S}{db_password}, { AutoCommit => 0, RaiseError => 1, ShowErrorStatement => 1, @@ -556,7 +553,7 @@ sub _dbopen ($) { } $v->{Dbh} = $dbh; - foreach my $stmt (@default_db_setup_stmts) { + foreach my $stmt (@{ $v->{S}{db_setup_stmts} }) { $v->_db_setup_do($stmt); } return $dbh; @@ -659,12 +656,14 @@ sub construct_cookie ($$$) { my ($r, $cooks) = @_; return undef unless $cooks; my $c = $r->{Cgi}; -my @ca = (-name => $r->{S}{cookie_name}, - -value => $cooks, - -path => $r->{S}{cookie_path}, - -domain => $r->_ch('get_cookie_domain'), - -expires => '+'.$r->{S}{login_timeout}.'s', - -secure => $r->{S}{encrypted_only}); + my @ca = ( + -name => $r->{S}{cookie_name}, + -value => $cooks, + -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 $cooks $cookie (@ca).\n"; return $cookie; @@ -788,7 +787,7 @@ sub _check_divert_core ($) { die if $srcdump =~ m/\W/; return ({ Kind => 'SRCDUMP-'.uc $srcdump, Message => undef, - CookieSecret => undef, + _CookieRaw => undef, Params => { } }); } @@ -797,7 +796,7 @@ sub _check_divert_core ($) { if ($r->{S}{encrypted_only} && !$r->_ch('is_https')) { return ({ Kind => 'REDIRECT-HTTPS', Message => $r->_gt("Redirecting to secure server..."), - CookieSecret => undef, + _CookieRaw => undef, Params => { } }); } @@ -819,8 +818,10 @@ sub _check_divert_core ($) { $r->_db_revoke($parmh); return ({ Kind => 'REDIRECT-LOGGEDOUT', Message => $r->_gt("Logging out..."), - CookieSecret => '', - Params => { } }); + _CookieRaw => '', + Params => { + $r->{S}{loggedout_param_names}[0] => [ 1 ], + } }); } if ($r->_ch('is_loggedout')) { die unless $meth eq 'GET'; @@ -828,7 +829,7 @@ sub _check_divert_core ($) { die if $parmt; return ({ Kind => 'SMALLPAGE-LOGGEDOUT', Message => $r->_gt("You have been logged out."), - CookieSecret => '', + _CookieRaw => '', Params => { } }); } if ($r->_ch('is_login')) { @@ -839,7 +840,7 @@ sub _check_divert_core ($) { Message => $r->_gt("You do not seem to have cookies". " enabled. You must enable cookies". " as we use them for login."), - CookieSecret => $r->_fresh_secret(), + _CookieRaw => $r->_fresh_secret(), Params => $r->_chain_params() }) } if (!$cookt || $cookt eq 'n' || $cookh ne $parmh) { @@ -847,7 +848,7 @@ sub _check_divert_core ($) { return ({ Kind => 'LOGIN-STALE', Message => $r->_gt("Stale session;". " you need to log in again."), - CookieSecret => $r->_fresh_secret(), + _CookieRaw => $r->_fresh_secret(), Params => { } }) } die unless $parmt eq 't' || $parmt eq 'y'; @@ -857,13 +858,13 @@ sub _check_divert_core ($) { if !$login_errormessage; return ({ Kind => 'LOGIN-BAD', Message => $login_errormessage, - CookieSecret => $cooks, + _CookieRaw => $cooks, Params => $r->_chain_params() }) } $r->_db_record_login_ok($parmh,$username); return ({ Kind => 'REDIRECT-LOGGEDIN', Message => $r->_gt("Logging in..."), - CookieSecret => $cooks, + _CookieRaw => $cooks, Params => $r->_chain_params() }); } if ($cookt eq 't') { @@ -883,13 +884,13 @@ sub _check_divert_core ($) { if ($meth eq 'GET') { return ({ Kind => 'LOGIN-INCOMINGLINK', Message => $r->_gt("You need to log in."), - CookieSecret => $news, + _CookieRaw => $news, Params => $r->_chain_params() }); } else { $r->_db_revoke($parmh); return ({ Kind => 'LOGIN-FRESH', Message => $r->_gt("You need to log in."), - CookieSecret => $news, + _CookieRaw => $news, Params => { } }); } } @@ -898,7 +899,7 @@ sub _check_divert_core ($) { if ($meth ne 'POST') { return ({ Kind => 'MAINPAGEONLY', Message => $r->_gt('Entering via cross-site link.'), - CookieSecret => $cooks, + _CookieRaw => $cooks, Params => { } }); # NB caller must then ignore params & path! # if this is too hard they can spit out a small form @@ -1031,6 +1032,15 @@ sub check_divert ($) { my $dbh = $r->{Dbh}; $r->{Divert} = $r->_db_transaction(sub { $r->_check_divert_core(); }); $dbh->commit(); + + my $cookraw = $r->{_CookieRaw}; + $r->{CookieSecret} = $$cookraw; + if ($cookraw) { + $r->{Params}{$r->{S}{assoc_param_name}} = [ + $r->hash($cookraw) + ]; + } + $r->_debug(Data::Dumper->Dump([$r->{Divert}],[qw(divert)])); return $r->{Divert}; } @@ -1092,7 +1102,6 @@ sub check_ok ($) { # for redirects, we honour stored Params and Cookie, # 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 =~ m/REDIRECT-(?:LOGGEDIN|HTTPS)/) { @@ -1110,10 +1119,6 @@ sub check_ok ($) { return 0; } - if (defined $cookiesecret) { - $params->{$r->{S}{assoc_param_name}} = [ $r->hash($cookiesecret) ]; - } - my ($title, @body); if ($kind =~ m/^LOGIN-/) { $title = $r->_gt('Login'); @@ -1327,9 +1332,9 @@ sub need_add_hidden ($$) { sub check_nonpage ($$) { my ($r, $reqtype) = @_; $r->_assert_checked(); - return unless $r->resource_get_needs_secret_hidden($nonpagetype); + return unless $r->resource_get_needs_secret_hidden($reqtype); return if $r->{ParmT}; - die "missing hidden secret parameter on nonpage request $nonpagetype"; + die "missing hidden secret parameter on nonpage request $reqtype"; } #---------- output ----------