}
our @default_db_setup_stmts =
- ("CREATE TABLE $v->{S}{assocdb_table} (".
+ ("CREATE TABLE $v->{S}{db_prefix}_assocs (".
" 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}".
+ "CREATE INDEX $v->{S}{db_prefix}_assocs_timeout_index".
+ " ON $v->{S}{db_prefix}_assocs".
" (last)"
);
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 => '',
- assocdb_table => 'caf_assocs',
- assocdb_setup_stmts => [@_default_db_setup_statements],
+ db_dsn => undef,
+ db_user => '',
+ db_password => '',
+ db_prefix => 'caf',
+ db_setup_stmts => [@_default_db_setup_statements],
random_source => '/dev/urandom',
secretbits => 128, # bits
hash_algorithm => "SHA-256",
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,
my $dbh = $r->{Dbh};
- $dbh->do("DELETE FROM $r->{S}{assocdb_table}".
+ $dbh->do("DELETE FROM $r->{S}{db_prefix}_assocs".
" WHERE last < ?", {},
time - $r->{S}{login_timeout});
my $row = $dbh->selectrow_arrayref("SELECT username, last".
- " FROM $r->{S}{assocdb_table}".
+ " FROM $r->{S}{db_prefix}_assocs".
" WHERE assochash = ?", {}, $h);
if (defined $row) {
#print STDERR "_identify h=$h s=$s YES @$row\n";
my $dbh = $r->{Dbh};
- $dbh->do("DELETE FROM $r->{S}{assocdb_table}".
+ $dbh->do("DELETE FROM $r->{S}{db_prefix}_assocs".
" WHERE assochash = ?", {}, $h);
}
my ($r,$h,$user) = @_;
$r->_db_revoke($h);
my $dbh = $r->{Dbh};
- $dbh->do("INSERT INTO $r->{S}{assocdb_table}".
+ $dbh->do("INSERT INTO $r->{S}{db_prefix}_assocs".
" (assochash, username, last) VALUES (?,?,?)", {},
$h, $user, time);
}