chiark
/
gitweb
/
~ian
/
cgi-auth-flexible.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
368c92e
)
db_setup_stmts: new setting
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 3 Apr 2013 20:52:14 +0000
(21:52 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 3 Apr 2013 20:52:14 +0000
(21:52 +0100)
cgi-auth-flexible.pm
patch
|
blob
|
history
diff --git
a/cgi-auth-flexible.pm
b/cgi-auth-flexible.pm
index 1197f868fa2fce022a5f06b83e661a92360a3626..940e5dc2223fcbcb47042c84aa02afa22644d66c 100644
(file)
--- a/
cgi-auth-flexible.pm
+++ b/
cgi-auth-flexible.pm
@@
-32,7
+32,7
@@
BEGIN {
@EXPORT = qw();
%EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2! ],
@EXPORT = qw();
%EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2! ],
- @EXPORT_OK = qw();
+ @EXPORT_OK = qw(
@default_db_setup_stmts
);
}
our @EXPORT_OK;
}
our @EXPORT_OK;
@@
-202,6
+202,18
@@
sub gen_plain_footer_html ($$) {
'</address>');
}
'</address>');
}
+our @default_db_setup_stmts =
+ ("CREATE TABLE $v->{S}{assocdb_table} (".
+ " assochash VARCHAR PRIMARY KEY,".
+ " username VARCHAR NOT NULL,".
+ " last INTEGER NOT NULL".
+ ")"
+ ,
+ "CREATE INDEX $v->{S}{assocdb_table}_timeout_index".
+ " ON $v->{S}{assocdb_table}".
+ " (last)"
+ );
+
#---------- licence and source code ----------
sub srcdump_dump ($$$) {
#---------- licence and source code ----------
sub srcdump_dump ($$$) {
@@
-427,6
+439,7
@@
sub new_verifier {
assocdb_user => '',
assocdb_password => '',
assocdb_table => 'caf_assocs',
assocdb_user => '',
assocdb_password => '',
assocdb_table => 'caf_assocs',
+ assocdb_setup_stmts => [@_default_db_setup_statements],
random_source => '/dev/urandom',
secretbits => 128, # bits
hash_algorithm => "SHA-256",
random_source => '/dev/urandom',
secretbits => 128, # bits
hash_algorithm => "SHA-256",
@@
-543,14
+556,9
@@
sub _dbopen ($) {
}
$v->{Dbh} = $dbh;
}
$v->{Dbh} = $dbh;
- $v->_db_setup_do("CREATE TABLE $v->{S}{assocdb_table} (".
- " assochash VARCHAR PRIMARY KEY,".
- " username VARCHAR NOT NULL,".
- " last INTEGER NOT NULL".
- ")");
- $v->_db_setup_do("CREATE INDEX $v->{S}{assocdb_table}_timeout_index".
- " ON $v->{S}{assocdb_table}".
- " (last)");
+ foreach my $stmt (@default_db_setup_stmts) {
+ $v->_db_setup_do($stmt);
+ }
return $dbh;
}
return $dbh;
}