added old php version check

6 files changed, 18 insertions, 6 deletions

diff --git a/src/php_snuffleupagus.h b/src/php_snuffleupagus.h
index 03c9bb6..8fcbd58 100644
--- a/src/php_snuffleupagus.h
+++ b/src/php_snuffleupagus.h
@@ -127,6 +127,7 @@ bool config_server_encode;
 bool config_server_strip;
 zend_string *config_encryption_key;
 zend_string *config_cookies_env_var;
+bool config_show_old_php_warning;
 
 HashTable *config_disabled_functions;
 HashTable *config_disabled_functions_hooked;
diff --git a/src/snuffleupagus.c b/src/snuffleupagus.c
index c96a911..e3ecd72 100644
--- a/src/snuffleupagus.c
+++ b/src/snuffleupagus.c
@@ -276,6 +276,9 @@ static PHP_INI_MH(OnUpdateConfiguration) {
     return FAILURE;
   }
 
+  // set some defaults
+  SPCFG(show_old_php_warning) = true;
+
   char *str = new_value->val;
 
   while (1) {
@@ -365,6 +368,16 @@ static PHP_INI_MH(OnUpdateConfiguration) {
     (SPCFG(disabled_functions) && zend_hash_num_elements(SPCFG(disabled_functions))) ||
     (SPCFG(disabled_functions) && zend_hash_num_elements(SPCFG(disabled_functions_ret)));
 
+  if (SPCFG(show_old_php_warning)) {
+    time_t ts = time(NULL);
+    sp_log_debug("foo");
+    if (PHP_VERSION_ID < 70300 ||
+        PHP_VERSION_ID < 70400 && ts >= (time_t)1638745200L ||
+        PHP_VERSION_ID < 80000 && ts >= (time_t)1669590000L ||
+        PHP_VERSION_ID < 80100 && ts >= (time_t)1700953200L) {
+      sp_log_warn("End-of-Life Check", "Your PHP version '" PHP_VERSION "' is not officially mainained anymore. Please upgrade as soon as possible.");
+    }
+  }
   return SUCCESS;
 }
 
diff --git a/src/sp_config.h b/src/sp_config.h
index a557105..1a891c1 100644
--- a/src/sp_config.h
+++ b/src/sp_config.h
@@ -262,6 +262,7 @@ typedef struct {
 #define SP_TOKEN_SERVER_STRIP "server_strip"
 #define SP_TOKEN_SID_MIN_LENGTH "sid_min_length"
 #define SP_TOKEN_SID_MAX_LENGTH "sid_max_length"
+#define SP_TOKEN_SHOW_OLD_PHP_WARNING "show_old_php_warning"
 
 // upload_validator
 #define SP_TOKEN_UPLOAD_SCRIPT "script"
diff --git a/src/sp_config_keywords.c b/src/sp_config_keywords.c
index cf44ed9..cbe4966 100644
--- a/src/sp_config_keywords.c
+++ b/src/sp_config_keywords.c
@@ -1,7 +1,7 @@
 #include "php_snuffleupagus.h"
 
 #define SP_SET_ENABLE_DISABLE(enable, disable, varname) \
-  if (((varname) || enable) && disable) { \
+  if (enable && disable) { \
     sp_log_err("config", "A rule can't be enabled and disabled on line %zu", parsed_rule->lineno); \
     return SP_PARSER_ERROR; \
   } \
@@ -133,6 +133,7 @@ SP_PARSE_FN(parse_global) {
       {parse_ulong, SP_TOKEN_MAX_EXECUTION_DEPTH, &(SPCFG(max_execution_depth))},
       {parse_enable, SP_TOKEN_SERVER_ENCODE, &(SPCFG(server_encode))},
       {parse_enable, SP_TOKEN_SERVER_STRIP, &(SPCFG(server_strip))},
+      {parse_enable, SP_TOKEN_SHOW_OLD_PHP_WARNING, &(SPCFG(show_old_php_warning))},
       {0, 0, 0}};
 
   SP_PROCESS_CONFIG_KEYWORDS_ERR();
diff --git a/src/tests/broken_configuration/config/broken_conf_enable_disable2.ini b/src/tests/broken_configuration/config/broken_conf_enable_disable2.ini
index 39d97cc..7ed0c16 100644
--- a/src/tests/broken_configuration/config/broken_conf_enable_disable2.ini
+++ b/src/tests/broken_configuration/config/broken_conf_enable_disable2.ini
@@ -1,2 +1,3 @@
 sp.global_strict.enable();
 sp.global_strict.disable();
+;; this is actually not recognised as broken, as there is no internal third state for 'unset'
diff --git a/src/tests/broken_configuration_php8/broken_conf_enable_disable2.phpt b/src/tests/broken_configuration_php8/broken_conf_enable_disable2.phpt
index efe5538..2446663 100644
--- a/src/tests/broken_configuration_php8/broken_conf_enable_disable2.phpt
+++ b/src/tests/broken_configuration_php8/broken_conf_enable_disable2.phpt
@@ -7,8 +7,3 @@ Global strict mode
 sp.configuration_file={PWD}/../broken_configuration/config/broken_conf_enable_disable2.ini
 --FILE--
 --EXPECTF--
-
-Fatal error: [snuffleupagus][0.0.0.0][config][log] A rule can't be enabled and disabled on line 2 in Unknown on line 0
-
-Fatal error: [snuffleupagus][0.0.0.0][config][log] Invalid configuration file in Unknown on line 0
-Could not startup.