cvs: /php4 ChangeLog /php4/ext/session session.c php_session.h mod_files.c

sas Sat Sep 11 13:20:32 1999 EDT Modified files: /php4 ChangeLog /php4/ext/session session.c php_session.h mod_files.c Log: - support for external entropy sources - extern_referer_chk => extern_referer_check - kill a warning in mod_files.c Index: php4/ChangeLog diff -u php4/ChangeLog:1.90 php4/ChangeLog:1.91 --- php4/ChangeLog:1.90 Sat Sep 11 11:04:45 1999 +++ php4/ChangeLog Sat Sep 11 13:20:31 1999 @@ -2,6 +2,8 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ?? 1999, Version 4.0 Beta 3 +- Added support for external entropy sources for session id creation + (on Unices /dev/random and /dev/urandom) (Sascha) - Added gpc_globals variable directive to php.ini. By default it is On, but if it is set to Off, GET, POST and Cookie variables will not be inserted to the global scope. Mostly makes sense when coupled with track_vars (Zeev) Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.40 php4/ext/session/session.c:1.41 --- php4/ext/session/session.c:1.40 Sat Sep 4 07:25:43 1999 +++ php4/ext/session/session.c Sat Sep 11 13:20:31 1999 @@ -28,6 +28,8 @@ #include "win32/time.h" #endif +#include <fcntl.h> + #include "php.h" #include "php_ini.h" #include "SAPI.h" @@ -70,7 +72,9 @@ PHP_INI_ENTRY("session.gc_maxlifetime", "1440", PHP_INI_ALL, NULL) PHP_INI_ENTRY("session.lifetime", "0", PHP_INI_ALL, NULL) PHP_INI_ENTRY("session.serialize_handler", "php", PHP_INI_ALL, NULL) - PHP_INI_ENTRY("session.extern_referer_chk", "", PHP_INI_ALL, NULL) + PHP_INI_ENTRY("session.extern_referer_check", "", PHP_INI_ALL, NULL) + PHP_INI_ENTRY("session.entropy_file", "", PHP_INI_ALL, NULL) + PHP_INI_ENTRY("session.entropy_length", "", PHP_INI_ALL, NULL) PHP_INI_END() PS_SERIALIZER_FUNCS(php); @@ -232,7 +236,6 @@ { zval *retval; zval **ent; - zval *current; char *key; char tmp[128]; ulong idx; @@ -280,7 +283,7 @@ PS(serializer)->decode(val, vallen PSLS_CC); } -static char *_php_create_id(int *newlen) +static char *_php_create_id(int *newlen PSLS_DC) { PHP3_MD5_CTX context; unsigned char digest[16]; @@ -294,6 +297,24 @@ sprintf(buf, "%ld%ld%0.8f", tv.tv_sec, tv.tv_usec, php_combined_lcg() * 10); PHP3_MD5Update(&context, buf, strlen(buf)); + if(PS(entropy_length) > 0) { + int fd; + + fd = open(PS(entropy_file), O_RDONLY); + if(fd >= 0) { + char *p; + int n; + + p = emalloc(PS(entropy_length)); + n = read(fd, p, PS(entropy_length)); + if(n > 0) { + PHP3_MD5Update(&context, p, n); + } + efree(p); + close(fd); + } + } + PHP3_MD5Final(digest, &context); for(i = 0; i < 16; i++) @@ -466,7 +487,7 @@ } if(!PS(id)) { - PS(id) = _php_create_id(NULL); + PS(id) = _php_create_id(NULL PSLS_C); } if(send_cookie) { @@ -739,9 +760,11 @@ zend_hash_init(&PS(vars), 0, NULL, NULL, 0); PS(save_path) = estrdup(INI_STR("session.save_path")); PS(session_name) = estrdup(INI_STR("session.name")); + PS(entropy_file) = estrdup(INI_STR("session.entropy_file")); + PS(entropy_length) = INI_INT("session.entropy_length"); PS(gc_probability) = INI_INT("session.gc_probability"); PS(gc_maxlifetime) = INI_INT("session.gc_maxlifetime"); - PS(extern_referer_chk) = estrdup(INI_STR("extern_referer_chk")); + PS(extern_referer_chk) = estrdup(INI_STR("session.extern_referer_check")); PS(id) = NULL; PS(lifetime) = INI_INT("session.lifetime"); PS(nr_open_sessions) = 0; @@ -752,6 +775,7 @@ { if(PS(mod_data)) PS(mod)->close(&PS(mod_data)); + efree(PS(entropy_file)); efree(PS(extern_referer_chk)); efree(PS(save_path)); efree(PS(session_name)); Index: php4/ext/session/php_session.h diff -u php4/ext/session/php_session.h:1.12 php4/ext/session/php_session.h:1.13 --- php4/ext/session/php_session.h:1.12 Sat Sep 4 04:21:36 1999 +++ php4/ext/session/php_session.h Sat Sep 11 13:20:31 1999 @@ -75,6 +75,8 @@ char *session_name; char *id; char *extern_referer_chk; + char *entropy_file; + int entropy_length; int lifetime; ps_module *mod; void *mod_data; Index: php4/ext/session/mod_files.c diff -u php4/ext/session/mod_files.c:1.15 php4/ext/session/mod_files.c:1.16 --- php4/ext/session/mod_files.c:1.15 Sun Sep 5 15:04:39 1999 +++ php4/ext/session/mod_files.c Sat Sep 11 13:20:31 1999 @@ -33,8 +33,8 @@ #if WIN32||WINNT #define NEEDRDH 1 #include "win32/readdir.h" -#include <time.h> #endif +#include <time.h> #include <fcntl.h>