Index: openacs-4/packages/acs-bootstrap-installer/installer/install.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/install.tcl,v
diff -u -r1.13.2.1 -r1.13.2.2
--- openacs-4/packages/acs-bootstrap-installer/installer/install.tcl 14 Aug 2019 07:13:35 -0000 1.13.2.1
+++ openacs-4/packages/acs-bootstrap-installer/installer/install.tcl 16 Nov 2019 15:45:55 -0000 1.13.2.2
@@ -146,7 +146,7 @@
#############
ns_write "Generating secret tokens..."
-populate_secret_tokens_db
+sec_populate_secret_tokens_db
ns_write "
Done.
"
##############
Index: openacs-4/packages/acs-tcl/acs-tcl.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/acs-tcl.info,v
diff -u -r1.95.2.5 -r1.95.2.6
--- openacs-4/packages/acs-tcl/acs-tcl.info 8 Oct 2019 16:28:28 -0000 1.95.2.5
+++ openacs-4/packages/acs-tcl/acs-tcl.info 16 Nov 2019 15:45:55 -0000 1.95.2.6
@@ -9,7 +9,7 @@
f
t
-
+
OpenACS
The Kernel Tcl API library.
2017-08-06
@@ -18,8 +18,8 @@
GPL version 2
3
-
-
+
+
Index: openacs-4/packages/acs-tcl/tcl/security-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-init.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/acs-tcl/tcl/security-init.tcl 7 Aug 2017 23:47:59 -0000 1.6
+++ openacs-4/packages/acs-tcl/tcl/security-init.tcl 16 Nov 2019 15:45:55 -0000 1.6.2.1
@@ -17,13 +17,13 @@
set secret_tokens_exists [db_string secret_tokens_exists {select decode(count(*),0,0,1) from secret_tokens}]
if { $secret_tokens_exists == 0 } {
- populate_secret_tokens_db
+ sec_populate_secret_tokens_db
}
ns_log Notice "security-init.tcl: Creating secret_tokens ns_cache..."
ns_cache create secret_tokens -size 65536
ns_log Notice "security-init.tcl: Populating secret_tokens ns_cache..."
-populate_secret_tokens_cache
+sec_populate_secret_tokens_cache
# These procedures are dynamically defined so that parameter::get
# does not need to be called directly in the RP.
Index: openacs-4/packages/acs-tcl/tcl/security-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs-oracle.xql,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/acs-tcl/tcl/security-procs-oracle.xql 20 Nov 2017 15:36:44 -0000 1.9
+++ openacs-4/packages/acs-tcl/tcl/security-procs-oracle.xql 16 Nov 2019 15:45:55 -0000 1.9.2.1
@@ -3,7 +3,7 @@
oracle8.1.6
-
+
insert /*+ APPEND */ into secret_tokens(token_id, token, token_timestamp)
@@ -13,7 +13,7 @@
-
+
select * from (
Index: openacs-4/packages/acs-tcl/tcl/security-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs-postgresql.xql,v
diff -u -r1.14 -r1.14.2.1
--- openacs-4/packages/acs-tcl/tcl/security-procs-postgresql.xql 20 Nov 2017 15:36:44 -0000 1.14
+++ openacs-4/packages/acs-tcl/tcl/security-procs-postgresql.xql 16 Nov 2019 15:45:55 -0000 1.14.2.1
@@ -21,7 +21,7 @@
-
+
insert into secret_tokens(token_id, token, token_timestamp)
@@ -31,7 +31,7 @@
-
+
select token_id, token
Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v
diff -u -r1.126.2.21 -r1.126.2.22
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl 13 Nov 2019 17:04:40 -0000 1.126.2.21
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl 16 Nov 2019 15:45:55 -0000 1.126.2.22
@@ -1546,7 +1546,7 @@
if { [info exists $key] } { return [set $key] }
if {[array size ::security::tcl_secret_tokens] == 0} {
- populate_secret_tokens_thread_cache
+ sec_populate_secret_tokens_thread_cache
if { [info exists $key] } { return [set $key] }
}
@@ -1579,30 +1579,30 @@
#set list_of_names [ns_cache names secret_tokens]
set list_of_names [array names ::security::tcl_secret_tokens]
if {[llength $list_of_names] == 0} {
- populate_secret_tokens_thread_cache
+ sec_populate_secret_tokens_thread_cache
set list_of_names [array names ::security::tcl_secret_tokens]
}
set random_seed [ns_rand [llength $list_of_names]]
return [lindex $list_of_names $random_seed]
}
-ad_proc -private populate_secret_tokens_thread_cache {} {
+ad_proc -private sec_populate_secret_tokens_thread_cache {} {
Copy secret_tokens cache to per-thread variables
} {
set ids [ns_cache names secret_tokens]
if {[llength $ids] == 0} {
- populate_secret_tokens_cache
+ sec_populate_secret_tokens_cache
set ids [ns_cache names secret_tokens]
}
foreach name $ids {
set ::security::tcl_secret_tokens($name) [ns_cache get secret_tokens $name]
}
}
-ad_proc -private populate_secret_tokens_cache {} {
+ad_proc -private sec_populate_secret_tokens_cache {} {
Randomly populates the secret_tokens cache.
@@ -1623,7 +1623,7 @@
db_release_unused_handles
}
-ad_proc -private populate_secret_tokens_db {} {
+ad_proc -private sec_populate_secret_tokens_db {} {
Populates the secret_tokens table. Note that this will take a while
to run.