1 files changed, 30 insertions, 30 deletions

diff --git a/src/sp_session.c b/src/sp_session.c
index b2f4a43..6335838 100644
--- a/src/sp_session.c
+++ b/src/sp_session.c
@@ -1,7 +1,5 @@
 #include "php_snuffleupagus.h"
 
-#if (HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION))
-
 #ifdef ZTS
 static ts_rsrc_id session_globals_id = 0;
 #define SESSION_G(v) ZEND_TSRMG(session_globals_id, php_ps_globals *, v)
@@ -10,7 +8,7 @@ ZEND_TSRMLS_CACHE_EXTERN();
 #endif
 #else
 static php_ps_globals *session_globals = NULL;
-#define SESSION_G(v) (ps_globals.v)
+#define SESSION_G(v) (session_globals->v)
 #endif
 
 static ps_module *s_module;
@@ -24,21 +22,35 @@ static int (*old_s_write)(PS_WRITE_ARGS);
 static int (*previous_sessionRINIT)(INIT_FUNC_ARGS) = NULL;
 static ZEND_INI_MH((*old_OnUpdateSaveHandler)) = NULL;
 
+static void check_sid_length(zend_string *sid) {
+  const sp_config_session *cfg = &(SPCFG(session));
+
+  if (sid) {
+    if (cfg->sid_min_length && ZSTR_LEN(sid) < cfg->sid_min_length) {
+      sp_log_auto("session", cfg->simulation, "Session ID is too short");
+    }
+    if (cfg->sid_max_length && ZSTR_LEN(sid) > cfg->sid_max_length) {
+      sp_log_auto("session", cfg->simulation, "Session ID is too long");
+    }
+  }
+}
+
 static int sp_hook_s_read(PS_READ_ARGS) {
+  const sp_config_session *cfg = &(SPCFG(session));
+  check_sid_length(key);
+
   int r = old_s_read(mod_data, key, val, maxlifetime);
-  const sp_config_session *config_session =
-      SNUFFLEUPAGUS_G(config).config_session;
 
   if ((NULL == val) || (NULL == *val) || (0 == ZSTR_LEN(*val))) {
     return r;
   }
 
-  if (r == SUCCESS && config_session->encrypt) {
+  if (r == SUCCESS && cfg->encrypt) {
     zend_string *orig_val = *val;
     zval val_zval;
     ZVAL_PSTRINGL(&val_zval, ZSTR_VAL(*val), ZSTR_LEN(*val));
 
-    int ret = decrypt_zval(&val_zval, config_session->simulation, NULL);
+    int ret = decrypt_zval(&val_zval, cfg->simulation, NULL);
     if (ZEND_HASH_APPLY_KEEP != ret) {
       zend_bailout();
     }
@@ -51,7 +63,10 @@ static int sp_hook_s_read(PS_READ_ARGS) {
 }
 
 static int sp_hook_s_write(PS_WRITE_ARGS) {
-  if (ZSTR_LEN(val) > 0 && SNUFFLEUPAGUS_G(config).config_session->encrypt) {
+  const sp_config_session *cfg = &(SPCFG(session));
+  check_sid_length(key);
+
+  if (ZSTR_LEN(val) > 0 && cfg->encrypt) {
     zend_string *new_val = encrypt_zval(val);
     return old_s_write(mod_data, key, new_val, maxlifetime);
   }
@@ -104,8 +119,7 @@ static PHP_INI_MH(sp_OnUpdateSaveHandler) {
 
   SESSION_G(mod) = s_original_mod;
 
-  int r = old_OnUpdateSaveHandler(entry, new_value, mh_arg1, mh_arg2, mh_arg3,
-                                  stage);
+  int r = old_OnUpdateSaveHandler(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
 
   sp_hook_session_module();
 
@@ -113,23 +127,16 @@ static PHP_INI_MH(sp_OnUpdateSaveHandler) {
 }
 
 static int sp_hook_session_RINIT(INIT_FUNC_ARGS) {
-  if (SESSION_G(mod) == NULL) {
-    zend_ini_entry *ini_entry;
-    if ((ini_entry = zend_hash_str_find_ptr(
-             EG(ini_directives), ZEND_STRL("session.save_handler")))) {
-      if (ini_entry && ini_entry->value) {
-        sp_OnUpdateSaveHandler(NULL, ini_entry->value, NULL, NULL, NULL, 0);
-      }
-    }
-  }
-  return previous_sessionRINIT(INIT_FUNC_ARGS_PASSTHRU);
+  int ret = previous_sessionRINIT(INIT_FUNC_ARGS_PASSTHRU);
+  sp_hook_session_module();
+  return ret;
 }
 
 void hook_session() {
   zend_module_entry *module;
 
-  if ((module = zend_hash_str_find_ptr(&module_registry,
-                                       ZEND_STRL("session"))) == NULL) {
+  if ((module = zend_hash_str_find_ptr(&module_registry, ZEND_STRL("session"))) == NULL) {
+    sp_log_err("session", "You are trying to use session encryption or session ID restrictions, but your PHP installation has no session support. Please install the PHP session module or recompile PHP with session support.");
     return;  // LCOV_EXCL_LINE
   }
 
@@ -150,8 +157,7 @@ void hook_session() {
   module->request_startup_func = sp_hook_session_RINIT;
 
   zend_ini_entry *ini_entry;
-  if ((ini_entry = zend_hash_str_find_ptr(
-           EG(ini_directives), ZEND_STRL("session.save_handler"))) != NULL) {
+  if ((ini_entry = zend_hash_str_find_ptr(EG(ini_directives), ZEND_STRL("session.save_handler"))) != NULL) {
     old_OnUpdateSaveHandler = ini_entry->on_modify;
     ini_entry->on_modify = sp_OnUpdateSaveHandler;
   }
@@ -159,9 +165,3 @@ void hook_session() {
 
   sp_hook_session_module();
 }
-
-#else
-
-void hook_session() {}
-
-#endif  // HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)