Fix ref to nonpagetype in check_nonpage

[cgi-auth-flexible.git] / cgi-auth-flexible.pm

diff --git a/cgi-auth-flexible.pm b/cgi-auth-flexible.pm
index 940e5dc2223fcbcb47042c84aa02afa22644d66c..613ee90c5609a3ce74cd9cf192dde7c775b433fc 100644 (file)
--- 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 ($$) {
            '</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 ($$$) {
@@ -431,15 +417,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 => '',
-           assocdb_table => 'caf_assocs',
-           assocdb_setup_stmts => [@_default_db_setup_statements],
+           db_dsn => undef,
+           db_user => '',
+           db_password => '',
+           db_prefix => 'caf',
            random_source => '/dev/urandom',
            secretbits => 128, # bits
            hash_algorithm => "SHA-256",
@@ -514,6 +499,17 @@ sub new_verifier {
            exists $verifier->{S}{$k};
        $verifier->{S}{$k} = $v;
     }
+    $verifier->{S}{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)"
+       ];
     bless $verifier, $class;
     $verifier->_dbopen();
     $verifier->_ch('srcdump_prepare');
@@ -536,17 +532,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 +552,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;
@@ -964,12 +960,12 @@ sub _identify ($$) {
 
     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";
@@ -1010,7 +1006,7 @@ sub _db_revoke ($$) {
 
     my $dbh = $r->{Dbh};
 
-    $dbh->do("DELETE FROM $r->{S}{assocdb_table}".
+    $dbh->do("DELETE FROM $r->{S}{db_prefix}_assocs".
             " WHERE assochash = ?", {}, $h);
 }
 
@@ -1018,7 +1014,7 @@ sub _db_record_login_ok ($$$) {
     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);
 }
@@ -1327,9 +1323,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 ----------