From 504f02992ace82a5520bc0ca43d9562c077a06e4 Mon Sep 17 00:00:00 2001 From: Thibault "bui" Koechlin Date: Sat, 31 Aug 2019 15:32:36 +0200 Subject: Support direct syslog logging Add the possibility to log directly into the syslog, instead of using php's log system.--- doc/source/config.rst | 18 ++++++++++++++++++ src/php_snuffleupagus.h | 1 + src/sp_config.c | 1 + src/sp_config.h | 4 ++++ src/sp_config_keywords.c | 19 +++++++++++++++++++ src/sp_config_keywords.h | 1 + src/sp_utils.c | 19 ++++++++++++++++++- .../broken_conf_invalid_log_media.phpt | 14 ++++++++++++++ .../config/broken_conf_invalid_log_media.ini | 1 + 9 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 src/tests/broken_configuration/broken_conf_invalid_log_media.phpt create mode 100644 src/tests/broken_configuration/config/broken_conf_invalid_log_media.ini diff --git a/doc/source/config.rst b/doc/source/config.rst index 89e063f..4be8db7 100644 --- a/doc/source/config.rst +++ b/doc/source/config.rst @@ -81,6 +81,24 @@ This configuration variable contains parameters that are used by multiple featur - ``cookie_env_var``: A environment variable used as part of cookies encryption. See the :ref:`relevant documentation ` +log_media +^^^^^^^^^ + +This configuration variable allows to specify how logs should be written, +either via ``php`` or ``syslog``. + +:: + + sp.log_media("php"); + sp.log_media("syslog"); + +The default value for ``sp.log_media`` is ``php``, to respect the `principle of +least astonishment +`__. But since +it's `possible to modify php's logging system via php +`__, it's +heavily recommended to use the ``syslog`` option instead. + Bugclass-killer features ------------------------ diff --git a/src/php_snuffleupagus.h b/src/php_snuffleupagus.h index 43131fe..1c45653 100644 --- a/src/php_snuffleupagus.h +++ b/src/php_snuffleupagus.h @@ -22,6 +22,7 @@ #include #include #include +#include #include "SAPI.h" #include "ext/session/php_session.h" diff --git a/src/sp_config.c b/src/sp_config.c index 25223f2..69730e3 100644 --- a/src/sp_config.c +++ b/src/sp_config.c @@ -9,6 +9,7 @@ size_t sp_line_no; sp_config_tokens const sp_func[] = { {.func = parse_unserialize, .token = SP_TOKEN_UNSERIALIZE_HMAC}, {.func = parse_random, .token = SP_TOKEN_HARDEN_RANDOM}, + {.func = parse_log_media, .token = SP_TOKEN_LOG_MEDIA}, {.func = parse_disabled_functions, .token = SP_TOKEN_DISABLE_FUNC}, {.func = parse_readonly_exec, .token = SP_TOKEN_READONLY_EXEC}, {.func = parse_global_strict, .token = SP_TOKEN_GLOBAL_STRICT}, diff --git a/src/sp_config.h b/src/sp_config.h index 9d58359..b06e8be 100644 --- a/src/sp_config.h +++ b/src/sp_config.h @@ -28,6 +28,8 @@ typedef enum { SP_PHP_TYPE_REFERENCE = IS_REFERENCE } sp_php_type; +typedef enum { SP_ZEND = 0, SP_SYSLOG = 1 } sp_log_media; + typedef struct { int ip_version; union { @@ -175,6 +177,7 @@ typedef struct { sp_config_wrapper *config_wrapper; sp_config_session *config_session; bool hook_execute; + char log_media; HashTable *config_disabled_functions; HashTable *config_disabled_functions_hooked; @@ -260,6 +263,7 @@ typedef struct { // Global configuration options #define SP_TOKEN_ENCRYPTION_KEY ".secret_key(" #define SP_TOKEN_ENV_VAR ".cookie_env_var(" +#define SP_TOKEN_LOG_MEDIA ".log_media(" // upload_validator #define SP_TOKEN_UPLOAD_SCRIPT ".script(" diff --git a/src/sp_config_keywords.c b/src/sp_config_keywords.c index abb3110..aebe45c 100644 --- a/src/sp_config_keywords.c +++ b/src/sp_config_keywords.c @@ -83,6 +83,25 @@ int parse_random(char *line) { NULL); } +int parse_log_media(char *line) { + size_t consumed = 0; + zend_string *value = + get_param(&consumed, line, SP_TYPE_STR, SP_TOKEN_LOG_MEDIA); + + if (value) { + if (!strcmp(ZSTR_VAL(value), "php")) { + SNUFFLEUPAGUS_G(config).log_media = SP_ZEND; + return 0; + } else if (!strcmp(ZSTR_VAL(value), "syslog")) { + SNUFFLEUPAGUS_G(config).log_media = SP_SYSLOG; + return 0; + } + } + sp_log_err("config", "%s) only supports 'syslog' or 'php', on line %zu", + SP_TOKEN_LOG_MEDIA, sp_line_no); + return -1; +} + int parse_sloppy_comparison(char *line) { return parse_enable(line, &(SNUFFLEUPAGUS_G(config).config_sloppy->enable), NULL); diff --git a/src/sp_config_keywords.h b/src/sp_config_keywords.h index ab58456..a279cc9 100644 --- a/src/sp_config_keywords.h +++ b/src/sp_config_keywords.h @@ -17,5 +17,6 @@ int parse_eval_whitelist(char *line); int parse_session(char *line); int parse_sloppy_comparison(char *line); int parse_wrapper_whitelist(char *line); +int parse_log_media(char *line); #endif // __SP_CONFIG_KEYWORDS_H diff --git a/src/sp_utils.c b/src/sp_utils.c index 7641808..5ddf0b9 100644 --- a/src/sp_utils.c +++ b/src/sp_utils.c @@ -15,7 +15,24 @@ void sp_log_msg(char const* feature, int type, const char* fmt, ...) { vspprintf(&msg, 0, fmt, args); va_end(args); - zend_error(type, "[snuffleupagus][%s] %s", feature, msg); + switch (SNUFFLEUPAGUS_G(config).log_media) { + case SP_SYSLOG: + openlog(PHP_SNUFFLEUPAGUS_EXTNAME, LOG_PID, LOG_AUTH); + const char* error_filename = zend_get_executed_filename(); + int syslog_level = SP_LOG_DROP ? LOG_ERR : LOG_INFO; + int error_lineno = zend_get_executed_lineno(TSRMLS_C); + syslog(syslog_level, "[%s] %s in %s on line %d", feature, msg, + error_filename, error_lineno); + closelog(); + if (type == SP_LOG_DROP) { + zend_bailout(); + } + break; + case SP_ZEND: + default: + zend_error(type, "[snuffleupagus][%s] %s", feature, msg); + break; + } } int compute_hash(const char* const filename, char* file_hash) { diff --git a/src/tests/broken_configuration/broken_conf_invalid_log_media.phpt b/src/tests/broken_configuration/broken_conf_invalid_log_media.phpt new file mode 100644 index 0000000..bcf7c01 --- /dev/null +++ b/src/tests/broken_configuration/broken_conf_invalid_log_media.phpt @@ -0,0 +1,14 @@ +--TEST-- +Broken configuration filename with improper log media +--SKIPIF-- + +--INI-- +sp.configuration_file={PWD}/config/broken_conf_invalid_log_media.ini +--FILE-- +--EXPECTF-- +PHP Fatal error: [snuffleupagus][config] .log_media() only supports 'syslog' or 'php', on line 1 in Unknown on line 0 + +Fatal error: [snuffleupagus][config] .log_media() only supports 'syslog' or 'php', on line 1 in Unknown on line 0 + +Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Could not startup. diff --git a/src/tests/broken_configuration/config/broken_conf_invalid_log_media.ini b/src/tests/broken_configuration/config/broken_conf_invalid_log_media.ini new file mode 100644 index 0000000..9e7cea0 --- /dev/null +++ b/src/tests/broken_configuration/config/broken_conf_invalid_log_media.ini @@ -0,0 +1 @@ +sp.log_media("pouet"); -- cgit v1.3 From 6347fa7afa8936ad53c108f15a2ea6ccacd812fb Mon Sep 17 00:00:00 2001 From: jvoisin Date: Wed, 16 Oct 2019 00:52:50 +0200 Subject: Fix the default configuration ini_[sg]et first parameter is actually varname, and not var_name. Thanks to @gergo314 for flagging this! --- config/default.rules | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/config/default.rules b/config/default.rules index 82f8b5d..dc749e5 100644 --- a/config/default.rules +++ b/config/default.rules @@ -66,16 +66,16 @@ sp.disable_function.function("exec").param("command").value_r("[$|;&`\\n\\(\\)\\ sp.disable_function.function("proc_open").param("command").value_r("[$|;&`\\n\\(\\)\\\\]").drop(); # Prevent runtime modification of interesting things -sp.disable_function.function("ini_set").param("var_name").value("assert.active").drop(); -sp.disable_function.function("ini_set").param("var_name").value("zend.assertions").drop(); -sp.disable_function.function("ini_set").param("var_name").value("memory_limit").drop(); -sp.disable_function.function("ini_set").param("var_name").value("include_path").drop(); -sp.disable_function.function("ini_set").param("var_name").value("open_basedir").drop(); +sp.disable_function.function("ini_set").param("varname").value("assert.active").drop(); +sp.disable_function.function("ini_set").param("varname").value("zend.assertions").drop(); +sp.disable_function.function("ini_set").param("varname").value("memory_limit").drop(); +sp.disable_function.function("ini_set").param("varname").value("include_path").drop(); +sp.disable_function.function("ini_set").param("varname").value("open_basedir").drop(); # Detect some backdoors via environnement recon -sp.disable_function.function("ini_get").param("var_name").value("allow_url_fopen").drop(); -sp.disable_function.function("ini_get").param("var_name").value("open_basedir").drop(); -sp.disable_function.function("ini_get").param("var_name").value_r("suhosin").drop(); +sp.disable_function.function("ini_get").param("varname").value("allow_url_fopen").drop(); +sp.disable_function.function("ini_get").param("varname").value("open_basedir").drop(); +sp.disable_function.function("ini_get").param("varname").value_r("suhosin").drop(); sp.disable_function.function("function_exists").param("function_name").value("eval").drop(); sp.disable_function.function("function_exists").param("function_name").value("exec").drop(); sp.disable_function.function("function_exists").param("function_name").value("system").drop(); -- cgit v1.3 From 484eb1b1039df425db46e16569aa68d74b5898b8 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Tue, 22 Oct 2019 22:51:59 +0200 Subject: Revamp a bit the FAQ --- doc/source/faq.rst | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/doc/source/faq.rst b/doc/source/faq.rst index d8ca973..4974c70 100644 --- a/doc/source/faq.rst +++ b/doc/source/faq.rst @@ -41,20 +41,18 @@ Who are you and why did you write Snuffleupagus? We're working for `NBS System `__, a web hosting company (meaning that we're dealing with PHP code all day long), -with a strong focus on security. We do have hardening +with a strong focus on security. We do have several layers of hardening (`kernel `_, `WAF `_, -`IDS `_, etc) -below the web stack, but most of the time, when a website is compromised, -it can be to send ads, spam, deface it, steal data etc. -This is why we need to harden the website itself too, but we can't touch its -source code. +`IDS `_, etc), +but we had nothing for PHP7. + Why not Suhosin? """""""""""""""" We're huge fans of `Suhosin `_, unfortunately: -- it doesn't work very well on PHP 7 +- it doesn't work very well on PHP7 - it has some oudated features and misses new ones - it doesn't cope very well with our various industrialization needs - it has some shortcomings by design @@ -65,10 +63,11 @@ the `system `_ and is developed by the fine people from `NBS System `__. @@ -77,6 +76,18 @@ We chose the LGPL because we don't care that much how you're using Snuffleupagus but we'd like to force people to make their improvements/contributions available to everyone. + +What is the different between SNuffleupaugs and a (WAF) like ModSecurity? +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" + +`ModSecurity `__ and the other `Web Application +Firewall (WAF) `__ are +working by inspecting the http traffic. Snuffleupagus being a PHP module, is +operating directly inside your website's code, with a lesser overhead, as well +as a better understanding of what is currently happening inside your +application. + + Should I use Snuffleupagus? """"""""""""""""""""""""""" @@ -113,6 +124,18 @@ is still a security issue, and should be treated as such. We don't have the pretension to state that Snuffleupagus will magically solve all your security issues, but we believe that it might definitely help. + +Sounds great, but is it working? +"""""""""""""""""""""""""""""""" + +We've been using it in production since a couple of years, and it thwarted +numerous known and unknown attacks. If you want some evidences, one of the +developer published in June 2019 a `blogpost +`__ +showcasing how efficient Snuffleupagus was versus *major* web +vulnerabilities from 2018/2019. + + Why should I send you bugs, security issues and patches? """"""""""""""""""""""""""""""""""""""""""""""""""""""""" Snuffleupagus is an open-source security software, by reporting (or fixing) -- cgit v1.3 From cb0f3890af39babaed06ca89a0a754e78babe341 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Thu, 24 Oct 2019 20:42:29 +0200 Subject: Update the "papers" section of the documentation --- doc/source/papers.rst | 64 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 51 insertions(+), 13 deletions(-) diff --git a/doc/source/papers.rst b/doc/source/papers.rst index 5382012..be99ddb 100644 --- a/doc/source/papers.rst +++ b/doc/source/papers.rst @@ -6,30 +6,68 @@ This pages lists various mentions, articles, usages and presentations about Snuf Talks ----- -- `BerlinSide0x08 `_ - `slides `__ - 2017-05-28 -- `Hack.lu 2017 `_ - `slides `__ - `video `__ - 2017-10-18 -- `BlackAlps `_ - `slides `__ - `video `__ - 2017-11-16 -- `Pass the Salt `_ - `slides `__ - `video `__ - 2018-07-03 -- `44con `__ - `slides `__ - 2018-09-12 +2017 +"""" + +- `BerlinSide0x08 `_ - `slides `__ +- `Hack.lu 2017 `_ - `slides `__ - `video `__ +- `BlackAlps `_ - `slides `__ - `video `__ + +2018 +"""" + +- `Pass the Salt `_ - `slides `__ - `video `__ +- `44con `__ - `slides `__ Mentions -------- -- `Intrinsec's blog - Hack.lu 2017 `__ (fr) - 2017-10-20 +2017 +"""" + +- `Habr - PHP-Дайджест № 118 – свежие новости, материалы и инструменты `__ (ru) - Habr +- `Intrinsec's blog - Hack.lu 2017 `__ (fr) - Intrinsec's blog - `Paragon Initiative Enterprises Blog - The 2018 Guide to Building Secure PHP Software `__ - 2017-12-12 -- `PhpStorm's blog - PHP Annotated Monthly `__ - 2018-08-31 + +2018 +"""" + +- `Habr - PHP-Дайджест № 138 `__ (ru) - Habr +- `PhpStorm's blog - PHP Annotated Monthly `__ - PhpStorm's blog + +2019 +"""" + +- `PhpStorm's blog - PHP Annotated `__ - PhpStorm's blog +- `Habr - PHP-Дайджест № 160 `__ (ru) - Habr Articles -------- -- `Killing php bug classes at berlinsides `_ - 2017-06-05 -- `Snuffleu…what? `_ - 2017-10-07 -- `How to harden AdwCleaner’s web backend using PHP `__ - 2017-12-06 -- `First release of Snuffleupagus `__ - 2017-12-21 -- `Snuffleupagus 0.3.0 - Dentalium elephantinum `__ - 2018-07-18 -- `Snuffleupagus version 0.3.0 - Dentalium elephantinum `__ (fr) - 2018-07-18 + +2017 +"""" + +- `Killing php bug classes at berlinsides `__ - dustri.org +- `Snuffleu…what? `__ - fr33tux.org +- `Behold the Snuffleupagus `__ - memze.ro +- `How to harden AdwCleaner’s web backend using PHP `__ - Malwarebyte's blog +- `First release of Snuffleupagus `__ - dustri.org + +2018 +"""" + +- `Snuffleupagus 0.3.0 - Dentalium elephantinum `__ - dustri.org +- `Snuffleupagus version 0.3.0 - Dentalium elephantinum `__ (fr) - LinuxFr + +2019 +"""" + +- `Проект Snuffleupagus развивает PHP-модуль для блокирования уязвимостей `__ (ru) - opennet.ru +- `What the f*ck is a Snuffleupagus? `__ - Living The Dream +- `Snuffleupagus: Open source security tool hardens PHP sites against cyber-attacks `__ - The Daily Swig Papers -- cgit v1.3 From 93cc22bfb57fc881889165ead1adc94dda30dfc4 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Thu, 24 Oct 2019 20:51:56 +0200 Subject: Improve a bit the compatibility with php8 - Apparently, TSRMLS_C and TSRMLS_FETCH aren't defined anymore, so we have to manually define them to nothing - PHP8 constified a bit some strings, which is great, so we should do the same to avoid warnings --- src/php_snuffleupagus.h | 4 ++++ src/sp_sloppy.c | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/src/php_snuffleupagus.h b/src/php_snuffleupagus.h index 1c45653..0141a87 100644 --- a/src/php_snuffleupagus.h +++ b/src/php_snuffleupagus.h @@ -53,6 +53,10 @@ #if PHP_VERSION_ID < 70200 typedef void (*zif_handler)(INTERNAL_FUNCTION_PARAMETERS); #endif +#if PHP_VERSION_ID >= 80000 +#define TSRMLS_FETCH() +#define TSRMLS_C +#endif #include "sp_pcre_compat.h" #include "sp_list.h" diff --git a/src/sp_sloppy.c b/src/sp_sloppy.c index 5837783..88052bb 100644 --- a/src/sp_sloppy.c +++ b/src/sp_sloppy.c @@ -2,8 +2,13 @@ ZEND_API zend_op_array* (*orig_zend_compile_file)(zend_file_handle* file_handle, int type) = NULL; +#if PHP_VERSION_ID >= 80000 +ZEND_API zend_op_array* (*orig_zend_compile_string)(zval* source_string, + const char* filename) = NULL; +#else ZEND_API zend_op_array* (*orig_zend_compile_string)(zval* source_string, char* filename) = NULL; +#endif static void modify_opcode(zend_op_array* opline) { if (NULL != opline) { -- cgit v1.3 From b1a4af56f09a9469eeaf006480804451e60fe411 Mon Sep 17 00:00:00 2001 From: kkadosh Date: Sun, 3 Nov 2019 14:49:03 +0100 Subject: Log ip addresses --- .gitignore | 7 +++++++ src/sp_utils.c | 8 ++++++-- src/tests/broken_configuration/broken_conf.phpt | 6 +++--- src/tests/broken_configuration/broken_conf2.phpt | 6 +++--- .../broken_conf_allow_broken_disabled.phpt | 6 +++--- .../broken_configuration/broken_conf_allow_broken_enabled.phpt | 4 ++-- src/tests/broken_configuration/broken_conf_config_regexp.phpt | 10 +++++----- .../broken_conf_config_regexp_no_closing_paren.phpt | 10 +++++----- .../broken_conf_cookie_encryption_without_encryption_key.phpt | 6 +++--- .../broken_conf_cookie_encryption_without_env_var.phpt | 6 +++--- .../broken_conf_cookie_name_and_regexp.phpt | 6 +++--- src/tests/broken_configuration/broken_conf_enable_disable.phpt | 6 +++--- src/tests/broken_configuration/broken_conf_eval.phpt | 6 +++--- src/tests/broken_configuration/broken_conf_expecting_bool.phpt | 6 +++--- src/tests/broken_configuration/broken_conf_invalid_cidr.phpt | 6 +++--- src/tests/broken_configuration/broken_conf_invalid_cidr6.phpt | 6 +++--- .../broken_conf_invalid_cidr6_no_slash.phpt | 6 +++--- .../broken_configuration/broken_conf_invalid_cidr_value.phpt | 10 +++++----- .../broken_configuration/broken_conf_invalid_filename.phpt | 6 +++--- .../broken_configuration/broken_conf_invalid_log_media.phpt | 6 +++--- src/tests/broken_configuration/broken_conf_invalid_type.phpt | 6 +++--- src/tests/broken_configuration/broken_conf_key_value.phpt | 6 +++--- .../broken_configuration/broken_conf_line_empty_string.phpt | 6 +++--- .../broken_configuration/broken_conf_line_no_closing.phpt | 6 +++--- src/tests/broken_configuration/broken_conf_local_var_1.phpt | 10 +++++----- src/tests/broken_configuration/broken_conf_local_var_10.phpt | 10 +++++----- src/tests/broken_configuration/broken_conf_local_var_11.phpt | 10 +++++----- src/tests/broken_configuration/broken_conf_local_var_12.phpt | 6 +++--- src/tests/broken_configuration/broken_conf_local_var_13.phpt | 10 +++++----- src/tests/broken_configuration/broken_conf_local_var_14.phpt | 10 +++++----- src/tests/broken_configuration/broken_conf_local_var_15.phpt | 10 +++++----- src/tests/broken_configuration/broken_conf_local_var_16.phpt | 10 +++++----- src/tests/broken_configuration/broken_conf_local_var_2.phpt | 10 +++++----- src/tests/broken_configuration/broken_conf_local_var_3.phpt | 10 +++++----- src/tests/broken_configuration/broken_conf_local_var_4.phpt | 10 +++++----- src/tests/broken_configuration/broken_conf_local_var_5.phpt | 10 +++++----- src/tests/broken_configuration/broken_conf_local_var_6.phpt | 10 +++++----- src/tests/broken_configuration/broken_conf_local_var_7.phpt | 10 +++++----- src/tests/broken_configuration/broken_conf_local_var_8.phpt | 10 +++++----- src/tests/broken_configuration/broken_conf_local_var_9.phpt | 10 +++++----- src/tests/broken_configuration/broken_conf_lots_of_quotes.phpt | 6 +++--- src/tests/broken_configuration/broken_conf_missing_script.phpt | 6 +++--- .../broken_configuration/broken_conf_mutually_exclusive.phpt | 4 ++-- .../broken_configuration/broken_conf_mutually_exclusive10.phpt | 6 +++--- .../broken_configuration/broken_conf_mutually_exclusive11.phpt | 6 +++--- .../broken_configuration/broken_conf_mutually_exclusive12.phpt | 6 +++--- .../broken_configuration/broken_conf_mutually_exclusive2.phpt | 4 ++-- .../broken_configuration/broken_conf_mutually_exclusive3.phpt | 4 ++-- .../broken_configuration/broken_conf_mutually_exclusive4.phpt | 6 +++--- .../broken_configuration/broken_conf_mutually_exclusive5.phpt | 4 ++-- .../broken_configuration/broken_conf_mutually_exclusive6.phpt | 6 +++--- .../broken_configuration/broken_conf_mutually_exclusive7.phpt | 6 +++--- .../broken_configuration/broken_conf_mutually_exclusive8.phpt | 6 +++--- .../broken_configuration/broken_conf_mutually_exclusive9.phpt | 6 +++--- .../broken_configuration/broken_conf_no_cookie_action.phpt | 6 +++--- src/tests/broken_configuration/broken_conf_no_cookie_name.phpt | 6 +++--- .../broken_configuration/broken_conf_no_file_specified.phpt | 2 +- .../broken_configuration/broken_conf_nonexisting_script.phpt | 6 +++--- src/tests/broken_configuration/broken_conf_quotes.phpt | 10 +++++----- src/tests/broken_configuration/broken_conf_readonly_exec.phpt | 6 +++--- src/tests/broken_configuration/broken_conf_samesite.phpt | 6 +++--- .../broken_configuration/broken_conf_session_encryption.phpt | 6 +++--- .../broken_conf_session_encryption_without_encryption_key.phpt | 6 +++--- .../broken_conf_session_encryption_without_env_var.phpt | 6 +++--- .../broken_configuration/broken_conf_shown_in_phpinfo.phpt | 10 +++++----- src/tests/broken_configuration/broken_conf_truncated.phpt | 6 +++--- src/tests/broken_configuration/broken_conf_unserialize.phpt | 6 +++--- .../broken_configuration/broken_conf_upload_validation.phpt | 6 +++--- src/tests/broken_configuration/broken_conf_weird_keyword.phpt | 6 +++--- .../broken_configuration/broken_conf_wrapper_whitelist.phpt | 6 +++--- src/tests/broken_configuration/broken_conf_wrong_quotes.phpt | 6 +++--- src/tests/broken_configuration/broken_conf_wrong_type.phpt | 6 +++--- src/tests/broken_configuration/broken_invalid_client_ip4.phpt | 2 +- src/tests/broken_configuration/broken_regexp.phpt | 10 +++++----- src/tests/broken_configuration/broken_unmatching_brackets.phpt | 10 +++++----- .../encrypt_regexp_cookies_bad_regexp.phpt | 6 +++--- src/tests/cookies_encryption/encrypt_cookies_empty_env.phpt | 4 ++-- .../cookies_encryption/encrypt_cookies_invalid_decryption.phpt | 2 +- .../encrypt_cookies_invalid_decryption2.phpt | 2 +- .../encrypt_cookies_invalid_decryption_short_cookie.phpt | 2 +- .../encrypt_cookies_invalid_decryption_simulation.phpt | 2 +- .../cookies_encryption/encrypt_regexp_cookies_empty_env.phpt | 2 +- .../encrypt_regexp_cookies_invalid_decryption.phpt | 2 +- .../encrypt_regexp_cookies_invalid_decryption2.phpt | 2 +- .../cookies_encryption_warning/encrypt_cookies_no_env.phpt | 4 ++-- .../cookies_encryption_warning/encrypt_cookies_no_key.phpt | 4 ++-- .../encrypt_regexp_cookies_no_env.phpt | 4 ++-- .../encrypt_regexp_cookies_no_key.phpt | 4 ++-- src/tests/deny_writable/deny_writable_execution.phpt | 2 +- .../deny_writable/deny_writable_execution_simulation.phpt | 6 +++--- src/tests/disable_function/disabled_function_echo.phpt | 2 +- src/tests/disable_function/disabled_function_echo_2.phpt | 2 +- .../disable_function/disabled_function_echo_local_var.phpt | 2 +- .../disabled_function_ensure_client_valid_certs.phpt | 2 +- ...d_function_ensure_client_valid_certs_curl_multi_setopt.phpt | 2 +- ...d_function_ensure_client_valid_certs_curl_setopt_array.phpt | 2 +- .../disabled_function_ensure_server_valid_certs.phpt | 2 +- ...d_function_ensure_server_valid_certs_curl_multi_setopt.phpt | 2 +- ...d_function_ensure_server_valid_certs_curl_setopt_array.phpt | 2 +- src/tests/disable_function/disabled_function_local_var.phpt | 2 +- src/tests/disable_function/disabled_function_local_var_10.phpt | 2 +- src/tests/disable_function/disabled_function_local_var_2.phpt | 2 +- src/tests/disable_function/disabled_function_local_var_3.phpt | 2 +- src/tests/disable_function/disabled_function_local_var_4.phpt | 2 +- src/tests/disable_function/disabled_function_local_var_5.phpt | 2 +- src/tests/disable_function/disabled_function_local_var_6.phpt | 2 +- src/tests/disable_function/disabled_function_local_var_7.phpt | 2 +- src/tests/disable_function/disabled_function_local_var_8.phpt | 2 +- src/tests/disable_function/disabled_function_local_var_9.phpt | 2 +- .../disable_function/disabled_function_local_var_const.phpt | 2 +- .../disable_function/disabled_function_local_var_obj.phpt | 2 +- src/tests/disable_function/disabled_function_param.phpt | 2 +- src/tests/disable_function/disabled_function_print.phpt | 2 +- .../disable_function/disabled_function_super_global_var.phpt | 2 +- src/tests/disable_function/disabled_functions.phpt | 2 +- .../disabled_functions_callback_called_file_r.phpt | 2 +- .../disable_function/disabled_functions_called_file_r.phpt | 2 +- src/tests/disable_function/disabled_functions_chain.phpt | 2 +- .../disabled_functions_chain_call_user_func.phpt | 2 +- .../disabled_functions_chain_call_user_func_ret.phpt | 2 +- src/tests/disable_function/disabled_functions_cidr.phpt | 2 +- src/tests/disable_function/disabled_functions_cidr_6.phpt | 2 +- src/tests/disable_function/disabled_functions_die.phpt | 2 +- src/tests/disable_function/disabled_functions_eval.phpt | 2 +- .../disable_function/disabled_functions_eval_filename.phpt | 2 +- .../disable_function/disabled_functions_eval_simulation.phpt | 2 +- src/tests/disable_function/disabled_functions_eval_user.phpt | 2 +- src/tests/disable_function/disabled_functions_exit.phpt | 2 +- src/tests/disable_function/disabled_functions_filename_r.phpt | 2 +- .../disable_function/disabled_functions_include_once.phpt | 2 +- .../disabled_functions_include_simulation.phpt | 2 +- .../disable_function/disabled_functions_local_var_array.phpt | 2 +- .../disabled_functions_local_var_array_key.phpt | 2 +- src/tests/disable_function/disabled_functions_mb.phpt | 2 +- src/tests/disable_function/disabled_functions_method.phpt | 2 +- src/tests/disable_function/disabled_functions_name_r.phpt | 2 +- .../disable_function/disabled_functions_name_regexp_type.phpt | 2 +- src/tests/disable_function/disabled_functions_name_type.phpt | 2 +- src/tests/disable_function/disabled_functions_namespace.phpt | 2 +- src/tests/disable_function/disabled_functions_nul_byte.phpt | 2 +- src/tests/disable_function/disabled_functions_param.phpt | 2 +- src/tests/disable_function/disabled_functions_param_alias.phpt | 2 +- src/tests/disable_function/disabled_functions_param_allow.phpt | 2 +- src/tests/disable_function/disabled_functions_param_array.phpt | 2 +- .../disable_function/disabled_functions_param_array_deref.phpt | 2 +- .../disabled_functions_param_array_no_value.phpt | 2 +- .../disable_function/disabled_functions_param_array_r.phpt | 2 +- .../disabled_functions_param_array_r_keys.phpt | 2 +- .../disabled_functions_param_array_several_levels.phpt | 2 +- .../disabled_functions_param_array_several_levels_int.phpt | 2 +- .../disabled_functions_param_array_several_levels_keys.phpt | 2 +- ...disabled_functions_param_array_several_levels_keys_int.phpt | 2 +- .../disable_function/disabled_functions_param_broken_line.phpt | 6 +++--- src/tests/disable_function/disabled_functions_param_int.phpt | 2 +- .../disable_function/disabled_functions_param_invalid_pos.phpt | 6 +++--- src/tests/disable_function/disabled_functions_param_line.phpt | 2 +- src/tests/disable_function/disabled_functions_param_pos.phpt | 4 ++-- src/tests/disable_function/disabled_functions_param_pos2.phpt | 2 +- src/tests/disable_function/disabled_functions_param_r.phpt | 2 +- src/tests/disable_function/disabled_functions_pos_type.phpt | 6 +++--- .../disable_function/disabled_functions_regexp_multiple.phpt | 4 ++-- .../disabled_functions_register_shutdown_function.phpt | 2 +- .../disabled_functions_register_tick_function.phpt | 2 +- src/tests/disable_function/disabled_functions_require.phpt | 2 +- .../disable_function/disabled_functions_require_once.phpt | 2 +- .../disabled_functions_require_simulation.phpt | 2 +- src/tests/disable_function/disabled_functions_ret.phpt | 2 +- src/tests/disable_function/disabled_functions_ret2.phpt | 2 +- src/tests/disable_function/disabled_functions_ret3.phpt | 2 +- .../disable_function/disabled_functions_ret_right_hash.phpt | 2 +- .../disable_function/disabled_functions_ret_simulation.phpt | 6 +++--- src/tests/disable_function/disabled_functions_ret_type.phpt | 2 +- .../disable_function/disabled_functions_ret_type_array.phpt | 2 +- .../disable_function/disabled_functions_ret_type_double.phpt | 2 +- .../disable_function/disabled_functions_ret_type_long.phpt | 2 +- .../disable_function/disabled_functions_ret_type_null.phpt | 2 +- .../disable_function/disabled_functions_ret_type_object.phpt | 2 +- .../disable_function/disabled_functions_ret_type_resource.phpt | 2 +- .../disable_function/disabled_functions_ret_type_str.phpt | 2 +- .../disable_function/disabled_functions_ret_type_true.phpt | 2 +- src/tests/disable_function/disabled_functions_ret_user.phpt | 2 +- .../disable_function/disabled_functions_ret_user_used.phpt | 2 +- src/tests/disable_function/disabled_functions_ret_val.phpt | 2 +- .../disable_function/disabled_functions_ret_val_dump.phpt | 2 +- src/tests/disable_function/disabled_functions_ret_val_rx.phpt | 2 +- src/tests/disable_function/disabled_functions_runtime.phpt | 2 +- src/tests/disable_function/disabled_functions_upper.phpt | 2 +- src/tests/disable_function/disabled_functions_variadic.phpt | 4 ++-- src/tests/disable_function/disabled_functions_zero_cidr.phpt | 2 +- .../disable_function/disabled_native_functions_indirect.phpt | 2 +- src/tests/disable_function/disabled_user_functions.phpt | 2 +- .../disable_function/disabled_user_functions_indirect.phpt | 2 +- src/tests/disable_function/noncore_function_hooking.phpt | 2 +- src/tests/dump_request/dump_eval_blacklist.phpt | 2 +- src/tests/dump_request/dump_eval_whitelist.phpt | 2 +- src/tests/dump_request/dump_request.phpt | 2 +- src/tests/dump_request/dump_request_invalid_folder.phpt | 4 ++-- src/tests/dump_request/dump_request_nonwriteable_folder.phpt | 4 ++-- src/tests/dump_request/dump_request_too_big.phpt | 2 +- src/tests/dump_request/dump_segfault1.phpt | 2 +- src/tests/eval_blacklist/eval_backlist.phpt | 2 +- src/tests/eval_blacklist/eval_backlist_call_user_func.phpt | 2 +- src/tests/eval_blacklist/eval_backlist_chained.phpt | 2 +- src/tests/eval_blacklist/eval_backlist_list.phpt | 2 +- src/tests/eval_blacklist/eval_backlist_simulation.phpt | 2 +- src/tests/eval_blacklist/eval_backlist_whitelist.phpt | 2 +- src/tests/eval_blacklist/eval_backlist_whitelist_builtin.phpt | 2 +- src/tests/eval_blacklist/eval_whitelist.phpt | 2 +- src/tests/eval_blacklist/eval_whitelist_builtin.phpt | 2 +- src/tests/eval_blacklist/eval_whitelist_include_then_user.phpt | 2 +- src/tests/eval_blacklist/eval_whitelist_simulation.phpt | 2 +- src/tests/eval_blacklist/eval_whitelist_user_then_builtin.phpt | 2 +- src/tests/eval_blacklist/nested_eval_blacklist.phpt | 2 +- src/tests/eval_blacklist/nested_eval_blacklist2.phpt | 2 +- src/tests/glob_config.phpt | 4 ++-- src/tests/inexistent_conf_file.phpt | 6 +++--- src/tests/inexistent_conf_file_list.phpt | 6 +++--- src/tests/loading.phpt | 2 +- src/tests/multi_config.phpt | 4 ++-- .../session_encryption/crypt_session_corrupted_session.phpt | 2 +- src/tests/session_encryption/crypt_session_invalid.phpt | 2 +- src/tests/unserialize/dump_unserialize.phpt | 2 +- src/tests/unserialize/unserialize_fail.phpt | 2 +- src/tests/unserialize/unserialize_sim.phpt | 2 +- src/tests/upload_validation/upload_validation.phpt | 4 ++-- src/tests/upload_validation/upload_validation_invalid.phpt | 4 ++-- src/tests/upload_validation/upload_validation_ko.phpt | 2 +- .../upload_validation/upload_validation_ko_simulation.phpt | 2 +- src/tests/upload_validation/upload_validation_no_exec.phpt | 4 ++-- src/tests/upload_validation/upload_validation_real.phpt | 2 +- 230 files changed, 453 insertions(+), 442 deletions(-) diff --git a/.gitignore b/.gitignore index c3941e6..ab1bba6 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,13 @@ src/tests/*.log src/tests/*.out src/tests/*.sh src/tests/*.php + +src/tests/*/*.diff +src/tests/*/*.exp +src/tests/*/*.log +src/tests/*/*.out +src/tests/*/*.sh +src/tests/*/*.php # Files generated by phpize, configure and make src/autom4te.cache src/build diff --git a/src/sp_utils.c b/src/sp_utils.c index 5ddf0b9..0f87f17 100644 --- a/src/sp_utils.c +++ b/src/sp_utils.c @@ -15,13 +15,17 @@ void sp_log_msg(char const* feature, int type, const char* fmt, ...) { vspprintf(&msg, 0, fmt, args); va_end(args); + const char *client_ip = getenv("REMOTE_ADDR"); + if (!client_ip) { + client_ip = "0.0.0.0"; + } switch (SNUFFLEUPAGUS_G(config).log_media) { case SP_SYSLOG: openlog(PHP_SNUFFLEUPAGUS_EXTNAME, LOG_PID, LOG_AUTH); const char* error_filename = zend_get_executed_filename(); int syslog_level = SP_LOG_DROP ? LOG_ERR : LOG_INFO; int error_lineno = zend_get_executed_lineno(TSRMLS_C); - syslog(syslog_level, "[%s] %s in %s on line %d", feature, msg, + syslog(syslog_level, "[snuffleupagus][%s][%s] %s in %s on line %d", client_ip, feature, msg, error_filename, error_lineno); closelog(); if (type == SP_LOG_DROP) { @@ -30,7 +34,7 @@ void sp_log_msg(char const* feature, int type, const char* fmt, ...) { break; case SP_ZEND: default: - zend_error(type, "[snuffleupagus][%s] %s", feature, msg); + zend_error(type, "[snuffleupagus][%s][%s] %s", client_ip, feature, msg); break; } } diff --git a/src/tests/broken_configuration/broken_conf.phpt b/src/tests/broken_configuration/broken_conf.phpt index 209e1bd..ab79394 100644 --- a/src/tests/broken_configuration/broken_conf.phpt +++ b/src/tests/broken_configuration/broken_conf.phpt @@ -6,9 +6,9 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid configuration prefix for 'this is a broken line' on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration prefix for 'this is a broken line' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration prefix for 'this is a broken line' on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration prefix for 'this is a broken line' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf2.phpt b/src/tests/broken_configuration/broken_conf2.phpt index 47314d1..919cd7b 100644 --- a/src/tests/broken_configuration/broken_conf2.phpt +++ b/src/tests/broken_configuration/broken_conf2.phpt @@ -6,9 +6,9 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf2.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid configuration section 'sp.wrong' on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration section 'sp.wrong' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration section 'sp.wrong' on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration section 'sp.wrong' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_allow_broken_disabled.phpt b/src/tests/broken_configuration/broken_conf_allow_broken_disabled.phpt index 7aa0c82..9cc45bf 100644 --- a/src/tests/broken_configuration/broken_conf_allow_broken_disabled.phpt +++ b/src/tests/broken_configuration/broken_conf_allow_broken_disabled.phpt @@ -10,9 +10,9 @@ sp.allow_broken_configuration=Off echo 1337; ?> --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid configuration prefix for 'this is a broken line' on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration prefix for 'this is a broken line' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration prefix for 'this is a broken line' on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration prefix for 'this is a broken line' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. diff --git a/src/tests/broken_configuration/broken_conf_allow_broken_enabled.phpt b/src/tests/broken_configuration/broken_conf_allow_broken_enabled.phpt index 452595b..614032a 100644 --- a/src/tests/broken_configuration/broken_conf_allow_broken_enabled.phpt +++ b/src/tests/broken_configuration/broken_conf_allow_broken_enabled.phpt @@ -10,7 +10,7 @@ sp.allow_broken_configuration=On echo 1337; ?> --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid configuration prefix for 'this is a broken line' on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration prefix for 'this is a broken line' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration prefix for 'this is a broken line' on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration prefix for 'this is a broken line' on line 1 in Unknown on line 0 1337 diff --git a/src/tests/broken_configuration/broken_conf_config_regexp.phpt b/src/tests/broken_configuration/broken_conf_config_regexp.phpt index 2977e3a..d056e74 100644 --- a/src/tests/broken_configuration/broken_conf_config_regexp.phpt +++ b/src/tests/broken_configuration/broken_conf_config_regexp.phpt @@ -6,12 +6,12 @@ Broken configuration sp.configuration_file={PWD}/config/broken_config_regexp.ini --FILE-- --EXPECTF-- -PHP Fatal error: [snuffleupagus][config] Failed to compile '*.': %s on line 1. in Unknown on line 0 -PHP Fatal error: [snuffleupagus][config] '.filename_r()' is expecting a valid regexp, and not '"*."' on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Failed to compile '*.': %s on line 1. in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] '.filename_r()' is expecting a valid regexp, and not '"*."' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Failed to compile '*.': %s on line 1. in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Failed to compile '*.': %s on line 1. in Unknown on line 0 -Fatal error: [snuffleupagus][config] '.filename_r()' is expecting a valid regexp, and not '"*."' on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] '.filename_r()' is expecting a valid regexp, and not '"*."' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. diff --git a/src/tests/broken_configuration/broken_conf_config_regexp_no_closing_paren.phpt b/src/tests/broken_configuration/broken_conf_config_regexp_no_closing_paren.phpt index 77bb1b4..1792cdd 100644 --- a/src/tests/broken_configuration/broken_conf_config_regexp_no_closing_paren.phpt +++ b/src/tests/broken_configuration/broken_conf_config_regexp_no_closing_paren.phpt @@ -6,12 +6,12 @@ Broken configuration - regexp without a closing parenthesis sp.configuration_file={PWD}/config/broken_config_regexp_no_closing_paren.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][error] There is an issue with the parsing of '"*."': it doesn't look like a valid string on line 1 in Unknown on line 0 -PHP Fatal error: [snuffleupagus][config] '.filename_r()' is expecting a valid regexp, and not '"*."' on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][error] There is an issue with the parsing of '"*."': it doesn't look like a valid string on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] '.filename_r()' is expecting a valid regexp, and not '"*."' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][error] There is an issue with the parsing of '"*."': it doesn't look like a valid string on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][error] There is an issue with the parsing of '"*."': it doesn't look like a valid string on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] '.filename_r()' is expecting a valid regexp, and not '"*."' on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] '.filename_r()' is expecting a valid regexp, and not '"*."' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_cookie_encryption_without_encryption_key.phpt b/src/tests/broken_configuration/broken_conf_cookie_encryption_without_encryption_key.phpt index d0b7c0d..f3dc06f 100644 --- a/src/tests/broken_configuration/broken_conf_cookie_encryption_without_encryption_key.phpt +++ b/src/tests/broken_configuration/broken_conf_cookie_encryption_without_encryption_key.phpt @@ -6,9 +6,9 @@ Borken configuration - encrypted cookie without encryption key sp.configuration_file={PWD}/config/broken_conf_cookie_encryption_without_encryption_key.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] You're trying to use the cookie encryption featureon line 2 without having set the `.encryption_key` option in`sp.global`: please set it first in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] You're trying to use the cookie encryption featureon line 2 without having set the `.encryption_key` option in`sp.global`: please set it first in Unknown on line 0 -Fatal error: [snuffleupagus][config] You're trying to use the cookie encryption featureon line 2 without having set the `.encryption_key` option in`sp.global`: please set it first in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] You're trying to use the cookie encryption featureon line 2 without having set the `.encryption_key` option in`sp.global`: please set it first in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. diff --git a/src/tests/broken_configuration/broken_conf_cookie_encryption_without_env_var.phpt b/src/tests/broken_configuration/broken_conf_cookie_encryption_without_env_var.phpt index af5d471..882b4f7 100644 --- a/src/tests/broken_configuration/broken_conf_cookie_encryption_without_env_var.phpt +++ b/src/tests/broken_configuration/broken_conf_cookie_encryption_without_env_var.phpt @@ -6,9 +6,9 @@ Borken configuration - encrypted cookie with without cookie env var sp.configuration_file={PWD}/config/broken_conf_cookie_encryption_without_env_var.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] You're trying to use the cookie encryption featureon line 2 without having set the `.cookie_env_var` option in`sp.global`: please set it first in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] You're trying to use the cookie encryption featureon line 2 without having set the `.cookie_env_var` option in`sp.global`: please set it first in Unknown on line 0 -Fatal error: [snuffleupagus][config] You're trying to use the cookie encryption featureon line 2 without having set the `.cookie_env_var` option in`sp.global`: please set it first in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] You're trying to use the cookie encryption featureon line 2 without having set the `.cookie_env_var` option in`sp.global`: please set it first in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. diff --git a/src/tests/broken_configuration/broken_conf_cookie_name_and_regexp.phpt b/src/tests/broken_configuration/broken_conf_cookie_name_and_regexp.phpt index b1e1318..50bc569 100644 --- a/src/tests/broken_configuration/broken_conf_cookie_name_and_regexp.phpt +++ b/src/tests/broken_configuration/broken_conf_cookie_name_and_regexp.phpt @@ -6,9 +6,9 @@ Borken configuration - encrypted cookie with name and regexp sp.configuration_file={PWD}/config/broken_conf_cookie_name_and_regexp.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] name and name_r are mutually exclusive on line 2 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] name and name_r are mutually exclusive on line 2 in Unknown on line 0 -Fatal error: [snuffleupagus][config] name and name_r are mutually exclusive on line 2 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] name and name_r are mutually exclusive on line 2 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_enable_disable.phpt b/src/tests/broken_configuration/broken_conf_enable_disable.phpt index a836f44..48ec954 100644 --- a/src/tests/broken_configuration/broken_conf_enable_disable.phpt +++ b/src/tests/broken_configuration/broken_conf_enable_disable.phpt @@ -6,9 +6,9 @@ Global strict mode sp.configuration_file={PWD}/config/borken_conf_enable_disable.ini --FILE-- --EXPECTF-- -PHP Fatal error: [snuffleupagus][config] A rule can't be enabled and disabled on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] A rule can't be enabled and disabled on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] A rule can't be enabled and disabled on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] A rule can't be enabled and disabled on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_eval.phpt b/src/tests/broken_configuration/broken_conf_eval.phpt index 98da9c9..e1e05bc 100644 --- a/src/tests/broken_configuration/broken_conf_eval.phpt +++ b/src/tests/broken_configuration/broken_conf_eval.phpt @@ -6,9 +6,9 @@ Broken configuration for eval sp.configuration_file={PWD}/config/broken_conf_eval.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][error] There is an issue with the parsing of '"cos,sin': it doesn't look like a valid string on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][error] There is an issue with the parsing of '"cos,sin': it doesn't look like a valid string on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][error] There is an issue with the parsing of '"cos,sin': it doesn't look like a valid string on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][error] There is an issue with the parsing of '"cos,sin': it doesn't look like a valid string on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_expecting_bool.phpt b/src/tests/broken_configuration/broken_conf_expecting_bool.phpt index 6770c7c..38a648d 100644 --- a/src/tests/broken_configuration/broken_conf_expecting_bool.phpt +++ b/src/tests/broken_configuration/broken_conf_expecting_bool.phpt @@ -6,9 +6,9 @@ Bad boolean value in configuration sp.configuration_file={PWD}/config/broken_conf_expecting_bool.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Trailing chars '337);' at the end of '.enable(1337);' on line 5 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Trailing chars '337);' at the end of '.enable(1337);' on line 5 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Trailing chars '337);' at the end of '.enable(1337);' on line 5 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Trailing chars '337);' at the end of '.enable(1337);' on line 5 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_invalid_cidr.phpt b/src/tests/broken_configuration/broken_conf_invalid_cidr.phpt index 3e27050..e23b880 100644 --- a/src/tests/broken_configuration/broken_conf_invalid_cidr.phpt +++ b/src/tests/broken_configuration/broken_conf_invalid_cidr.phpt @@ -6,9 +6,9 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_invalid_cidr.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] '42' isn't a valid ipv4 mask. in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] '42' isn't a valid ipv4 mask. in Unknown on line 0 -Fatal error: [snuffleupagus][config] '42' isn't a valid ipv4 mask. in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] '42' isn't a valid ipv4 mask. in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_invalid_cidr6.phpt b/src/tests/broken_configuration/broken_conf_invalid_cidr6.phpt index 8f96669..b8721b1 100644 --- a/src/tests/broken_configuration/broken_conf_invalid_cidr6.phpt +++ b/src/tests/broken_configuration/broken_conf_invalid_cidr6.phpt @@ -6,9 +6,9 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_invalid_cidr6.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] 'ZZZ' isn't a valid network mask. in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] 'ZZZ' isn't a valid network mask. in Unknown on line 0 -Fatal error: [snuffleupagus][config] 'ZZZ' isn't a valid network mask. in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] 'ZZZ' isn't a valid network mask. in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_invalid_cidr6_no_slash.phpt b/src/tests/broken_configuration/broken_conf_invalid_cidr6_no_slash.phpt index 2d557ff..cbc609e 100644 --- a/src/tests/broken_configuration/broken_conf_invalid_cidr6_no_slash.phpt +++ b/src/tests/broken_configuration/broken_conf_invalid_cidr6_no_slash.phpt @@ -6,9 +6,9 @@ Broken configuration, invalid cidr for ipv6 because there is no `/` in it sp.configuration_file={PWD}/config/broken_conf_invalid_cidr6_no_slash.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] '2001:0db8:0000:0000:0000:ff00:0042:8329' isn't a valid network mask, it seems that you forgot a '/'. in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] '2001:0db8:0000:0000:0000:ff00:0042:8329' isn't a valid network mask, it seems that you forgot a '/'. in Unknown on line 0 -Fatal error: [snuffleupagus][config] '2001:0db8:0000:0000:0000:ff00:0042:8329' isn't a valid network mask, it seems that you forgot a '/'. in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] '2001:0db8:0000:0000:0000:ff00:0042:8329' isn't a valid network mask, it seems that you forgot a '/'. in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_invalid_cidr_value.phpt b/src/tests/broken_configuration/broken_conf_invalid_cidr_value.phpt index ad60912..3372409 100644 --- a/src/tests/broken_configuration/broken_conf_invalid_cidr_value.phpt +++ b/src/tests/broken_configuration/broken_conf_invalid_cidr_value.phpt @@ -7,12 +7,12 @@ Broken configuration, invalid cidr value sp.configuration_file={PWD}/config/broken_conf_invalid_cidr_value.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][error] A valid string as parameter is expected on line 1 in Unknown on line 0 -PHP Fatal error: [snuffleupagus][config] " doesn't contain a valid cidr on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][error] A valid string as parameter is expected on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] " doesn't contain a valid cidr on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][error] A valid string as parameter is expected on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][error] A valid string as parameter is expected on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] " doesn't contain a valid cidr on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] " doesn't contain a valid cidr on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_invalid_filename.phpt b/src/tests/broken_configuration/broken_conf_invalid_filename.phpt index 0ab138f..1bc6564 100644 --- a/src/tests/broken_configuration/broken_conf_invalid_filename.phpt +++ b/src/tests/broken_configuration/broken_conf_invalid_filename.phpt @@ -6,9 +6,9 @@ Broken configuration filename without absolute path sp.configuration_file={PWD}/config/broken_conf_invalid_filename.ini --FILE-- --EXPECTF-- -PHP Fatal error: [snuffleupagus][config] Invalid configuration line: 'sp.disabled_functions.function("sprintf").filename("wrong file name").drop();':'.filename' must be an absolute path or a phar archive on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration line: 'sp.disabled_functions.function("sprintf").filename("wrong file name").drop();':'.filename' must be an absolute path or a phar archive on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration line: 'sp.disabled_functions.function("sprintf").filename("wrong file name").drop();':'.filename' must be an absolute path or a phar archive on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration line: 'sp.disabled_functions.function("sprintf").filename("wrong file name").drop();':'.filename' must be an absolute path or a phar archive on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_invalid_log_media.phpt b/src/tests/broken_configuration/broken_conf_invalid_log_media.phpt index bcf7c01..a162ea8 100644 --- a/src/tests/broken_configuration/broken_conf_invalid_log_media.phpt +++ b/src/tests/broken_configuration/broken_conf_invalid_log_media.phpt @@ -6,9 +6,9 @@ Broken configuration filename with improper log media sp.configuration_file={PWD}/config/broken_conf_invalid_log_media.ini --FILE-- --EXPECTF-- -PHP Fatal error: [snuffleupagus][config] .log_media() only supports 'syslog' or 'php', on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] .log_media() only supports 'syslog' or 'php', on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] .log_media() only supports 'syslog' or 'php', on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] .log_media() only supports 'syslog' or 'php', on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. diff --git a/src/tests/broken_configuration/broken_conf_invalid_type.phpt b/src/tests/broken_configuration/broken_conf_invalid_type.phpt index b140c25..cc4a381 100644 --- a/src/tests/broken_configuration/broken_conf_invalid_type.phpt +++ b/src/tests/broken_configuration/broken_conf_invalid_type.phpt @@ -6,9 +6,9 @@ Broken conf with wrong type sp.configuration_file={PWD}/config/broken_conf_invalid_type.ini --FILE-- --EXPECTF-- -PHP Fatal error: [snuffleupagus][error] There is an issue with the parsing of '"totally_wrong"_type")': it doesn't look like a valid string on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][error] There is an issue with the parsing of '"totally_wrong"_type")': it doesn't look like a valid string on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][error] There is an issue with the parsing of '"totally_wrong"_type")': it doesn't look like a valid string on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][error] There is an issue with the parsing of '"totally_wrong"_type")': it doesn't look like a valid string on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_key_value.phpt b/src/tests/broken_configuration/broken_conf_key_value.phpt index 8c455f8..14a3d91 100644 --- a/src/tests/broken_configuration/broken_conf_key_value.phpt +++ b/src/tests/broken_configuration/broken_conf_key_value.phpt @@ -6,9 +6,9 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_key_value.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid configuration line: 'sp.disabled_functions.function("system").var("").value("").key("").drop();':`key` and `value` are mutually exclusive on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration line: 'sp.disabled_functions.function("system").var("").value("").key("").drop();':`key` and `value` are mutually exclusive on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration line: 'sp.disabled_functions.function("system").var("").value("").key("").drop();':`key` and `value` are mutually exclusive on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration line: 'sp.disabled_functions.function("system").var("").value("").key("").drop();':`key` and `value` are mutually exclusive on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_line_empty_string.phpt b/src/tests/broken_configuration/broken_conf_line_empty_string.phpt index 77bd46d..15c11fd 100644 --- a/src/tests/broken_configuration/broken_conf_line_empty_string.phpt +++ b/src/tests/broken_configuration/broken_conf_line_empty_string.phpt @@ -6,9 +6,9 @@ Configuration line with an empty string sp.configuration_file={PWD}/config/broken_conf_line_empty_string.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][error] A valid string as parameter is expected on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][error] A valid string as parameter is expected on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][error] A valid string as parameter is expected on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][error] A valid string as parameter is expected on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_line_no_closing.phpt b/src/tests/broken_configuration/broken_conf_line_no_closing.phpt index 19dd081..c8ba73b 100644 --- a/src/tests/broken_configuration/broken_conf_line_no_closing.phpt +++ b/src/tests/broken_configuration/broken_conf_line_no_closing.phpt @@ -6,9 +6,9 @@ Configuration line without closing parenthese sp.configuration_file={PWD}/config/broken_conf_line_no_closing.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][error] There is an issue with the parsing of '"123"': it doesn't look like a valid string on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][error] There is an issue with the parsing of '"123"': it doesn't look like a valid string on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][error] There is an issue with the parsing of '"123"': it doesn't look like a valid string on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][error] There is an issue with the parsing of '"123"': it doesn't look like a valid string on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_local_var_1.phpt b/src/tests/broken_configuration/broken_conf_local_var_1.phpt index 52494d3..573246c 100644 --- a/src/tests/broken_configuration/broken_conf_local_var_1.phpt +++ b/src/tests/broken_configuration/broken_conf_local_var_1.phpt @@ -6,12 +6,12 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_local_var_1.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid `]` position. in Unknown on line 0 -PHP Fatal error: [snuffleupagus][config] Invalid value ']' for `var` on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `]` position. in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value ']' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid `]` position. in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `]` position. in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid value ']' for `var` on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value ']' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_local_var_10.phpt b/src/tests/broken_configuration/broken_conf_local_var_10.phpt index d184286..2cf19f9 100644 --- a/src/tests/broken_configuration/broken_conf_local_var_10.phpt +++ b/src/tests/broken_configuration/broken_conf_local_var_10.phpt @@ -6,12 +6,12 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_local_var_10.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid `]` position. in Unknown on line 0 -PHP Fatal error: [snuffleupagus][config] Invalid value 'asd[asd]asd' for `var` on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `]` position. in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value 'asd[asd]asd' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid `]` position. in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `]` position. in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid value 'asd[asd]asd' for `var` on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value 'asd[asd]asd' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_local_var_11.phpt b/src/tests/broken_configuration/broken_conf_local_var_11.phpt index 105ef24..bd018e4 100644 --- a/src/tests/broken_configuration/broken_conf_local_var_11.phpt +++ b/src/tests/broken_configuration/broken_conf_local_var_11.phpt @@ -6,12 +6,12 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_local_var_11.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid `::` position. in Unknown on line 0 -PHP Fatal error: [snuffleupagus][config] Invalid value 'asd::' for `param` on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `::` position. in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value 'asd::' for `param` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid `::` position. in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `::` position. in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid value 'asd::' for `param` on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value 'asd::' for `param` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_local_var_12.phpt b/src/tests/broken_configuration/broken_conf_local_var_12.phpt index bfa79e1..2c86d57 100644 --- a/src/tests/broken_configuration/broken_conf_local_var_12.phpt +++ b/src/tests/broken_configuration/broken_conf_local_var_12.phpt @@ -6,9 +6,9 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_local_var_12.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Empty value in `var` on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Empty value in `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Empty value in `var` on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Empty value in `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_local_var_13.phpt b/src/tests/broken_configuration/broken_conf_local_var_13.phpt index b4e8dee..a42507d 100644 --- a/src/tests/broken_configuration/broken_conf_local_var_13.phpt +++ b/src/tests/broken_configuration/broken_conf_local_var_13.phpt @@ -6,12 +6,12 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_local_var_13.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid `->` position. in Unknown on line 0 -PHP Fatal error: [snuffleupagus][config] Invalid value 'asd->asd' for `var` on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `->` position. in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value 'asd->asd' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid `->` position. in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `->` position. in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid value 'asd->asd' for `var` on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value 'asd->asd' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_local_var_14.phpt b/src/tests/broken_configuration/broken_conf_local_var_14.phpt index 3e21721..01c9228 100644 --- a/src/tests/broken_configuration/broken_conf_local_var_14.phpt +++ b/src/tests/broken_configuration/broken_conf_local_var_14.phpt @@ -6,12 +6,12 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_local_var_14.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid var name: $i+valid var name . in Unknown on line 0 -PHP Fatal error: [snuffleupagus][config] Invalid value '$i+valid var name ' for `var` on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid var name: $i+valid var name . in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value '$i+valid var name ' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid var name: $i+valid var name . in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid var name: $i+valid var name . in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid value '$i+valid var name ' for `var` on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value '$i+valid var name ' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_local_var_15.phpt b/src/tests/broken_configuration/broken_conf_local_var_15.phpt index 6c9c4c3..8fca43a 100644 --- a/src/tests/broken_configuration/broken_conf_local_var_15.phpt +++ b/src/tests/broken_configuration/broken_conf_local_var_15.phpt @@ -6,12 +6,12 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_local_var_15.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid var name: $i$$!@#. in Unknown on line 0 -PHP Fatal error: [snuffleupagus][config] Invalid value '$i$$!@#->qwe' for `var` on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid var name: $i$$!@#. in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value '$i$$!@#->qwe' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid var name: $i$$!@#. in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid var name: $i$$!@#. in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid value '$i$$!@#->qwe' for `var` on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value '$i$$!@#->qwe' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_local_var_16.phpt b/src/tests/broken_configuration/broken_conf_local_var_16.phpt index 85c6627..38f2030 100644 --- a/src/tests/broken_configuration/broken_conf_local_var_16.phpt +++ b/src/tests/broken_configuration/broken_conf_local_var_16.phpt @@ -6,12 +6,12 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_local_var_16.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Missing a closing quote. in Unknown on line 0 -PHP Fatal error: [snuffleupagus][config] Invalid value '"' for `var` on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Missing a closing quote. in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value '"' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Missing a closing quote. in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Missing a closing quote. in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid value '"' for `var` on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value '"' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_local_var_2.phpt b/src/tests/broken_configuration/broken_conf_local_var_2.phpt index 7b0d36b..64bdaf3 100644 --- a/src/tests/broken_configuration/broken_conf_local_var_2.phpt +++ b/src/tests/broken_configuration/broken_conf_local_var_2.phpt @@ -6,12 +6,12 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_local_var_2.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid `"` position. in Unknown on line 0 -PHP Fatal error: [snuffleupagus][config] Invalid value '""asd' for `var` on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `"` position. in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value '""asd' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid `"` position. in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `"` position. in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid value '""asd' for `var` on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value '""asd' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_local_var_3.phpt b/src/tests/broken_configuration/broken_conf_local_var_3.phpt index fb00c26..e041ad5 100644 --- a/src/tests/broken_configuration/broken_conf_local_var_3.phpt +++ b/src/tests/broken_configuration/broken_conf_local_var_3.phpt @@ -6,12 +6,12 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_local_var_3.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid `->` position. in Unknown on line 0 -PHP Fatal error: [snuffleupagus][config] Invalid value '$qwe->::' for `var` on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `->` position. in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value '$qwe->::' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid `->` position. in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `->` position. in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid value '$qwe->::' for `var` on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value '$qwe->::' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_local_var_4.phpt b/src/tests/broken_configuration/broken_conf_local_var_4.phpt index 8d7e195..1c3f673 100644 --- a/src/tests/broken_configuration/broken_conf_local_var_4.phpt +++ b/src/tests/broken_configuration/broken_conf_local_var_4.phpt @@ -6,12 +6,12 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_local_var_4.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid `"` position. in Unknown on line 0 -PHP Fatal error: [snuffleupagus][config] Invalid value '"asd"asd[]' for `var` on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `"` position. in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value '"asd"asd[]' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid `"` position. in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `"` position. in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid value '"asd"asd[]' for `var` on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value '"asd"asd[]' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_local_var_5.phpt b/src/tests/broken_configuration/broken_conf_local_var_5.phpt index 1c62e37..113ab39 100644 --- a/src/tests/broken_configuration/broken_conf_local_var_5.phpt +++ b/src/tests/broken_configuration/broken_conf_local_var_5.phpt @@ -6,12 +6,12 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_local_var_5.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid `'` position. in Unknown on line 0 -PHP Fatal error: [snuffleupagus][config] Invalid value ''asd'asd[]' for `var` on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `'` position. in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value ''asd'asd[]' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid `'` position. in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `'` position. in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid value ''asd'asd[]' for `var` on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value ''asd'asd[]' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_local_var_6.phpt b/src/tests/broken_configuration/broken_conf_local_var_6.phpt index 9a3fa02..3d06667 100644 --- a/src/tests/broken_configuration/broken_conf_local_var_6.phpt +++ b/src/tests/broken_configuration/broken_conf_local_var_6.phpt @@ -6,12 +6,12 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_local_var_6.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid `'` position. in Unknown on line 0 -PHP Fatal error: [snuffleupagus][config] Invalid value '''asd' for `var` on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `'` position. in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value '''asd' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid `'` position. in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `'` position. in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid value '''asd' for `var` on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value '''asd' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_local_var_7.phpt b/src/tests/broken_configuration/broken_conf_local_var_7.phpt index 9f2548b..11c3da9 100644 --- a/src/tests/broken_configuration/broken_conf_local_var_7.phpt +++ b/src/tests/broken_configuration/broken_conf_local_var_7.phpt @@ -6,12 +6,12 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_local_var_7.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid `->` position. in Unknown on line 0 -PHP Fatal error: [snuffleupagus][config] Invalid value 'asd-->' for `var` on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `->` position. in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value 'asd-->' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid `->` position. in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `->` position. in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid value 'asd-->' for `var` on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value 'asd-->' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_local_var_8.phpt b/src/tests/broken_configuration/broken_conf_local_var_8.phpt index d4d9d35..2154284 100644 --- a/src/tests/broken_configuration/broken_conf_local_var_8.phpt +++ b/src/tests/broken_configuration/broken_conf_local_var_8.phpt @@ -6,12 +6,12 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_local_var_8.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid `]` position. in Unknown on line 0 -PHP Fatal error: [snuffleupagus][config] Invalid value 'asd[asd]"asd"' for `var` on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `]` position. in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value 'asd[asd]"asd"' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid `]` position. in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `]` position. in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid value 'asd[asd]"asd"' for `var` on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value 'asd[asd]"asd"' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_local_var_9.phpt b/src/tests/broken_configuration/broken_conf_local_var_9.phpt index 972e398..ab6ae78 100644 --- a/src/tests/broken_configuration/broken_conf_local_var_9.phpt +++ b/src/tests/broken_configuration/broken_conf_local_var_9.phpt @@ -6,12 +6,12 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_local_var_9.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid `]` position. in Unknown on line 0 -PHP Fatal error: [snuffleupagus][config] Invalid value 'asd[asd]'asd'' for `var` on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `]` position. in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value 'asd[asd]'asd'' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid `]` position. in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `]` position. in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid value 'asd[asd]'asd'' for `var` on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value 'asd[asd]'asd'' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_lots_of_quotes.phpt b/src/tests/broken_configuration/broken_conf_lots_of_quotes.phpt index afed2f8..e69da0b 100644 --- a/src/tests/broken_configuration/broken_conf_lots_of_quotes.phpt +++ b/src/tests/broken_configuration/broken_conf_lots_of_quotes.phpt @@ -6,9 +6,9 @@ Configuration line with too many quotes sp.configuration_file={PWD}/config/broken_conf_lots_of_quotes.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][error] There is an issue with the parsing of '"this\"is a weird\"\"\"cookie\"name"");': it doesn't look like a valid string on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][error] There is an issue with the parsing of '"this\"is a weird\"\"\"cookie\"name"");': it doesn't look like a valid string on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][error] There is an issue with the parsing of '"this\"is a weird\"\"\"cookie\"name"");': it doesn't look like a valid string on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][error] There is an issue with the parsing of '"this\"is a weird\"\"\"cookie\"name"");': it doesn't look like a valid string on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_missing_script.phpt b/src/tests/broken_configuration/broken_conf_missing_script.phpt index 70e508d..97d3743 100644 --- a/src/tests/broken_configuration/broken_conf_missing_script.phpt +++ b/src/tests/broken_configuration/broken_conf_missing_script.phpt @@ -8,9 +8,9 @@ sp.configuration_file={PWD}/config/broken_conf_missing_script.ini echo 1; ?> --EXPECTF-- -PHP Fatal error: [snuffleupagus][config] The `script` directive is mandatory in '.enable();' on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] The `script` directive is mandatory in '.enable();' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] The `script` directive is mandatory in '.enable();' on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] The `script` directive is mandatory in '.enable();' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. diff --git a/src/tests/broken_configuration/broken_conf_mutually_exclusive.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive.phpt index 6cc9bd6..d76798b 100644 --- a/src/tests/broken_configuration/broken_conf_mutually_exclusive.phpt +++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive.phpt @@ -6,6 +6,6 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_mutually_exclusive.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid configuration line: 'sp.disabled_functions.function("system").param("id").value("42").value_r("^id$").drop();': '.value' and '.regexp' are mutually exclusive on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration line: 'sp.disabled_functions.function("system").param("id").value("42").value_r("^id$").drop();': '.value' and '.regexp' are mutually exclusive on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration line: 'sp.disabled_functions.function("system").param("id").value("42").value_r("^id$").drop();': '.value' and '.regexp' are mutually exclusive on line 1 in Unknown on line 0 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration line: 'sp.disabled_functions.function("system").param("id").value("42").value_r("^id$").drop();': '.value' and '.regexp' are mutually exclusive on line 1 in Unknown on line 0 \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_mutually_exclusive10.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive10.phpt index 0231c05..9ac8881 100644 --- a/src/tests/broken_configuration/broken_conf_mutually_exclusive10.phpt +++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive10.phpt @@ -6,9 +6,9 @@ Broken configuration - enabled/disabled readonly sp.configuration_file={PWD}/config/broken_conf_mutually_exclusive10.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] A rule can't be enabled and disabled on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] A rule can't be enabled and disabled on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] A rule can't be enabled and disabled on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] A rule can't be enabled and disabled on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_mutually_exclusive11.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive11.phpt index 507d7fa..69b2e31 100644 --- a/src/tests/broken_configuration/broken_conf_mutually_exclusive11.phpt +++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive11.phpt @@ -6,9 +6,9 @@ Broken configuration - ret and var are mutually exclusives sp.configuration_file={PWD}/config/broken_conf_mutually_exclusive11.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid configuration line: 'sp.disabled_functions.function("strcmp").drop().ret("hip").var("hop");':`ret` and `var` are mutually exclusive on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration line: 'sp.disabled_functions.function("strcmp").drop().ret("hip").var("hop");':`ret` and `var` are mutually exclusive on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration line: 'sp.disabled_functions.function("strcmp").drop().ret("hip").var("hop");':`ret` and `var` are mutually exclusive on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration line: 'sp.disabled_functions.function("strcmp").drop().ret("hip").var("hop");':`ret` and `var` are mutually exclusive on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. diff --git a/src/tests/broken_configuration/broken_conf_mutually_exclusive12.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive12.phpt index d823de9..dac0f16 100644 --- a/src/tests/broken_configuration/broken_conf_mutually_exclusive12.phpt +++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive12.phpt @@ -6,9 +6,9 @@ Broken configuration - ret and value are mutually exclusive sp.configuration_file={PWD}/config/broken_conf_mutually_exclusive12.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid configuration line: 'sp.disabled_functions.function("strcmp").drop().ret("hip").value("hop");':`ret` and `value` are mutually exclusive on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration line: 'sp.disabled_functions.function("strcmp").drop().ret("hip").value("hop");':`ret` and `value` are mutually exclusive on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration line: 'sp.disabled_functions.function("strcmp").drop().ret("hip").value("hop");':`ret` and `value` are mutually exclusive on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration line: 'sp.disabled_functions.function("strcmp").drop().ret("hip").value("hop");':`ret` and `value` are mutually exclusive on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. diff --git a/src/tests/broken_configuration/broken_conf_mutually_exclusive2.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive2.phpt index 570b917..6e71f83 100644 --- a/src/tests/broken_configuration/broken_conf_mutually_exclusive2.phpt +++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive2.phpt @@ -6,6 +6,6 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_mutually_exclusive2.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid configuration line: 'sp.disabled_functions.function("system").function_r("system").param("id").value("42").drop();': '.r_function' and '.function' are mutually exclusive on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration line: 'sp.disabled_functions.function("system").function_r("system").param("id").value("42").drop();': '.r_function' and '.function' are mutually exclusive on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration line: 'sp.disabled_functions.function("system").function_r("system").param("id").value("42").drop();': '.r_function' and '.function' are mutually exclusive on line 1 in Unknown on line 0 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration line: 'sp.disabled_functions.function("system").function_r("system").param("id").value("42").drop();': '.r_function' and '.function' are mutually exclusive on line 1 in Unknown on line 0 \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_mutually_exclusive3.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive3.phpt index e7387eb..46c589b 100644 --- a/src/tests/broken_configuration/broken_conf_mutually_exclusive3.phpt +++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive3.phpt @@ -6,6 +6,6 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_mutually_exclusive3.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid configuration line: 'sp.disabled_functions.function("system").param("id").value("42").filename_r("^id$").filename("pouet.txt").drop();': '.r_filename' and '.filename' are mutually exclusive on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration line: 'sp.disabled_functions.function("system").param("id").value("42").filename_r("^id$").filename("pouet.txt").drop();': '.r_filename' and '.filename' are mutually exclusive on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration line: 'sp.disabled_functions.function("system").param("id").value("42").filename_r("^id$").filename("pouet.txt").drop();': '.r_filename' and '.filename' are mutually exclusive on line 1 in Unknown on line 0 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration line: 'sp.disabled_functions.function("system").param("id").value("42").filename_r("^id$").filename("pouet.txt").drop();': '.r_filename' and '.filename' are mutually exclusive on line 1 in Unknown on line 0 \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_mutually_exclusive4.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive4.phpt index c979f56..84c814b 100644 --- a/src/tests/broken_configuration/broken_conf_mutually_exclusive4.phpt +++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive4.phpt @@ -6,9 +6,9 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_mutually_exclusive4.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid configuration line: 'sp.disabled_functions.function("system").param("id").value("42").param_r("^id$").drop();':'.r_param', '.param' and '.pos' are mutually exclusive on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration line: 'sp.disabled_functions.function("system").param("id").value("42").param_r("^id$").drop();':'.r_param', '.param' and '.pos' are mutually exclusive on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration line: 'sp.disabled_functions.function("system").param("id").value("42").param_r("^id$").drop();':'.r_param', '.param' and '.pos' are mutually exclusive on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration line: 'sp.disabled_functions.function("system").param("id").value("42").param_r("^id$").drop();':'.r_param', '.param' and '.pos' are mutually exclusive on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_mutually_exclusive5.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive5.phpt index b23fba6..e8c1f75 100644 --- a/src/tests/broken_configuration/broken_conf_mutually_exclusive5.phpt +++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive5.phpt @@ -6,6 +6,6 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_mutually_exclusive5.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid configuration line: 'sp.disabled_functions.function("system").ret("0").drop().ret_r("^0$");': '.r_ret' and '.ret' are mutually exclusive on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration line: 'sp.disabled_functions.function("system").ret("0").drop().ret_r("^0$");': '.r_ret' and '.ret' are mutually exclusive on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration line: 'sp.disabled_functions.function("system").ret("0").drop().ret_r("^0$");': '.r_ret' and '.ret' are mutually exclusive on line 1 in Unknown on line 0 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration line: 'sp.disabled_functions.function("system").ret("0").drop().ret_r("^0$");': '.r_ret' and '.ret' are mutually exclusive on line 1 in Unknown on line 0 \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_mutually_exclusive6.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive6.phpt index 1c4686b..bbbb179 100644 --- a/src/tests/broken_configuration/broken_conf_mutually_exclusive6.phpt +++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive6.phpt @@ -6,9 +6,9 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_mutually_exclusive6.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid configuration line: 'sp.disabled_functions.function("system").param("id").value("42").ret_r("^0$").drop();':`ret` and `param` are mutually exclusive on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration line: 'sp.disabled_functions.function("system").param("id").value("42").ret_r("^0$").drop();':`ret` and `param` are mutually exclusive on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration line: 'sp.disabled_functions.function("system").param("id").value("42").ret_r("^0$").drop();':`ret` and `param` are mutually exclusive on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration line: 'sp.disabled_functions.function("system").param("id").value("42").ret_r("^0$").drop();':`ret` and `param` are mutually exclusive on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_mutually_exclusive7.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive7.phpt index 22abf79..ecd39a0 100644 --- a/src/tests/broken_configuration/broken_conf_mutually_exclusive7.phpt +++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive7.phpt @@ -6,9 +6,9 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_mutually_exclusive7.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid configuration line: 'sp.disabled_functions.function("system").ret("0").drop().allow();': The rule must either be a `drop` or `allow` one on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration line: 'sp.disabled_functions.function("system").ret("0").drop().allow();': The rule must either be a `drop` or `allow` one on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration line: 'sp.disabled_functions.function("system").ret("0").drop().allow();': The rule must either be a `drop` or `allow` one on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration line: 'sp.disabled_functions.function("system").ret("0").drop().allow();': The rule must either be a `drop` or `allow` one on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_mutually_exclusive8.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive8.phpt index 6a95234..f9e4692 100644 --- a/src/tests/broken_configuration/broken_conf_mutually_exclusive8.phpt +++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive8.phpt @@ -6,9 +6,9 @@ Broken configuration sp.configuration_file={PWD}/config/broken_conf_mutually_exclusive8.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Invalid configuration line: 'sp.disabled_functions.ret("0").drop();': must take a function name on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration line: 'sp.disabled_functions.ret("0").drop();': must take a function name on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration line: 'sp.disabled_functions.ret("0").drop();': must take a function name on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration line: 'sp.disabled_functions.ret("0").drop();': must take a function name on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_mutually_exclusive9.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive9.phpt index 9436c24..0b574eb 100644 --- a/src/tests/broken_configuration/broken_conf_mutually_exclusive9.phpt +++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive9.phpt @@ -6,9 +6,9 @@ Broken configuration - enabled/disabled unserialize sp.configuration_file={PWD}/config/broken_conf_mutually_exclusive9.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] A rule can't be enabled and disabled on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] A rule can't be enabled and disabled on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] A rule can't be enabled and disabled on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] A rule can't be enabled and disabled on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_no_cookie_action.phpt b/src/tests/broken_configuration/broken_conf_no_cookie_action.phpt index a354b8b..d2ee961 100644 --- a/src/tests/broken_configuration/broken_conf_no_cookie_action.phpt +++ b/src/tests/broken_configuration/broken_conf_no_cookie_action.phpt @@ -6,9 +6,9 @@ Bad config, invalid action. sp.configuration_file={PWD}/config/broken_conf_cookie_action.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] You must specify a at least one action to a cookie on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] You must specify a at least one action to a cookie on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] You must specify a at least one action to a cookie on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] You must specify a at least one action to a cookie on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_no_cookie_name.phpt b/src/tests/broken_configuration/broken_conf_no_cookie_name.phpt index e769edb..ec82655 100644 --- a/src/tests/broken_configuration/broken_conf_no_cookie_name.phpt +++ b/src/tests/broken_configuration/broken_conf_no_cookie_name.phpt @@ -6,9 +6,9 @@ Borken configuration - encrypted cookie with no name sp.configuration_file={PWD}/config/config_encrypted_cookies_noname.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] You must specify a cookie name/regexp on line 2 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] You must specify a cookie name/regexp on line 2 in Unknown on line 0 -Fatal error: [snuffleupagus][config] You must specify a cookie name/regexp on line 2 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] You must specify a cookie name/regexp on line 2 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_no_file_specified.phpt b/src/tests/broken_configuration/broken_conf_no_file_specified.phpt index 10314ec..98ec80c 100644 --- a/src/tests/broken_configuration/broken_conf_no_file_specified.phpt +++ b/src/tests/broken_configuration/broken_conf_no_file_specified.phpt @@ -6,5 +6,5 @@ Broken configuration - No configuration file specified --FILE-- --EXPECT-- -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. diff --git a/src/tests/broken_configuration/broken_conf_nonexisting_script.phpt b/src/tests/broken_configuration/broken_conf_nonexisting_script.phpt index 16583d3..b518295 100644 --- a/src/tests/broken_configuration/broken_conf_nonexisting_script.phpt +++ b/src/tests/broken_configuration/broken_conf_nonexisting_script.phpt @@ -8,9 +8,9 @@ sp.configuration_file={PWD}/config/broken_conf_nonexisting_script.ini echo 1; ?> --EXPECTF-- -PHP Fatal error: [snuffleupagus][config] The `script` (./non_existing_script.sh) doesn't exist on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] The `script` (./non_existing_script.sh) doesn't exist on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] The `script` (./non_existing_script.sh) doesn't exist on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] The `script` (./non_existing_script.sh) doesn't exist on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. diff --git a/src/tests/broken_configuration/broken_conf_quotes.phpt b/src/tests/broken_configuration/broken_conf_quotes.phpt index 845f7ee..86fac81 100644 --- a/src/tests/broken_configuration/broken_conf_quotes.phpt +++ b/src/tests/broken_configuration/broken_conf_quotes.phpt @@ -6,12 +6,12 @@ Broken configuration - missing quote sp.configuration_file={PWD}/config/broken_conf_quotes.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] You forgot to close a bracket. in Unknown on line 0 -PHP Fatal error: [snuffleupagus][config] Invalid value '_SERVER[PHP_SELF' for `var` on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] You forgot to close a bracket. in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value '_SERVER[PHP_SELF' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] You forgot to close a bracket. in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] You forgot to close a bracket. in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid value '_SERVER[PHP_SELF' for `var` on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value '_SERVER[PHP_SELF' for `var` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_readonly_exec.phpt b/src/tests/broken_configuration/broken_conf_readonly_exec.phpt index cc5758f..ca92aab 100644 --- a/src/tests/broken_configuration/broken_conf_readonly_exec.phpt +++ b/src/tests/broken_configuration/broken_conf_readonly_exec.phpt @@ -8,9 +8,9 @@ sp.configuration_file={PWD}/config/broken_conf_readonly_exec.ini echo 1; ?> --EXPECTF-- -PHP Fatal error: [snuffleupagus][config] Trailing chars '234);' at the end of '.enable(1234);' on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Trailing chars '234);' at the end of '.enable(1234);' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Trailing chars '234);' at the end of '.enable(1234);' on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Trailing chars '234);' at the end of '.enable(1234);' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. diff --git a/src/tests/broken_configuration/broken_conf_samesite.phpt b/src/tests/broken_configuration/broken_conf_samesite.phpt index 99965d4..f325891 100644 --- a/src/tests/broken_configuration/broken_conf_samesite.phpt +++ b/src/tests/broken_configuration/broken_conf_samesite.phpt @@ -6,9 +6,9 @@ Bad config, invalid samesite type. sp.configuration_file={PWD}/config/broken_conf_cookie_samesite.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] nop is an invalid value to samesite (expected Lax or Strict) on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] nop is an invalid value to samesite (expected Lax or Strict) on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] nop is an invalid value to samesite (expected Lax or Strict) on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] nop is an invalid value to samesite (expected Lax or Strict) on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_session_encryption.phpt b/src/tests/broken_configuration/broken_conf_session_encryption.phpt index b6a0ea7..a010bd1 100644 --- a/src/tests/broken_configuration/broken_conf_session_encryption.phpt +++ b/src/tests/broken_configuration/broken_conf_session_encryption.phpt @@ -6,9 +6,9 @@ Broken config, session encryption sp.configuration_file={PWD}/config/broken_conf_session_encryption.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Trailing chars 'nvalid value :/);' at the end of '.encrypt(invalid value :/);' on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Trailing chars 'nvalid value :/);' at the end of '.encrypt(invalid value :/);' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Trailing chars 'nvalid value :/);' at the end of '.encrypt(invalid value :/);' on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Trailing chars 'nvalid value :/);' at the end of '.encrypt(invalid value :/);' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. diff --git a/src/tests/broken_configuration/broken_conf_session_encryption_without_encryption_key.phpt b/src/tests/broken_configuration/broken_conf_session_encryption_without_encryption_key.phpt index c90a154..f958595 100644 --- a/src/tests/broken_configuration/broken_conf_session_encryption_without_encryption_key.phpt +++ b/src/tests/broken_configuration/broken_conf_session_encryption_without_encryption_key.phpt @@ -6,9 +6,9 @@ Broken configuration - encrypted session without encryption key sp.configuration_file={PWD}/config/broken_conf_session_encryption_without_encryption_key.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] You're trying to use the session cookie encryption feature on line 2 without having set the `.secret_key` option in`sp.global`: please set it first in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] You're trying to use the session cookie encryption feature on line 2 without having set the `.secret_key` option in`sp.global`: please set it first in Unknown on line 0 -Fatal error: [snuffleupagus][config] You're trying to use the session cookie encryption feature on line 2 without having set the `.secret_key` option in`sp.global`: please set it first in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] You're trying to use the session cookie encryption feature on line 2 without having set the `.secret_key` option in`sp.global`: please set it first in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. diff --git a/src/tests/broken_configuration/broken_conf_session_encryption_without_env_var.phpt b/src/tests/broken_configuration/broken_conf_session_encryption_without_env_var.phpt index c2654e4..0f6f744 100644 --- a/src/tests/broken_configuration/broken_conf_session_encryption_without_env_var.phpt +++ b/src/tests/broken_configuration/broken_conf_session_encryption_without_env_var.phpt @@ -6,9 +6,9 @@ Broken configuration - encrypted session without env var sp.configuration_file={PWD}/config/broken_conf_session_encryption_without_env_var.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] You're trying to use the session cookie encryption feature on line 2 without having set the `.cookie_env_var` option in`sp.global`: please set it first in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] You're trying to use the session cookie encryption feature on line 2 without having set the `.cookie_env_var` option in`sp.global`: please set it first in Unknown on line 0 -Fatal error: [snuffleupagus][config] You're trying to use the session cookie encryption feature on line 2 without having set the `.cookie_env_var` option in`sp.global`: please set it first in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] You're trying to use the session cookie encryption feature on line 2 without having set the `.cookie_env_var` option in`sp.global`: please set it first in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. diff --git a/src/tests/broken_configuration/broken_conf_shown_in_phpinfo.phpt b/src/tests/broken_configuration/broken_conf_shown_in_phpinfo.phpt index eb7eae6..c5c26c0 100644 --- a/src/tests/broken_configuration/broken_conf_shown_in_phpinfo.phpt +++ b/src/tests/broken_configuration/broken_conf_shown_in_phpinfo.phpt @@ -17,12 +17,12 @@ if (strstr($info, 'Valid config => no') !== FALSE) { } ?> --EXPECTF-- -PHP Fatal error: [snuffleupagus][config] Failed to compile '*.': %s on line 1. in Unknown on line 0 -PHP Fatal error: [snuffleupagus][config] '.filename_r()' is expecting a valid regexp, and not '"*."' on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Failed to compile '*.': %s on line 1. in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] '.filename_r()' is expecting a valid regexp, and not '"*."' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Failed to compile '*.': %s on line 1. in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Failed to compile '*.': %s on line 1. in Unknown on line 0 -Fatal error: [snuffleupagus][config] '.filename_r()' is expecting a valid regexp, and not '"*."' on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] '.filename_r()' is expecting a valid regexp, and not '"*."' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. diff --git a/src/tests/broken_configuration/broken_conf_truncated.phpt b/src/tests/broken_configuration/broken_conf_truncated.phpt index f0c5887..ac0cbb3 100644 --- a/src/tests/broken_configuration/broken_conf_truncated.phpt +++ b/src/tests/broken_configuration/broken_conf_truncated.phpt @@ -6,9 +6,9 @@ Bad boolean value in configuration sp.configuration_file={PWD}/config/config_broken_conf_truncated.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][error] A valid string as parameter is expected on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][error] A valid string as parameter is expected on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][error] A valid string as parameter is expected on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][error] A valid string as parameter is expected on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_unserialize.phpt b/src/tests/broken_configuration/broken_conf_unserialize.phpt index d7a924a..b1c26a3 100644 --- a/src/tests/broken_configuration/broken_conf_unserialize.phpt +++ b/src/tests/broken_configuration/broken_conf_unserialize.phpt @@ -8,9 +8,9 @@ sp.configuration_file={PWD}/config/broken_conf_unserialize.ini echo 1; ?> --EXPECTF-- -PHP Fatal error: [snuffleupagus][config] Trailing chars '234);' at the end of '.enable(1234);' on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Trailing chars '234);' at the end of '.enable(1234);' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Trailing chars '234);' at the end of '.enable(1234);' on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Trailing chars '234);' at the end of '.enable(1234);' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. diff --git a/src/tests/broken_configuration/broken_conf_upload_validation.phpt b/src/tests/broken_configuration/broken_conf_upload_validation.phpt index 332a649..47a2dd0 100644 --- a/src/tests/broken_configuration/broken_conf_upload_validation.phpt +++ b/src/tests/broken_configuration/broken_conf_upload_validation.phpt @@ -8,9 +8,9 @@ sp.configuration_file={PWD}/config/borken_conf_upload_validation.ini echo 1; ?> --EXPECTF-- -PHP Fatal error: [snuffleupagus][error] A valid string as parameter is expected on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][error] A valid string as parameter is expected on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][error] A valid string as parameter is expected on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][error] A valid string as parameter is expected on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. diff --git a/src/tests/broken_configuration/broken_conf_weird_keyword.phpt b/src/tests/broken_configuration/broken_conf_weird_keyword.phpt index e3c1239..e560c21 100644 --- a/src/tests/broken_configuration/broken_conf_weird_keyword.phpt +++ b/src/tests/broken_configuration/broken_conf_weird_keyword.phpt @@ -6,9 +6,9 @@ Bad config, unknown keyword sp.configuration_file={PWD}/config/broken_conf_weird_keyword.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Trailing chars '.not_a_valid_keyword("test");' at the end of '.enable().not_a_valid_keyword("test");' on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Trailing chars '.not_a_valid_keyword("test");' at the end of '.enable().not_a_valid_keyword("test");' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Trailing chars '.not_a_valid_keyword("test");' at the end of '.enable().not_a_valid_keyword("test");' on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Trailing chars '.not_a_valid_keyword("test");' at the end of '.enable().not_a_valid_keyword("test");' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_wrapper_whitelist.phpt b/src/tests/broken_configuration/broken_conf_wrapper_whitelist.phpt index ea147ac..d0b7427 100644 --- a/src/tests/broken_configuration/broken_conf_wrapper_whitelist.phpt +++ b/src/tests/broken_configuration/broken_conf_wrapper_whitelist.phpt @@ -10,9 +10,9 @@ sp.allow_broken_configuration=Off echo 1337; ?> --EXPECT-- -PHP Fatal error: [snuffleupagus][config] Trailing chars '.invalid_param();' at the end of '.invalid_param();' on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Trailing chars '.invalid_param();' at the end of '.invalid_param();' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Trailing chars '.invalid_param();' at the end of '.invalid_param();' on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Trailing chars '.invalid_param();' at the end of '.invalid_param();' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. diff --git a/src/tests/broken_configuration/broken_conf_wrong_quotes.phpt b/src/tests/broken_configuration/broken_conf_wrong_quotes.phpt index 119bbe7..52ea8d7 100644 --- a/src/tests/broken_configuration/broken_conf_wrong_quotes.phpt +++ b/src/tests/broken_configuration/broken_conf_wrong_quotes.phpt @@ -6,9 +6,9 @@ Configuration line with too many quotes sp.configuration_file={PWD}/config/broken_conf_wrong_quotes.ini --FILE-- --EXPECT-- -PHP Fatal error: [snuffleupagus][error] There is an issue with the parsing of '"\)': it doesn't look like a valid string on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][error] There is an issue with the parsing of '"\)': it doesn't look like a valid string on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][error] There is an issue with the parsing of '"\)': it doesn't look like a valid string on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][error] There is an issue with the parsing of '"\)': it doesn't look like a valid string on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_conf_wrong_type.phpt b/src/tests/broken_configuration/broken_conf_wrong_type.phpt index b90d6ff..60dde56 100644 --- a/src/tests/broken_configuration/broken_conf_wrong_type.phpt +++ b/src/tests/broken_configuration/broken_conf_wrong_type.phpt @@ -6,9 +6,9 @@ Broken conf with wrong type sp.configuration_file={PWD}/config/broken_conf_wrong_type.ini --FILE-- --EXPECTF-- -PHP Fatal error: [snuffleupagus][error] .ret_type() is expecting a valid php type ('false', 'true', 'array'. 'object', 'long', 'double', 'null', 'resource', 'reference', 'undef') on line 5 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][error] .ret_type() is expecting a valid php type ('false', 'true', 'array'. 'object', 'long', 'double', 'null', 'resource', 'reference', 'undef') on line 5 in Unknown on line 0 -Fatal error: [snuffleupagus][error] .ret_type() is expecting a valid php type ('false', 'true', 'array'. 'object', 'long', 'double', 'null', 'resource', 'reference', 'undef') on line 5 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][error] .ret_type() is expecting a valid php type ('false', 'true', 'array'. 'object', 'long', 'double', 'null', 'resource', 'reference', 'undef') on line 5 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_invalid_client_ip4.phpt b/src/tests/broken_configuration/broken_invalid_client_ip4.phpt index e8a5260..8e445e7 100644 --- a/src/tests/broken_configuration/broken_invalid_client_ip4.phpt +++ b/src/tests/broken_configuration/broken_invalid_client_ip4.phpt @@ -13,4 +13,4 @@ sp.configuration_file={PWD}/config/disabled_functions_cidr.ini strpos("1337", "1"); ?> --EXPECTF-- -Fatal error: [snuffleupagus][cidr_match] Weird ip (xyz) family in %a/broken_invalid_client_ip4.php on line 2 \ No newline at end of file +Fatal error: [snuffleupagus][xyz][cidr_match] Weird ip (xyz) family in %a/broken_invalid_client_ip4.php on line 2 \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_regexp.phpt b/src/tests/broken_configuration/broken_regexp.phpt index 2fc130d..28d803e 100644 --- a/src/tests/broken_configuration/broken_regexp.phpt +++ b/src/tests/broken_configuration/broken_regexp.phpt @@ -6,12 +6,12 @@ Broken regexp sp.configuration_file={PWD}/config/broken_regexp.ini --FILE-- --EXPECTF-- -PHP Fatal error: [snuffleupagus][config] Failed to compile '^$[': missing terminating ] for character class on line 1. in Unknown on line 0 -PHP Fatal error: [snuffleupagus][config] '.value_r()' is expecting a valid regexp, and not '"^$["' on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Failed to compile '^$[': missing terminating ] for character class on line 1. in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] '.value_r()' is expecting a valid regexp, and not '"^$["' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Failed to compile '^$[': missing terminating ] for character class on line 1. in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Failed to compile '^$[': missing terminating ] for character class on line 1. in Unknown on line 0 -Fatal error: [snuffleupagus][config] '.value_r()' is expecting a valid regexp, and not '"^$["' on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] '.value_r()' is expecting a valid regexp, and not '"^$["' on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/broken_unmatching_brackets.phpt b/src/tests/broken_configuration/broken_unmatching_brackets.phpt index 33eaaa7..6c63303 100644 --- a/src/tests/broken_configuration/broken_unmatching_brackets.phpt +++ b/src/tests/broken_configuration/broken_unmatching_brackets.phpt @@ -6,12 +6,12 @@ Broken configuration - unmatching brackets sp.configuration_file={PWD}/config/config_unmatching_brackets.ini --FILE-- --EXPECTF-- -PHP Fatal error: [snuffleupagus][config] Invalid `]` position. in Unknown on line 0 -PHP Fatal error: [snuffleupagus][config] Invalid value 'arr[b]]]]]' for `param` on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `]` position. in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value 'arr[b]]]]]' for `param` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid `]` position. in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid `]` position. in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid value 'arr[b]]]]]' for `param` on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid value 'arr[b]]]]]' for `param` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/broken_configuration/encrypt_regexp_cookies_bad_regexp.phpt b/src/tests/broken_configuration/encrypt_regexp_cookies_bad_regexp.phpt index 8272148..c0fe5e4 100644 --- a/src/tests/broken_configuration/encrypt_regexp_cookies_bad_regexp.phpt +++ b/src/tests/broken_configuration/encrypt_regexp_cookies_bad_regexp.phpt @@ -15,8 +15,8 @@ EOF; --FILE-- --EXPECT-- -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][127.0.0.1][config] Invalid configuration file in Unknown on line 0 -Fatal error: [snuffleupagus][config] Failed to compile '^super_co[a-z+$': missing terminating ] for character class on line 2. in Unknown on line 0 +Fatal error: [snuffleupagus][127.0.0.1][config] Failed to compile '^super_co[a-z+$': missing terminating ] for character class on line 2. in Unknown on line 0 -Fatal error: [snuffleupagus][config] '.name_r()' is expecting a valid regexp, and not '"^super_co[a-z+$"' on line 2 in Unknown on line 0 +Fatal error: [snuffleupagus][127.0.0.1][config] '.name_r()' is expecting a valid regexp, and not '"^super_co[a-z+$"' on line 2 in Unknown on line 0 diff --git a/src/tests/cookies_encryption/encrypt_cookies_empty_env.phpt b/src/tests/cookies_encryption/encrypt_cookies_empty_env.phpt index 23f1759..721806a 100644 --- a/src/tests/cookies_encryption/encrypt_cookies_empty_env.phpt +++ b/src/tests/cookies_encryption/encrypt_cookies_empty_env.phpt @@ -12,7 +12,7 @@ super_cookie=cGFkZGluZ3BhZGRpbmdwYWRkaW5ncGFkZGluZ3BhZGRpbmdwYWRkaW5ncGFkZGluZ3B --FILE-- --EXPECT-- -Warning: [snuffleupagus][cookie_encryption] The environment variable 'SUPER_ENV_VAR' is empty, cookies are weakly encrypted in Unknown on line 0 +Warning: [snuffleupagus][0.0.0.0][cookie_encryption] The environment variable 'SUPER_ENV_VAR' is empty, cookies are weakly encrypted in Unknown on line 0 -Warning: [snuffleupagus][cookie_encryption] Something went wrong with the decryption of super_cookie in Unknown on line 0 +Warning: [snuffleupagus][0.0.0.0][cookie_encryption] Something went wrong with the decryption of super_cookie in Unknown on line 0 1 diff --git a/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption.phpt b/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption.phpt index d4a0b0f..e2190b3 100644 --- a/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption.phpt +++ b/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption.phpt @@ -18,7 +18,7 @@ EOF; echo "1337\n"; var_dump($_COOKIE); ?> --EXPECT-- -Warning: [snuffleupagus][cookie_encryption] Something went wrong with the decryption of super_cookie in Unknown on line 0 +Warning: [snuffleupagus][127.0.0.1][cookie_encryption] Something went wrong with the decryption of super_cookie in Unknown on line 0 1337 array(1) { ["awfulcookie"]=> diff --git a/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption2.phpt b/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption2.phpt index b3a55dd..3efe051 100644 --- a/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption2.phpt +++ b/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption2.phpt @@ -16,4 +16,4 @@ EOF; --FILE-- --EXPECT-- -Fatal error: [snuffleupagus][cookie_encryption] Buffer underflow tentative detected in cookie encryption handling in Unknown on line 0 \ No newline at end of file +Fatal error: [snuffleupagus][127.0.0.1][cookie_encryption] Buffer underflow tentative detected in cookie encryption handling in Unknown on line 0 \ No newline at end of file diff --git a/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption_short_cookie.phpt b/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption_short_cookie.phpt index 39f189c..5c99dfc 100644 --- a/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption_short_cookie.phpt +++ b/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption_short_cookie.phpt @@ -16,7 +16,7 @@ EOF; --FILE-- --EXPECT-- -Warning: [snuffleupagus][cookie_encryption] Buffer underflow tentative detected in cookie encryption handling for super_cookie. Using the cookie 'as it' instead of decrypting it in Unknown on line 0 +Warning: [snuffleupagus][127.0.0.1][cookie_encryption] Buffer underflow tentative detected in cookie encryption handling for super_cookie. Using the cookie 'as it' instead of decrypting it in Unknown on line 0 array(2) { ["super_cookie"]=> string(3) "AAA" diff --git a/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption_simulation.phpt b/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption_simulation.phpt index d2004b9..29adcf4 100644 --- a/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption_simulation.phpt +++ b/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption_simulation.phpt @@ -18,7 +18,7 @@ EOF; echo "1337\n"; var_dump($_COOKIE); ?> --EXPECT-- -Warning: [snuffleupagus][cookie_encryption] Something went wrong with the decryption of super_cookie. Using the cookie 'as it' instead of decrypting it in Unknown on line 0 +Warning: [snuffleupagus][127.0.0.1][cookie_encryption] Something went wrong with the decryption of super_cookie. Using the cookie 'as it' instead of decrypting it in Unknown on line 0 1337 array(2) { ["super_cookie"]=> diff --git a/src/tests/cookies_encryption/encrypt_regexp_cookies_empty_env.phpt b/src/tests/cookies_encryption/encrypt_regexp_cookies_empty_env.phpt index 852c32e..7bd2fcc 100644 --- a/src/tests/cookies_encryption/encrypt_regexp_cookies_empty_env.phpt +++ b/src/tests/cookies_encryption/encrypt_regexp_cookies_empty_env.phpt @@ -16,4 +16,4 @@ EOF; --FILE-- --EXPECT-- -Fatal error: [snuffleupagus][cookie_encryption] Buffer underflow tentative detected in cookie encryption handling in Unknown on line 0 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][cookie_encryption] Buffer underflow tentative detected in cookie encryption handling in Unknown on line 0 \ No newline at end of file diff --git a/src/tests/cookies_encryption/encrypt_regexp_cookies_invalid_decryption.phpt b/src/tests/cookies_encryption/encrypt_regexp_cookies_invalid_decryption.phpt index d2f9e3c..a0729d4 100644 --- a/src/tests/cookies_encryption/encrypt_regexp_cookies_invalid_decryption.phpt +++ b/src/tests/cookies_encryption/encrypt_regexp_cookies_invalid_decryption.phpt @@ -16,7 +16,7 @@ EOF; --FILE-- --EXPECT-- -Warning: [snuffleupagus][cookie_encryption] Something went wrong with the decryption of super_cookie in Unknown on line 0 +Warning: [snuffleupagus][127.0.0.1][cookie_encryption] Something went wrong with the decryption of super_cookie in Unknown on line 0 array(1) { ["awful_cookie"]=> string(18) "awful_cookie_value" diff --git a/src/tests/cookies_encryption/encrypt_regexp_cookies_invalid_decryption2.phpt b/src/tests/cookies_encryption/encrypt_regexp_cookies_invalid_decryption2.phpt index e75e036..11288e0 100644 --- a/src/tests/cookies_encryption/encrypt_regexp_cookies_invalid_decryption2.phpt +++ b/src/tests/cookies_encryption/encrypt_regexp_cookies_invalid_decryption2.phpt @@ -16,4 +16,4 @@ EOF; --FILE-- --EXPECT-- -Fatal error: [snuffleupagus][cookie_encryption] Buffer underflow tentative detected in cookie encryption handling in Unknown on line 0 \ No newline at end of file +Fatal error: [snuffleupagus][127.0.0.1][cookie_encryption] Buffer underflow tentative detected in cookie encryption handling in Unknown on line 0 \ No newline at end of file diff --git a/src/tests/cookies_encryption_warning/encrypt_cookies_no_env.phpt b/src/tests/cookies_encryption_warning/encrypt_cookies_no_env.phpt index d9d9138..f1ebf2f 100644 --- a/src/tests/cookies_encryption_warning/encrypt_cookies_no_env.phpt +++ b/src/tests/cookies_encryption_warning/encrypt_cookies_no_env.phpt @@ -16,6 +16,6 @@ EOF; --FILE-- --EXPECT-- -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][127.0.0.1][config] Invalid configuration file in Unknown on line 0 -Fatal error: [snuffleupagus][config] You're trying to use the cookie encryption featureon line 2 without having set the `.cookie_env_var` option in`sp.global`: please set it first in Unknown on line 0 +Fatal error: [snuffleupagus][127.0.0.1][config] You're trying to use the cookie encryption featureon line 2 without having set the `.cookie_env_var` option in`sp.global`: please set it first in Unknown on line 0 diff --git a/src/tests/cookies_encryption_warning/encrypt_cookies_no_key.phpt b/src/tests/cookies_encryption_warning/encrypt_cookies_no_key.phpt index 3eb726e..d24446b 100644 --- a/src/tests/cookies_encryption_warning/encrypt_cookies_no_key.phpt +++ b/src/tests/cookies_encryption_warning/encrypt_cookies_no_key.phpt @@ -16,6 +16,6 @@ EOF; --FILE-- --EXPECT-- -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][127.0.0.1][config] Invalid configuration file in Unknown on line 0 -Fatal error: [snuffleupagus][config] You're trying to use the cookie encryption featureon line 2 without having set the `.encryption_key` option in`sp.global`: please set it first in Unknown on line 0 +Fatal error: [snuffleupagus][127.0.0.1][config] You're trying to use the cookie encryption featureon line 2 without having set the `.encryption_key` option in`sp.global`: please set it first in Unknown on line 0 diff --git a/src/tests/cookies_encryption_warning/encrypt_regexp_cookies_no_env.phpt b/src/tests/cookies_encryption_warning/encrypt_regexp_cookies_no_env.phpt index 0c0dea5..995ac4f 100644 --- a/src/tests/cookies_encryption_warning/encrypt_regexp_cookies_no_env.phpt +++ b/src/tests/cookies_encryption_warning/encrypt_regexp_cookies_no_env.phpt @@ -16,6 +16,6 @@ EOF; --FILE-- --EXPECT-- -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][127.0.0.1][config] Invalid configuration file in Unknown on line 0 -Fatal error: [snuffleupagus][config] You're trying to use the cookie encryption featureon line 2 without having set the `.cookie_env_var` option in`sp.global`: please set it first in Unknown on line 0 +Fatal error: [snuffleupagus][127.0.0.1][config] You're trying to use the cookie encryption featureon line 2 without having set the `.cookie_env_var` option in`sp.global`: please set it first in Unknown on line 0 diff --git a/src/tests/cookies_encryption_warning/encrypt_regexp_cookies_no_key.phpt b/src/tests/cookies_encryption_warning/encrypt_regexp_cookies_no_key.phpt index 1877dd6..ead651d 100644 --- a/src/tests/cookies_encryption_warning/encrypt_regexp_cookies_no_key.phpt +++ b/src/tests/cookies_encryption_warning/encrypt_regexp_cookies_no_key.phpt @@ -16,6 +16,6 @@ EOF; --FILE-- --EXPECT-- -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][127.0.0.1][config] Invalid configuration file in Unknown on line 0 -Fatal error: [snuffleupagus][config] You're trying to use the cookie encryption featureon line 2 without having set the `.encryption_key` option in`sp.global`: please set it first in Unknown on line 0 +Fatal error: [snuffleupagus][127.0.0.1][config] You're trying to use the cookie encryption featureon line 2 without having set the `.encryption_key` option in`sp.global`: please set it first in Unknown on line 0 diff --git a/src/tests/deny_writable/deny_writable_execution.phpt b/src/tests/deny_writable/deny_writable_execution.phpt index 916328e..43d12c3 100644 --- a/src/tests/deny_writable/deny_writable_execution.phpt +++ b/src/tests/deny_writable/deny_writable_execution.phpt @@ -40,4 +40,4 @@ unlink("$dir/non_writable_file.txt"); unlink("$dir/writable_file.txt"); ?> --EXPECTF-- -Fatal error: [snuffleupagus][readonly_exec] Attempted execution of a writable file (%a/deny_writable_execution.php). in %a/deny_writable_execution.php on line 2 +Fatal error: [snuffleupagus][0.0.0.0][readonly_exec] Attempted execution of a writable file (%a/deny_writable_execution.php). in %a/deny_writable_execution.php on line 2 diff --git a/src/tests/deny_writable/deny_writable_execution_simulation.phpt b/src/tests/deny_writable/deny_writable_execution_simulation.phpt index 7fc0c63..b03bc8f 100644 --- a/src/tests/deny_writable/deny_writable_execution_simulation.phpt +++ b/src/tests/deny_writable/deny_writable_execution_simulation.phpt @@ -41,10 +41,10 @@ unlink("$dir/non_writable_file.txt"); unlink("$dir/writable_file.txt"); ?> --EXPECTF-- -Warning: [snuffleupagus][readonly_exec] Attempted execution of a writable file (%a/deny_writable_execution_simulation.php). in %a/deny_writable_execution_simulation.php on line 2 +Warning: [snuffleupagus][0.0.0.0][readonly_exec] Attempted execution of a writable file (%a/deny_writable_execution_simulation.php). in %a/deny_writable_execution_simulation.php on line 2 -Warning: [snuffleupagus][readonly_exec] Attempted execution of a writable file (%a/writable_file.txt). in %a/deny_writable_execution_simulation.php on line 12 +Warning: [snuffleupagus][0.0.0.0][readonly_exec] Attempted execution of a writable file (%a/writable_file.txt). in %a/deny_writable_execution_simulation.php on line 12 -Warning: [snuffleupagus][readonly_exec] Attempted execution of a writable file (%a/writable_file.txt). in %a/writable_file.txt on line 1 +Warning: [snuffleupagus][0.0.0.0][readonly_exec] Attempted execution of a writable file (%a/writable_file.txt). in %a/writable_file.txt on line 1 Code execution within a writable file. Code execution within a non-writable file. diff --git a/src/tests/disable_function/disabled_function_echo.phpt b/src/tests/disable_function/disabled_function_echo.phpt index 21e2002..5dbfe43 100644 --- a/src/tests/disable_function/disabled_function_echo.phpt +++ b/src/tests/disable_function/disabled_function_echo.phpt @@ -16,4 +16,4 @@ test("oops"); --CLEAN-- --EXPECTF-- qwerty -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'echo' in %a/disabled_function_echo.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'echo' in %a/disabled_function_echo.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_function_echo_2.phpt b/src/tests/disable_function/disabled_function_echo_2.phpt index 66cace3..c317cf7 100644 --- a/src/tests/disable_function/disabled_function_echo_2.phpt +++ b/src/tests/disable_function/disabled_function_echo_2.phpt @@ -12,4 +12,4 @@ echo "1", "oops"; --CLEAN-- --EXPECTF-- qwe1 -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'echo' in %a/disabled_function_echo_2.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'echo' in %a/disabled_function_echo_2.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_function_echo_local_var.phpt b/src/tests/disable_function/disabled_function_echo_local_var.phpt index 300f38e..3bbb2a0 100644 --- a/src/tests/disable_function/disabled_function_echo_local_var.phpt +++ b/src/tests/disable_function/disabled_function_echo_local_var.phpt @@ -18,4 +18,4 @@ test(); --EXPECTF-- 3 -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'echo' in %a/disabled_function_echo_local_var.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'echo' in %a/disabled_function_echo_local_var.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_function_ensure_client_valid_certs.phpt b/src/tests/disable_function/disabled_function_ensure_client_valid_certs.phpt index 513b650..1d51b05 100644 --- a/src/tests/disable_function/disabled_function_ensure_client_valid_certs.phpt +++ b/src/tests/disable_function/disabled_function_ensure_client_valid_certs.phpt @@ -15,4 +15,4 @@ curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, '0'); echo "1337"; ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_setopt', because its argument '$option' content (64) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYPEER off.' in %s/disabled_function_ensure_client_valid_certs.php on line %d +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'curl_setopt', because its argument '$option' content (64) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYPEER off.' in %s/disabled_function_ensure_client_valid_certs.php on line %d diff --git a/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_multi_setopt.phpt b/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_multi_setopt.phpt index a854558..a79ff48 100644 --- a/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_multi_setopt.phpt +++ b/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_multi_setopt.phpt @@ -14,4 +14,4 @@ curl_multi_setopt($mch, CURLOPT_SSL_VERIFYPEER, 0); echo "1337"; ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_multi_setopt', because its argument '$option' content (64) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYPEER off.' in %s/disabled_function_ensure_client_valid_certs_curl_multi_setopt.php on line %d +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'curl_multi_setopt', because its argument '$option' content (64) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYPEER off.' in %s/disabled_function_ensure_client_valid_certs_curl_multi_setopt.php on line %d diff --git a/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_setopt_array.phpt b/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_setopt_array.phpt index 86f95d2..6c7bc93 100644 --- a/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_setopt_array.phpt +++ b/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_setopt_array.phpt @@ -16,4 +16,4 @@ curl_setopt_array($ch, $options); echo "1337"; ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_setopt_array', because its argument '$options' content (0) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYPEER off.' in %s/disabled_function_ensure_client_valid_certs_curl_setopt_array.php on line 5 +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'curl_setopt_array', because its argument '$options' content (0) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYPEER off.' in %s/disabled_function_ensure_client_valid_certs_curl_setopt_array.php on line 5 diff --git a/src/tests/disable_function/disabled_function_ensure_server_valid_certs.phpt b/src/tests/disable_function/disabled_function_ensure_server_valid_certs.phpt index 8a50c97..40b58cc 100644 --- a/src/tests/disable_function/disabled_function_ensure_server_valid_certs.phpt +++ b/src/tests/disable_function/disabled_function_ensure_server_valid_certs.phpt @@ -15,4 +15,4 @@ curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, '0'); echo "1337"; ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_setopt', because its argument '$option' content (81) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYHOST off.' in %s/disabled_function_ensure_server_valid_certs.php on line %d +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'curl_setopt', because its argument '$option' content (81) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYHOST off.' in %s/disabled_function_ensure_server_valid_certs.php on line %d diff --git a/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_multi_setopt.phpt b/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_multi_setopt.phpt index 4513848..06acd6c 100644 --- a/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_multi_setopt.phpt +++ b/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_multi_setopt.phpt @@ -14,4 +14,4 @@ curl_multi_setopt($mch, CURLOPT_SSL_VERIFYHOST, 0); echo "1337"; ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_multi_setopt', because its argument '$option' content (81) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYHOST off.' in %s/disabled_function_ensure_server_valid_certs_curl_multi_setopt.php on line %d +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'curl_multi_setopt', because its argument '$option' content (81) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYHOST off.' in %s/disabled_function_ensure_server_valid_certs_curl_multi_setopt.php on line %d diff --git a/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_setopt_array.phpt b/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_setopt_array.phpt index c10d9b0..c716625 100644 --- a/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_setopt_array.phpt +++ b/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_setopt_array.phpt @@ -16,4 +16,4 @@ curl_setopt_array($ch, $options); echo "1337"; ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_setopt_array', because its argument '$options' content (0) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYHOST off.' in %s/disabled_function_ensure_server_valid_certs_curl_setopt_array.php on line 5 +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'curl_setopt_array', because its argument '$options' content (0) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYHOST off.' in %s/disabled_function_ensure_server_valid_certs_curl_setopt_array.php on line 5 diff --git a/src/tests/disable_function/disabled_function_local_var.phpt b/src/tests/disable_function/disabled_function_local_var.phpt index 58dc2ea..1323cc9 100644 --- a/src/tests/disable_function/disabled_function_local_var.phpt +++ b/src/tests/disable_function/disabled_function_local_var.phpt @@ -22,4 +22,4 @@ Value of a: 1338 ID Value of a: 1337 -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var.php on line 4 +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var.php on line 4 diff --git a/src/tests/disable_function/disabled_function_local_var_10.phpt b/src/tests/disable_function/disabled_function_local_var_10.phpt index e50a5a4..a3110ac 100644 --- a/src/tests/disable_function/disabled_function_local_var_10.phpt +++ b/src/tests/disable_function/disabled_function_local_var_10.phpt @@ -42,4 +42,4 @@ array(2) { } } -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_10.php on line 7 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_10.php on line 7 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_function_local_var_2.phpt b/src/tests/disable_function/disabled_function_local_var_2.phpt index 5a186cd..d672010 100644 --- a/src/tests/disable_function/disabled_function_local_var_2.phpt +++ b/src/tests/disable_function/disabled_function_local_var_2.phpt @@ -44,4 +44,4 @@ array(2) { string(5) "block" } -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_2.php on line 4 +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_2.php on line 4 diff --git a/src/tests/disable_function/disabled_function_local_var_3.phpt b/src/tests/disable_function/disabled_function_local_var_3.phpt index 6399a1e..66c5d69 100644 --- a/src/tests/disable_function/disabled_function_local_var_3.phpt +++ b/src/tests/disable_function/disabled_function_local_var_3.phpt @@ -43,4 +43,4 @@ array(2) { } } -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_3.php on line 3 +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_3.php on line 3 diff --git a/src/tests/disable_function/disabled_function_local_var_4.phpt b/src/tests/disable_function/disabled_function_local_var_4.phpt index f0b1291..fceee23 100644 --- a/src/tests/disable_function/disabled_function_local_var_4.phpt +++ b/src/tests/disable_function/disabled_function_local_var_4.phpt @@ -54,4 +54,4 @@ test(); Valeur: valeur de a Valeur: valeur de apres -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_4.php on line 36 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_4.php on line 36 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_function_local_var_5.phpt b/src/tests/disable_function/disabled_function_local_var_5.phpt index 431bbf9..e95ff19 100644 --- a/src/tests/disable_function/disabled_function_local_var_5.phpt +++ b/src/tests/disable_function/disabled_function_local_var_5.phpt @@ -31,4 +31,4 @@ object(stdClass)#1 (1) { string(16) "not a good value" } -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_5.php on line 3 +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_5.php on line 3 diff --git a/src/tests/disable_function/disabled_function_local_var_6.phpt b/src/tests/disable_function/disabled_function_local_var_6.phpt index 0bb9f6d..cd2eb61 100644 --- a/src/tests/disable_function/disabled_function_local_var_6.phpt +++ b/src/tests/disable_function/disabled_function_local_var_6.phpt @@ -29,4 +29,4 @@ class test_object { --EXPECTF-- Valeur: no good -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_6.php on line 4 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_6.php on line 4 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_function_local_var_7.phpt b/src/tests/disable_function/disabled_function_local_var_7.phpt index d5c74ba..d219780 100644 --- a/src/tests/disable_function/disabled_function_local_var_7.phpt +++ b/src/tests/disable_function/disabled_function_local_var_7.phpt @@ -29,4 +29,4 @@ class test_object { --EXPECTF-- Valeur: qwerty -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_7.php on line 4 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_7.php on line 4 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_function_local_var_8.phpt b/src/tests/disable_function/disabled_function_local_var_8.phpt index 436cca2..8b64534 100644 --- a/src/tests/disable_function/disabled_function_local_var_8.phpt +++ b/src/tests/disable_function/disabled_function_local_var_8.phpt @@ -18,4 +18,4 @@ namespace asd { --EXPECTF-- Valeur: qwerty -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_8.php on line 8 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_8.php on line 8 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_function_local_var_9.phpt b/src/tests/disable_function/disabled_function_local_var_9.phpt index 5844458..cc37a78 100644 --- a/src/tests/disable_function/disabled_function_local_var_9.phpt +++ b/src/tests/disable_function/disabled_function_local_var_9.phpt @@ -18,4 +18,4 @@ namespace asd { --EXPECTF-- Valeur: asdfgh -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_9.php on line 8 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_9.php on line 8 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_function_local_var_const.phpt b/src/tests/disable_function/disabled_function_local_var_const.phpt index 2013f6d..1500558 100644 --- a/src/tests/disable_function/disabled_function_local_var_const.phpt +++ b/src/tests/disable_function/disabled_function_local_var_const.phpt @@ -11,4 +11,4 @@ define("MY_CONST", $a); strtoupper("test"); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_const.php on line 4 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_const.php on line 4 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_function_local_var_obj.phpt b/src/tests/disable_function/disabled_function_local_var_obj.phpt index 89e423a..c8c3be3 100644 --- a/src/tests/disable_function/disabled_function_local_var_obj.phpt +++ b/src/tests/disable_function/disabled_function_local_var_obj.phpt @@ -23,4 +23,4 @@ echo strtoupper($test->$arg) . "\n"; --EXPECTF-- QWE -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_obj.php on line 14 +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_local_var_obj.php on line 14 diff --git a/src/tests/disable_function/disabled_function_param.phpt b/src/tests/disable_function/disabled_function_param.phpt index 9b8b942..80812b9 100644 --- a/src/tests/disable_function/disabled_function_param.phpt +++ b/src/tests/disable_function/disabled_function_param.phpt @@ -17,4 +17,4 @@ qweqwe(Array(2)); --EXPECTF-- OK -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'qweqwe', because its argument '$asd' content (2) matched a rule in %a/disabled_function_param.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'qweqwe', because its argument '$asd' content (2) matched a rule in %a/disabled_function_param.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_function_print.phpt b/src/tests/disable_function/disabled_function_print.phpt index a8b10b4..ee02687 100644 --- a/src/tests/disable_function/disabled_function_print.phpt +++ b/src/tests/disable_function/disabled_function_print.phpt @@ -16,4 +16,4 @@ test("oops"); --CLEAN-- --EXPECTF-- qwerty -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'echo' in %a/disabled_function_print.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'echo' in %a/disabled_function_print.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_function_super_global_var.phpt b/src/tests/disable_function/disabled_function_super_global_var.phpt index 196d9e2..3aa8ea1 100644 --- a/src/tests/disable_function/disabled_function_super_global_var.phpt +++ b/src/tests/disable_function/disabled_function_super_global_var.phpt @@ -18,4 +18,4 @@ test(); --EXPECTF-- TEST -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_super_global_var.php on line 3 +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_super_global_var.php on line 3 diff --git a/src/tests/disable_function/disabled_functions.phpt b/src/tests/disable_function/disabled_functions.phpt index 6e57dba..45a46ad 100644 --- a/src/tests/disable_function/disabled_functions.phpt +++ b/src/tests/disable_function/disabled_functions.phpt @@ -14,4 +14,4 @@ var_dump("this is a super test"); echo strpos("pouet", "o"); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system' in %a/disabled_functions.php on line %d +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'system' in %a/disabled_functions.php on line %d diff --git a/src/tests/disable_function/disabled_functions_callback_called_file_r.phpt b/src/tests/disable_function/disabled_functions_callback_called_file_r.phpt index 9c25f9d..63a0e00 100644 --- a/src/tests/disable_function/disabled_functions_callback_called_file_r.phpt +++ b/src/tests/disable_function/disabled_functions_callback_called_file_r.phpt @@ -36,4 +36,4 @@ $dir = __DIR__; @unlink("$dir/myfunc_callback.php"); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'test_callback' in %a/myfunc_callback.php on line 4 +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'test_callback' in %a/myfunc_callback.php on line 4 diff --git a/src/tests/disable_function/disabled_functions_called_file_r.phpt b/src/tests/disable_function/disabled_functions_called_file_r.phpt index b361dc8..a02dde0 100644 --- a/src/tests/disable_function/disabled_functions_called_file_r.phpt +++ b/src/tests/disable_function/disabled_functions_called_file_r.phpt @@ -31,4 +31,4 @@ $dir = __DIR__; @unlink("$dir/myfunc.php"); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'test' in %a/myfunc.php on line 3 +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'test' in %a/myfunc.php on line 3 diff --git a/src/tests/disable_function/disabled_functions_chain.phpt b/src/tests/disable_function/disabled_functions_chain.phpt index 5aee085..fd379c9 100644 --- a/src/tests/disable_function/disabled_functions_chain.phpt +++ b/src/tests/disable_function/disabled_functions_chain.phpt @@ -24,4 +24,4 @@ echo "I'm after the call to outer\n"; I'm before the call to outer I'm in the outer function, before the call! -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'outer>inner' in %a/disabled_functions_chain.php on line 5 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'outer>inner' in %a/disabled_functions_chain.php on line 5 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_chain_call_user_func.phpt b/src/tests/disable_function/disabled_functions_chain_call_user_func.phpt index 90c1f32..fd07225 100644 --- a/src/tests/disable_function/disabled_functions_chain_call_user_func.phpt +++ b/src/tests/disable_function/disabled_functions_chain_call_user_func.phpt @@ -24,4 +24,4 @@ echo "I'm after the call to outer\n"; I'm before the call to outer I'm in the outer function, before the call! -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'outer>inner' in %a/disabled_functions_chain_call_user_func.php on line 5 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'outer>inner' in %a/disabled_functions_chain_call_user_func.php on line 5 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_chain_call_user_func_ret.phpt b/src/tests/disable_function/disabled_functions_chain_call_user_func_ret.phpt index 6a4cca6..3046096 100644 --- a/src/tests/disable_function/disabled_functions_chain_call_user_func_ret.phpt +++ b/src/tests/disable_function/disabled_functions_chain_call_user_func_ret.phpt @@ -28,7 +28,7 @@ not matching_one one two -Warning: [snuffleupagus][disabled_function] Aborted execution on return of the function 'two', because the function returned 'matching_two', which matched a rule in %a/disabled_functions_chain_call_user_func_ret.php on line %d +Warning: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on return of the function 'two', because the function returned 'matching_two', which matched a rule in %a/disabled_functions_chain_call_user_func_ret.php on line %d matching_one one two diff --git a/src/tests/disable_function/disabled_functions_cidr.phpt b/src/tests/disable_function/disabled_functions_cidr.phpt index dcd4189..ea690e8 100644 --- a/src/tests/disable_function/disabled_functions_cidr.phpt +++ b/src/tests/disable_function/disabled_functions_cidr.phpt @@ -13,4 +13,4 @@ sp.configuration_file={PWD}/config/disabled_functions_cidr.ini system("echo 42"); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system' in %a/disabled_functions_cidr.php on line 2 \ No newline at end of file +Fatal error: [snuffleupagus][127.0.0.1][disabled_function] Aborted execution on call of the function 'system' in %a/disabled_functions_cidr.php on line 2 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_cidr_6.phpt b/src/tests/disable_function/disabled_functions_cidr_6.phpt index 17822cd..914cd35 100644 --- a/src/tests/disable_function/disabled_functions_cidr_6.phpt +++ b/src/tests/disable_function/disabled_functions_cidr_6.phpt @@ -14,4 +14,4 @@ strpos("a", "b"); printf(1337); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strpos' in %a/disabled_functions_cidr_6.php on line 2 +Fatal error: [snuffleupagus][2001:0db8:f000:f000:f000:ff00:0042:8328][disabled_function] Aborted execution on call of the function 'strpos' in %a/disabled_functions_cidr_6.php on line 2 diff --git a/src/tests/disable_function/disabled_functions_die.phpt b/src/tests/disable_function/disabled_functions_die.phpt index bfabaee..73bd657 100644 --- a/src/tests/disable_function/disabled_functions_die.phpt +++ b/src/tests/disable_function/disabled_functions_die.phpt @@ -10,4 +10,4 @@ die('OMG'); ?> --XFAIL-- --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'die' in %a/disabled_function_echo.php on line 3 +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'die' in %a/disabled_function_echo.php on line 3 diff --git a/src/tests/disable_function/disabled_functions_eval.phpt b/src/tests/disable_function/disabled_functions_eval.phpt index a5d1489..04b2342 100644 --- a/src/tests/disable_function/disabled_functions_eval.phpt +++ b/src/tests/disable_function/disabled_functions_eval.phpt @@ -11,4 +11,4 @@ eval('$var = 1337 + 1337;'); print("Variable: $var\n"); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'eval' in %a/disabled_functions_eval.php(3) : eval()'d code on line 1 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'eval' in %a/disabled_functions_eval.php(3) : eval()'d code on line 1 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_eval_filename.phpt b/src/tests/disable_function/disabled_functions_eval_filename.phpt index 4491e9e..564116e 100644 --- a/src/tests/disable_function/disabled_functions_eval_filename.phpt +++ b/src/tests/disable_function/disabled_functions_eval_filename.phpt @@ -11,4 +11,4 @@ eval('$var = 1337 + 1337;'); print("Variable: $var\n"); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'eval' in %a/disabled_functions_eval_filename.php(3) : eval()'d code on line 1 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'eval' in %a/disabled_functions_eval_filename.php(3) : eval()'d code on line 1 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_eval_simulation.phpt b/src/tests/disable_function/disabled_functions_eval_simulation.phpt index 2df04a9..6286235 100644 --- a/src/tests/disable_function/disabled_functions_eval_simulation.phpt +++ b/src/tests/disable_function/disabled_functions_eval_simulation.phpt @@ -11,5 +11,5 @@ eval('$var = 1337 + 1337;'); print("Variable: $var\n"); ?> --EXPECTF-- -Warning: [snuffleupagus][disabled_function] Aborted execution on call of the function 'eval' in %a/disabled_functions_eval_simulation.php(3) : eval()'d code on line 1 +Warning: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'eval' in %a/disabled_functions_eval_simulation.php(3) : eval()'d code on line 1 Variable: 2674 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_eval_user.phpt b/src/tests/disable_function/disabled_functions_eval_user.phpt index 30ba1d5..7e02d13 100644 --- a/src/tests/disable_function/disabled_functions_eval_user.phpt +++ b/src/tests/disable_function/disabled_functions_eval_user.phpt @@ -15,4 +15,4 @@ eval('$a = my_func();'); echo '$a = ' . $a . "\n"; ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'my_func' in %a/disabled_functions_eval_user.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'my_func' in %a/disabled_functions_eval_user.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_exit.phpt b/src/tests/disable_function/disabled_functions_exit.phpt index b204fcd..a6fd3c6 100644 --- a/src/tests/disable_function/disabled_functions_exit.phpt +++ b/src/tests/disable_function/disabled_functions_exit.phpt @@ -10,4 +10,4 @@ exit('OMG'); ?> --XFAIL-- --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'exit' in %a/disabled_function_echo.php on line 3 +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'exit' in %a/disabled_function_echo.php on line 3 diff --git a/src/tests/disable_function/disabled_functions_filename_r.phpt b/src/tests/disable_function/disabled_functions_filename_r.phpt index 0eb5f7d..9f36cce 100644 --- a/src/tests/disable_function/disabled_functions_filename_r.phpt +++ b/src/tests/disable_function/disabled_functions_filename_r.phpt @@ -12,4 +12,4 @@ shell_exec("echo 43"); --EXPECTF-- 42 -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'shell_exec' in %a/disabled_functions_filename_r.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'shell_exec' in %a/disabled_functions_filename_r.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_include_once.phpt b/src/tests/disable_function/disabled_functions_include_once.phpt index 26b7ecc..3709aff 100644 --- a/src/tests/disable_function/disabled_functions_include_once.phpt +++ b/src/tests/disable_function/disabled_functions_include_once.phpt @@ -22,6 +22,6 @@ unlink($dir . '/test.sim'); --EXPECTF-- BLA -Warning: [snuffleupagus][disabled_function] Aborted execution on call of the function 'include_once', because its argument 'inclusion path' content (%a/test.sim) matched a rule in %a/disabled_functions_include_once.php on line 6 +Warning: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'include_once', because its argument 'inclusion path' content (%a/test.sim) matched a rule in %a/disabled_functions_include_once.php on line 6 MEH 1337 diff --git a/src/tests/disable_function/disabled_functions_include_simulation.phpt b/src/tests/disable_function/disabled_functions_include_simulation.phpt index 199e91a..60ba9ee 100644 --- a/src/tests/disable_function/disabled_functions_include_simulation.phpt +++ b/src/tests/disable_function/disabled_functions_include_simulation.phpt @@ -22,6 +22,6 @@ unlink($dir . '/test.sim'); --EXPECTF-- BLA -Warning: [snuffleupagus][disabled_function] Aborted execution on call of the function 'include', because its argument 'inclusion path' content (%a/test.sim) matched a rule in %a/disabled_functions_include_simulation.php on line 6 +Warning: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'include', because its argument 'inclusion path' content (%a/test.sim) matched a rule in %a/disabled_functions_include_simulation.php on line 6 MEH 1337 diff --git a/src/tests/disable_function/disabled_functions_local_var_array.phpt b/src/tests/disable_function/disabled_functions_local_var_array.phpt index 2c55a6e..f460d72 100644 --- a/src/tests/disable_function/disabled_functions_local_var_array.phpt +++ b/src/tests/disable_function/disabled_functions_local_var_array.phpt @@ -18,4 +18,4 @@ foo($a); --EXPECTF-- cccc -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'foo' in %a/disabled_functions_local_var_array.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'foo' in %a/disabled_functions_local_var_array.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_local_var_array_key.phpt b/src/tests/disable_function/disabled_functions_local_var_array_key.phpt index 777611b..b69db4a 100644 --- a/src/tests/disable_function/disabled_functions_local_var_array_key.phpt +++ b/src/tests/disable_function/disabled_functions_local_var_array_key.phpt @@ -18,4 +18,4 @@ foo($a); --EXPECTF-- cccc -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'foo' in %a/disabled_functions_local_var_array_key.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'foo' in %a/disabled_functions_local_var_array_key.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_mb.phpt b/src/tests/disable_function/disabled_functions_mb.phpt index 923de8e..eda11f7 100644 --- a/src/tests/disable_function/disabled_functions_mb.phpt +++ b/src/tests/disable_function/disabled_functions_mb.phpt @@ -9,4 +9,4 @@ sp.configuration_file={PWD}/config/disabled_functions_mb.ini echo strtoupper("id"); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_functions_mb.php on line 2 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_functions_mb.php on line 2 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_method.phpt b/src/tests/disable_function/disabled_functions_method.phpt index 72e633e..632d570 100644 --- a/src/tests/disable_function/disabled_functions_method.phpt +++ b/src/tests/disable_function/disabled_functions_method.phpt @@ -24,4 +24,4 @@ $c->method2("paf"); $c->method3("pouet"); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'AwesomeClass::method1' in %a/disabled_functions_method.php on line 4 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'AwesomeClass::method1' in %a/disabled_functions_method.php on line 4 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_name_r.phpt b/src/tests/disable_function/disabled_functions_name_r.phpt index 1ecee14..0a151a6 100644 --- a/src/tests/disable_function/disabled_functions_name_r.phpt +++ b/src/tests/disable_function/disabled_functions_name_r.phpt @@ -13,4 +13,4 @@ system("echo 1337"); 42 1337 -Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'system', because the function returned '1337', which matched a rule in %a/disabled_functions_name_r.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on return of the function 'system', because the function returned '1337', which matched a rule in %a/disabled_functions_name_r.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_name_regexp_type.phpt b/src/tests/disable_function/disabled_functions_name_regexp_type.phpt index 2ceadbf..0bcb28c 100644 --- a/src/tests/disable_function/disabled_functions_name_regexp_type.phpt +++ b/src/tests/disable_function/disabled_functions_name_regexp_type.phpt @@ -14,4 +14,4 @@ echo strcmp([1], "pouet") . "\n"; 0 -1 -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strcmp', because its argument 'str1' content (?) matched a rule in %a/disabled_functions_name_regexp_type.php on line 4 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'strcmp', because its argument 'str1' content (?) matched a rule in %a/disabled_functions_name_regexp_type.php on line 4 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_name_type.phpt b/src/tests/disable_function/disabled_functions_name_type.phpt index 2d14d12..59b4683 100644 --- a/src/tests/disable_function/disabled_functions_name_type.phpt +++ b/src/tests/disable_function/disabled_functions_name_type.phpt @@ -12,4 +12,4 @@ echo strcmp([1,23], "pouet") . "\n"; --EXPECTF-- 0 -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strcmp', because its argument '$str1' content (ARRAY) matched a rule in %a/disabled_functions_name_type.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'strcmp', because its argument '$str1' content (ARRAY) matched a rule in %a/disabled_functions_name_type.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_namespace.phpt b/src/tests/disable_function/disabled_functions_namespace.phpt index 1acfce2..af310c3 100644 --- a/src/tests/disable_function/disabled_functions_namespace.phpt +++ b/src/tests/disable_function/disabled_functions_namespace.phpt @@ -27,4 +27,4 @@ my_function(); } ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strcmp' in %a/disabled_functions_namespace.php on line 16 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'strcmp' in %a/disabled_functions_namespace.php on line 16 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_nul_byte.phpt b/src/tests/disable_function/disabled_functions_nul_byte.phpt index 984541d..dbb7600 100644 --- a/src/tests/disable_function/disabled_functions_nul_byte.phpt +++ b/src/tests/disable_function/disabled_functions_nul_byte.phpt @@ -11,4 +11,4 @@ system("id"); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system', because its argument '$command' content (0id) matched a rule in %a/disabled_functions_nul_byte.php on line 2 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'system', because its argument '$command' content (0id) matched a rule in %a/disabled_functions_nul_byte.php on line 2 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_param.phpt b/src/tests/disable_function/disabled_functions_param.phpt index fb6dcbb..4bc276a 100644 --- a/src/tests/disable_function/disabled_functions_param.phpt +++ b/src/tests/disable_function/disabled_functions_param.phpt @@ -15,4 +15,4 @@ strcmp("bla", "ble"); strncmp("bla", "ble", 2); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system', because its argument '$command' content (id) matched the rule '1' in %a/disabled_functions_param.php on line 2 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'system', because its argument '$command' content (id) matched the rule '1' in %a/disabled_functions_param.php on line 2 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_param_alias.phpt b/src/tests/disable_function/disabled_functions_param_alias.phpt index 9c249d9..1d44e72 100644 --- a/src/tests/disable_function/disabled_functions_param_alias.phpt +++ b/src/tests/disable_function/disabled_functions_param_alias.phpt @@ -10,4 +10,4 @@ system("id"); shell_exec("id"); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system', because of the the rule '1' in %a/disabled_functions_param_alias.php on line 2 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'system', because of the the rule '1' in %a/disabled_functions_param_alias.php on line 2 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_param_allow.phpt b/src/tests/disable_function/disabled_functions_param_allow.phpt index f570415..b0e7de1 100644 --- a/src/tests/disable_function/disabled_functions_param_allow.phpt +++ b/src/tests/disable_function/disabled_functions_param_allow.phpt @@ -12,4 +12,4 @@ system("id"); --EXPECTF-- win -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system' in %a/disabled_functions_param_allow.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'system' in %a/disabled_functions_param_allow.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_param_array.phpt b/src/tests/disable_function/disabled_functions_param_array.phpt index 37a02e0..2053b14 100644 --- a/src/tests/disable_function/disabled_functions_param_array.phpt +++ b/src/tests/disable_function/disabled_functions_param_array.phpt @@ -22,4 +22,4 @@ foo($a); test1 abcde -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'foo', because its argument '$arr' content (abcd) matched the rule '1' in %a/disabled_functions_param_array.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'foo', because its argument '$arr' content (abcd) matched the rule '1' in %a/disabled_functions_param_array.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_param_array_deref.phpt b/src/tests/disable_function/disabled_functions_param_array_deref.phpt index 3305965..f162d47 100644 --- a/src/tests/disable_function/disabled_functions_param_array_deref.phpt +++ b/src/tests/disable_function/disabled_functions_param_array_deref.phpt @@ -23,4 +23,4 @@ foo($a); eee abcdef -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'foo', because its argument '$arr' content (abcdef) matched the rule '2' in %a/disabled_functions_param_array_deref.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'foo', because its argument '$arr' content (abcdef) matched the rule '2' in %a/disabled_functions_param_array_deref.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_param_array_no_value.phpt b/src/tests/disable_function/disabled_functions_param_array_no_value.phpt index dfb67a2..549842f 100644 --- a/src/tests/disable_function/disabled_functions_param_array_no_value.phpt +++ b/src/tests/disable_function/disabled_functions_param_array_no_value.phpt @@ -20,4 +20,4 @@ foo($a); --EXPECTF-- cccc -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'foo', because its argument '$arr' content (aaa) matched the rule '3' in %a/disabled_functions_param_array_no_value.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'foo', because its argument '$arr' content (aaa) matched the rule '3' in %a/disabled_functions_param_array_no_value.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_param_array_r.phpt b/src/tests/disable_function/disabled_functions_param_array_r.phpt index 1773bbe..6c11c63 100644 --- a/src/tests/disable_function/disabled_functions_param_array_r.phpt +++ b/src/tests/disable_function/disabled_functions_param_array_r.phpt @@ -18,4 +18,4 @@ foo($a); --EXPECTF-- cccc -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'foo', because its argument 'arr' content (ARRAY) matched the rule '1' in %a/disabled_functions_param_array_r.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'foo', because its argument 'arr' content (ARRAY) matched the rule '1' in %a/disabled_functions_param_array_r.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_param_array_r_keys.phpt b/src/tests/disable_function/disabled_functions_param_array_r_keys.phpt index 0748e92..3fdd398 100644 --- a/src/tests/disable_function/disabled_functions_param_array_r_keys.phpt +++ b/src/tests/disable_function/disabled_functions_param_array_r_keys.phpt @@ -18,4 +18,4 @@ foo($a); --EXPECTF-- cccc -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'foo', because its argument 'arr' content (ARRAY) matched the rule '2' in %a/disabled_functions_param_array_r_keys.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'foo', because its argument 'arr' content (ARRAY) matched the rule '2' in %a/disabled_functions_param_array_r_keys.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_param_array_several_levels.phpt b/src/tests/disable_function/disabled_functions_param_array_several_levels.phpt index cbe845b..7d7d727 100644 --- a/src/tests/disable_function/disabled_functions_param_array_several_levels.phpt +++ b/src/tests/disable_function/disabled_functions_param_array_several_levels.phpt @@ -18,4 +18,4 @@ foo($a); --EXPECTF-- cccc -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'foo', because its argument '$arr' content (ARRAY) matched the rule '4' in %a/disabled_functions_param_array_several_levels.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'foo', because its argument '$arr' content (ARRAY) matched the rule '4' in %a/disabled_functions_param_array_several_levels.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_param_array_several_levels_int.phpt b/src/tests/disable_function/disabled_functions_param_array_several_levels_int.phpt index d957acf..c22b912 100644 --- a/src/tests/disable_function/disabled_functions_param_array_several_levels_int.phpt +++ b/src/tests/disable_function/disabled_functions_param_array_several_levels_int.phpt @@ -18,4 +18,4 @@ foo($a); --EXPECTF-- cccc -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'foo', because its argument '$arr' content (ARRAY) matched the rule '4' in %a/disabled_functions_param_array_several_levels_int.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'foo', because its argument '$arr' content (ARRAY) matched the rule '4' in %a/disabled_functions_param_array_several_levels_int.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_param_array_several_levels_keys.phpt b/src/tests/disable_function/disabled_functions_param_array_several_levels_keys.phpt index 59d27c0..f662d11 100644 --- a/src/tests/disable_function/disabled_functions_param_array_several_levels_keys.phpt +++ b/src/tests/disable_function/disabled_functions_param_array_several_levels_keys.phpt @@ -18,4 +18,4 @@ foo($a); --EXPECTF-- cccc -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'foo', because its argument '$arr' content (ARRAY) matched the rule '5' in %a/disabled_functions_param_array_several_levels_keys.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'foo', because its argument '$arr' content (ARRAY) matched the rule '5' in %a/disabled_functions_param_array_several_levels_keys.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_param_array_several_levels_keys_int.phpt b/src/tests/disable_function/disabled_functions_param_array_several_levels_keys_int.phpt index 647c394..9ede4d8 100644 --- a/src/tests/disable_function/disabled_functions_param_array_several_levels_keys_int.phpt +++ b/src/tests/disable_function/disabled_functions_param_array_several_levels_keys_int.phpt @@ -18,4 +18,4 @@ foo($a); --EXPECTF-- cccc -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'foo', because its argument '$arr' content (ARRAY) matched the rule '6' in %a/disabled_functions_param_array_several_levels_keys_int.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'foo', because its argument '$arr' content (ARRAY) matched the rule '6' in %a/disabled_functions_param_array_several_levels_keys_int.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_param_broken_line.phpt b/src/tests/disable_function/disabled_functions_param_broken_line.phpt index 4fc3c45..f7a379d 100644 --- a/src/tests/disable_function/disabled_functions_param_broken_line.phpt +++ b/src/tests/disable_function/disabled_functions_param_broken_line.phpt @@ -10,9 +10,9 @@ system("echo 1337"); system("echo 1338"); ?> --EXPECTF-- -PHP Fatal error: [snuffleupagus][config] Failed to parse arg 'qwe' of `line` on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Failed to parse arg 'qwe' of `line` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Failed to parse arg 'qwe' of `line` on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Failed to parse arg 'qwe' of `line` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. diff --git a/src/tests/disable_function/disabled_functions_param_int.phpt b/src/tests/disable_function/disabled_functions_param_int.phpt index e8b0a42..4fa87e1 100644 --- a/src/tests/disable_function/disabled_functions_param_int.phpt +++ b/src/tests/disable_function/disabled_functions_param_int.phpt @@ -19,4 +19,4 @@ foobar("10"); --EXPECTF-- 1 -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'foobar', because its argument '$id' content (42) matched a rule in %a/disabled_functions_param_int.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'foobar', because its argument '$id' content (42) matched a rule in %a/disabled_functions_param_int.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_param_invalid_pos.phpt b/src/tests/disable_function/disabled_functions_param_invalid_pos.phpt index c52443d..67da890 100644 --- a/src/tests/disable_function/disabled_functions_param_invalid_pos.phpt +++ b/src/tests/disable_function/disabled_functions_param_invalid_pos.phpt @@ -9,9 +9,9 @@ sp.configuration_file={PWD}/config/disabled_functions_invalid_pos.ini system("echo 1"); ?> --EXPECTF-- -PHP Fatal error: [snuffleupagus][config] Failed to parse arg 'qwe' of `pos` on line 1 in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Failed to parse arg 'qwe' of `pos` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Failed to parse arg 'qwe' of `pos` on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Failed to parse arg 'qwe' of `pos` on line 1 in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. diff --git a/src/tests/disable_function/disabled_functions_param_line.phpt b/src/tests/disable_function/disabled_functions_param_line.phpt index 75bfedd..9d2daba 100644 --- a/src/tests/disable_function/disabled_functions_param_line.phpt +++ b/src/tests/disable_function/disabled_functions_param_line.phpt @@ -12,4 +12,4 @@ system("id"); --EXPECTF-- 1337 -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system' in %a/disabled_functions_param_line.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'system' in %a/disabled_functions_param_line.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_param_pos.phpt b/src/tests/disable_function/disabled_functions_param_pos.phpt index 348d34b..468c09e 100644 --- a/src/tests/disable_function/disabled_functions_param_pos.phpt +++ b/src/tests/disable_function/disabled_functions_param_pos.phpt @@ -9,6 +9,6 @@ sp.configuration_file={PWD}/config/disabled_functions_pos.ini system("id"); ?> --EXPECTF-- -Warning: [snuffleupagus][config] It seems that you wrote a rule filtering on the 1337th argument of the function 'system', but it takes only 1 arguments. Matching on _all_ arguments instead. in %a/disabled_functions_param_pos.php on line 2 +Warning: [snuffleupagus][0.0.0.0][config] It seems that you wrote a rule filtering on the 1337th argument of the function 'system', but it takes only 1 arguments. Matching on _all_ arguments instead. in %a/disabled_functions_param_pos.php on line 2 -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system', because its argument 'command' content (id) matched a rule in %a/disabled_functions_param_pos.php on line %d +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'system', because its argument 'command' content (id) matched a rule in %a/disabled_functions_param_pos.php on line %d diff --git a/src/tests/disable_function/disabled_functions_param_pos2.phpt b/src/tests/disable_function/disabled_functions_param_pos2.phpt index 7134fdd..a33ffe6 100644 --- a/src/tests/disable_function/disabled_functions_param_pos2.phpt +++ b/src/tests/disable_function/disabled_functions_param_pos2.phpt @@ -10,4 +10,4 @@ strtoupper("od"); strtoupper("id"); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper', because its argument 'str' content (id) matched the rule 'strlen array' in %a/disabled_functions_param_pos2.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'strtoupper', because its argument 'str' content (id) matched the rule 'strlen array' in %a/disabled_functions_param_pos2.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_param_r.phpt b/src/tests/disable_function/disabled_functions_param_r.phpt index 722f126..1f066b6 100644 --- a/src/tests/disable_function/disabled_functions_param_r.phpt +++ b/src/tests/disable_function/disabled_functions_param_r.phpt @@ -10,4 +10,4 @@ system("id"); system("echo win"); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system', because its argument 'command' content (id) matched a rule in %a/disabled_functions_param_r.php on line 2 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'system', because its argument 'command' content (id) matched a rule in %a/disabled_functions_param_r.php on line 2 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_pos_type.phpt b/src/tests/disable_function/disabled_functions_pos_type.phpt index 30aef8f..b033e8a 100644 --- a/src/tests/disable_function/disabled_functions_pos_type.phpt +++ b/src/tests/disable_function/disabled_functions_pos_type.phpt @@ -9,8 +9,8 @@ sp.configuration_file={PWD}/config/disabled_functions_pos.ini system([123, 456]); ?> --EXPECTF-- -Warning: [snuffleupagus][config] It seems that you wrote a rule filtering on the 1337th argument of the function 'system', but it takes only 1 arguments. Matching on _all_ arguments instead. in %a/disabled_functions_pos_type.php on line %d +Warning: [snuffleupagus][0.0.0.0][config] It seems that you wrote a rule filtering on the 1337th argument of the function 'system', but it takes only 1 arguments. Matching on _all_ arguments instead. in %a/disabled_functions_pos_type.php on line %d -Warning: [snuffleupagus][config] It seems that you wrote a rule filtering on the 1st argument of the function 'system', but it takes only 1 arguments. Matching on _all_ arguments instead. in %a/disabled_functions_pos_type.php on line %d +Warning: [snuffleupagus][0.0.0.0][config] It seems that you wrote a rule filtering on the 1st argument of the function 'system', but it takes only 1 arguments. Matching on _all_ arguments instead. in %a/disabled_functions_pos_type.php on line %d -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system', because its argument 'command' content (?) matched the rule '1' in %a/disabled_functions_pos_type.php on line %d +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'system', because its argument 'command' content (?) matched the rule '1' in %a/disabled_functions_pos_type.php on line %d diff --git a/src/tests/disable_function/disabled_functions_regexp_multiple.phpt b/src/tests/disable_function/disabled_functions_regexp_multiple.phpt index 5f68a00..e783c30 100644 --- a/src/tests/disable_function/disabled_functions_regexp_multiple.phpt +++ b/src/tests/disable_function/disabled_functions_regexp_multiple.phpt @@ -11,9 +11,9 @@ echo strcmp("1", "2") . "\n"; print("After") . "\n"; ?> --EXPECTF-- -Warning: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_functions_regexp_multiple.php on line 2 +Warning: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_functions_regexp_multiple.php on line 2 ID -Warning: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strcmp' in %a/disabled_functions_regexp_multiple.php on line 3 +Warning: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'strcmp' in %a/disabled_functions_regexp_multiple.php on line 3 -1 After diff --git a/src/tests/disable_function/disabled_functions_register_shutdown_function.phpt b/src/tests/disable_function/disabled_functions_register_shutdown_function.phpt index b6f1a10..623cadf 100644 --- a/src/tests/disable_function/disabled_functions_register_shutdown_function.phpt +++ b/src/tests/disable_function/disabled_functions_register_shutdown_function.phpt @@ -15,4 +15,4 @@ register_shutdown_function('my_super_function'); --EXPECTF-- 1337 -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'my_super_function' in %a/disabled_functions_register_shutdown_function.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'my_super_function' in %a/disabled_functions_register_shutdown_function.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_register_tick_function.phpt b/src/tests/disable_function/disabled_functions_register_tick_function.phpt index 6e3fb6f..8e6331e 100644 --- a/src/tests/disable_function/disabled_functions_register_tick_function.phpt +++ b/src/tests/disable_function/disabled_functions_register_tick_function.phpt @@ -16,4 +16,4 @@ register_tick_function('my_super_function'); --EXPECTF-- 1337 -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'my_super_function' in %a/disabled_functions_register_tick_function.php on line 4 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'my_super_function' in %a/disabled_functions_register_tick_function.php on line 4 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_require.phpt b/src/tests/disable_function/disabled_functions_require.phpt index 77dfbf5..af146d3 100644 --- a/src/tests/disable_function/disabled_functions_require.phpt +++ b/src/tests/disable_function/disabled_functions_require.phpt @@ -21,4 +21,4 @@ unlink($dir . '/test.meh'); ?> --EXPECTF-- BLA -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'require', because its argument 'inclusion path' content (%a/test.meh) matched a rule in %a/disabled_functions_require.php on line 6 +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'require', because its argument 'inclusion path' content (%a/test.meh) matched a rule in %a/disabled_functions_require.php on line 6 diff --git a/src/tests/disable_function/disabled_functions_require_once.phpt b/src/tests/disable_function/disabled_functions_require_once.phpt index 84e93cd..cd09671 100644 --- a/src/tests/disable_function/disabled_functions_require_once.phpt +++ b/src/tests/disable_function/disabled_functions_require_once.phpt @@ -21,4 +21,4 @@ unlink($dir . '/test.meh'); ?> --EXPECTF-- BLA -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'require_once', because its argument 'inclusion path' content (%a/test.meh) matched a rule in %a/disabled_functions_require_once.php on line 6 +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'require_once', because its argument 'inclusion path' content (%a/test.meh) matched a rule in %a/disabled_functions_require_once.php on line 6 diff --git a/src/tests/disable_function/disabled_functions_require_simulation.phpt b/src/tests/disable_function/disabled_functions_require_simulation.phpt index 6c97480..405bc18 100644 --- a/src/tests/disable_function/disabled_functions_require_simulation.phpt +++ b/src/tests/disable_function/disabled_functions_require_simulation.phpt @@ -22,6 +22,6 @@ unlink($dir . '/test.sim'); --EXPECTF-- BLA -Warning: [snuffleupagus][disabled_function] Aborted execution on call of the function 'require', because its argument 'inclusion path' content (%a/test.sim) matched a rule in %a/disabled_functions_require_simulation.php on line 6 +Warning: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'require', because its argument 'inclusion path' content (%a/test.sim) matched a rule in %a/disabled_functions_require_simulation.php on line 6 MEH 1337 diff --git a/src/tests/disable_function/disabled_functions_ret.phpt b/src/tests/disable_function/disabled_functions_ret.phpt index 7c5d596..ab1b263 100644 --- a/src/tests/disable_function/disabled_functions_ret.phpt +++ b/src/tests/disable_function/disabled_functions_ret.phpt @@ -10,4 +10,4 @@ echo strpos("pouet", "p"); echo stripos("pouet", "p"); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'strpos', because the function returned '0', which matched a rule in %a/disabled_functions_ret.php on line 2 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on return of the function 'strpos', because the function returned '0', which matched a rule in %a/disabled_functions_ret.php on line 2 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_ret2.phpt b/src/tests/disable_function/disabled_functions_ret2.phpt index e32c585..1f3b02d 100644 --- a/src/tests/disable_function/disabled_functions_ret2.phpt +++ b/src/tests/disable_function/disabled_functions_ret2.phpt @@ -9,4 +9,4 @@ sp.configuration_file={PWD}/config/disabled_functions_ret.ini echo stripos("pouet", "p"); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'stripos', because the function returned '0', which matched a rule in %a/disabled_functions_ret2.php on line 2 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on return of the function 'stripos', because the function returned '0', which matched a rule in %a/disabled_functions_ret2.php on line 2 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_ret3.phpt b/src/tests/disable_function/disabled_functions_ret3.phpt index dc60c43..aa2d7d2 100644 --- a/src/tests/disable_function/disabled_functions_ret3.phpt +++ b/src/tests/disable_function/disabled_functions_ret3.phpt @@ -20,4 +20,4 @@ echo("We're at the end of the execution.\n"); --EXPECTF-- We're in function `a`. -Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'Bob::a', because the function returned '2', which matched a rule in %a/disabled_functions_ret3.php on line 9 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on return of the function 'Bob::a', because the function returned '2', which matched a rule in %a/disabled_functions_ret3.php on line 9 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_ret_right_hash.phpt b/src/tests/disable_function/disabled_functions_ret_right_hash.phpt index 1307172..b306fb9 100644 --- a/src/tests/disable_function/disabled_functions_ret_right_hash.phpt +++ b/src/tests/disable_function/disabled_functions_ret_right_hash.phpt @@ -11,4 +11,4 @@ system("echo $((1 + 1336))"); --EXPECTF-- 1337 -Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'system', because the function returned '1337', which matched a rule in %a/disabled_functions_ret_right_hash.php on line 2 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on return of the function 'system', because the function returned '1337', which matched a rule in %a/disabled_functions_ret_right_hash.php on line 2 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_ret_simulation.phpt b/src/tests/disable_function/disabled_functions_ret_simulation.phpt index bd4cea0..70691ee 100644 --- a/src/tests/disable_function/disabled_functions_ret_simulation.phpt +++ b/src/tests/disable_function/disabled_functions_ret_simulation.phpt @@ -11,10 +11,10 @@ echo stripos("pouet", "p") . "\n"; strcmp("p", "p") . "\n"; ?> --EXPECTF-- -Warning: [snuffleupagus][disabled_function] Aborted execution on return of the function 'strpos', because the function returned '0', which matched a rule in %a/disabled_functions_ret_simulation.php on line 2 +Warning: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on return of the function 'strpos', because the function returned '0', which matched a rule in %a/disabled_functions_ret_simulation.php on line 2 0 -Warning: [snuffleupagus][disabled_function] Aborted execution on return of the function 'stripos', because the function returned '0', which matched the rule '1' in %a/disabled_functions_ret_simulation.php on line 3 +Warning: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on return of the function 'stripos', because the function returned '0', which matched the rule '1' in %a/disabled_functions_ret_simulation.php on line 3 0 -Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'strcmp', because the function returned '0', which matched a rule in %a/disabled_functions_ret_simulation.php on line 4 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on return of the function 'strcmp', because the function returned '0', which matched a rule in %a/disabled_functions_ret_simulation.php on line 4 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_ret_type.phpt b/src/tests/disable_function/disabled_functions_ret_type.phpt index 88401ca..9679f01 100644 --- a/src/tests/disable_function/disabled_functions_ret_type.phpt +++ b/src/tests/disable_function/disabled_functions_ret_type.phpt @@ -14,4 +14,4 @@ echo strpos("pouet", "123"); int(0) 1337 -Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'strpos', because the function returned 'FALSE', which matched the rule 'Return value is FALSE' in %a/disabled_functions_ret_type.php on line 4 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on return of the function 'strpos', because the function returned 'FALSE', which matched the rule 'Return value is FALSE' in %a/disabled_functions_ret_type.php on line 4 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_ret_type_array.phpt b/src/tests/disable_function/disabled_functions_ret_type_array.phpt index 3ceac9e..1b20e53 100644 --- a/src/tests/disable_function/disabled_functions_ret_type_array.phpt +++ b/src/tests/disable_function/disabled_functions_ret_type_array.phpt @@ -9,4 +9,4 @@ sp.configuration_file={PWD}/config/disabled_functions_ret_type_array.ini echo get_loaded_extensions(); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'get_loaded_extensions', because the function returned 'ARRAY', which matched the rule 'Return value is an array' in %a/disabled_functions_ret_type_array.php on line 2 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on return of the function 'get_loaded_extensions', because the function returned 'ARRAY', which matched the rule 'Return value is an array' in %a/disabled_functions_ret_type_array.php on line 2 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_ret_type_double.phpt b/src/tests/disable_function/disabled_functions_ret_type_double.phpt index b0e895c..1810b88 100644 --- a/src/tests/disable_function/disabled_functions_ret_type_double.phpt +++ b/src/tests/disable_function/disabled_functions_ret_type_double.phpt @@ -9,4 +9,4 @@ sp.configuration_file={PWD}/config/disabled_functions_ret_type_double.ini echo cos(0.5) . "\n"; ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'cos', because the function returned '0.877583', which matched the rule 'Return value is a double' in %a/disabled_functions_ret_type_double.php on line 2 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on return of the function 'cos', because the function returned '0.877583', which matched the rule 'Return value is a double' in %a/disabled_functions_ret_type_double.php on line 2 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_ret_type_long.phpt b/src/tests/disable_function/disabled_functions_ret_type_long.phpt index cc78299..c5c9e38 100644 --- a/src/tests/disable_function/disabled_functions_ret_type_long.phpt +++ b/src/tests/disable_function/disabled_functions_ret_type_long.phpt @@ -9,4 +9,4 @@ sp.configuration_file={PWD}/config/disabled_functions_ret_type_long.ini echo strpos("pouet", "o") . "\n"; ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'strpos', because the function returned '1', which matched the rule 'Return value is a long' in %a/disabled_functions_ret_type_long.php on line 2 +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on return of the function 'strpos', because the function returned '1', which matched the rule 'Return value is a long' in %a/disabled_functions_ret_type_long.php on line 2 diff --git a/src/tests/disable_function/disabled_functions_ret_type_null.phpt b/src/tests/disable_function/disabled_functions_ret_type_null.phpt index 894b3f5..b245a95 100644 --- a/src/tests/disable_function/disabled_functions_ret_type_null.phpt +++ b/src/tests/disable_function/disabled_functions_ret_type_null.phpt @@ -13,4 +13,4 @@ function my_function() { var_dump(my_function()); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'my_function', because the function returned 'NULL', which matched the rule 'Return value is null' in %a/disabled_functions_ret_type_null.php on line 6 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on return of the function 'my_function', because the function returned 'NULL', which matched the rule 'Return value is null' in %a/disabled_functions_ret_type_null.php on line 6 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_ret_type_object.phpt b/src/tests/disable_function/disabled_functions_ret_type_object.phpt index 171cd4b..a4d1c9a 100644 --- a/src/tests/disable_function/disabled_functions_ret_type_object.phpt +++ b/src/tests/disable_function/disabled_functions_ret_type_object.phpt @@ -13,4 +13,4 @@ $var = a(); echo "fail"; ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'a', because the function returned 'OBJECT', which matched a rule in %a/disabled_functions_ret_type_object.php on line 5 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on return of the function 'a', because the function returned 'OBJECT', which matched a rule in %a/disabled_functions_ret_type_object.php on line 5 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_ret_type_resource.phpt b/src/tests/disable_function/disabled_functions_ret_type_resource.phpt index 4ae38b6..67ae2a6 100644 --- a/src/tests/disable_function/disabled_functions_ret_type_resource.phpt +++ b/src/tests/disable_function/disabled_functions_ret_type_resource.phpt @@ -9,4 +9,4 @@ sp.configuration_file={PWD}/config/disabled_functions_ret_type_resource.ini echo fopen("/etc/passwd", "r"); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'fopen', because the function returned 'RESOURCE', which matched the rule 'Return value is a resource' in %a/disabled_functions_ret_type_resource.php on line 2 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on return of the function 'fopen', because the function returned 'RESOURCE', which matched the rule 'Return value is a resource' in %a/disabled_functions_ret_type_resource.php on line 2 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_ret_type_str.phpt b/src/tests/disable_function/disabled_functions_ret_type_str.phpt index 356ff43..0dcdaaa 100644 --- a/src/tests/disable_function/disabled_functions_ret_type_str.phpt +++ b/src/tests/disable_function/disabled_functions_ret_type_str.phpt @@ -9,4 +9,4 @@ sp.configuration_file={PWD}/config/disabled_functions_ret_type_str.ini echo substr("pouet", 3) . "\n"; ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'substr', because the function returned 'et', which matched the rule 'Return value is a string' in %a/disabled_functions_ret_type_str.php on line 2 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on return of the function 'substr', because the function returned 'et', which matched the rule 'Return value is a string' in %a/disabled_functions_ret_type_str.php on line 2 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_ret_type_true.phpt b/src/tests/disable_function/disabled_functions_ret_type_true.phpt index 8ddb1f7..6a4749a 100644 --- a/src/tests/disable_function/disabled_functions_ret_type_true.phpt +++ b/src/tests/disable_function/disabled_functions_ret_type_true.phpt @@ -14,4 +14,4 @@ echo is_numeric("1234") . "\n"; bool(false) 1337 -Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'is_numeric', because the function returned 'TRUE', which matched the rule 'Return value is a true' in %a/disabled_functions_ret_type_true.php on line 4 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on return of the function 'is_numeric', because the function returned 'TRUE', which matched the rule 'Return value is a true' in %a/disabled_functions_ret_type_true.php on line 4 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_ret_user.phpt b/src/tests/disable_function/disabled_functions_ret_user.phpt index 8caa9bd..989a7ab 100644 --- a/src/tests/disable_function/disabled_functions_ret_user.phpt +++ b/src/tests/disable_function/disabled_functions_ret_user.phpt @@ -13,4 +13,4 @@ qwe(); echo 1; ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'qwe', because the function returned 'asd', which matched a rule in %a/disabled_functions_ret_user.php on line %d +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on return of the function 'qwe', because the function returned 'asd', which matched a rule in %a/disabled_functions_ret_user.php on line %d diff --git a/src/tests/disable_function/disabled_functions_ret_user_used.phpt b/src/tests/disable_function/disabled_functions_ret_user_used.phpt index 5857905..05e1323 100644 --- a/src/tests/disable_function/disabled_functions_ret_user_used.phpt +++ b/src/tests/disable_function/disabled_functions_ret_user_used.phpt @@ -12,4 +12,4 @@ function qwe() { echo qwe(); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'qwe', because the function returned 'asd', which matched a rule in %a/disabled_functions_ret_user_used.php on line %d +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on return of the function 'qwe', because the function returned 'asd', which matched a rule in %a/disabled_functions_ret_user_used.php on line %d diff --git a/src/tests/disable_function/disabled_functions_ret_val.phpt b/src/tests/disable_function/disabled_functions_ret_val.phpt index 40a3be9..a914c56 100644 --- a/src/tests/disable_function/disabled_functions_ret_val.phpt +++ b/src/tests/disable_function/disabled_functions_ret_val.phpt @@ -12,4 +12,4 @@ echo str_repeat("fufufu",1); --EXPECTF-- fufu -Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'str_repeat', because the function returned 'fufufu', which matched a rule in %a/disabled_functions_ret_val.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on return of the function 'str_repeat', because the function returned 'fufufu', which matched a rule in %a/disabled_functions_ret_val.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_ret_val_dump.phpt b/src/tests/disable_function/disabled_functions_ret_val_dump.phpt index 51e4f29..c8fb2c3 100644 --- a/src/tests/disable_function/disabled_functions_ret_val_dump.phpt +++ b/src/tests/disable_function/disabled_functions_ret_val_dump.phpt @@ -20,4 +20,4 @@ echo str_repeat("fufufu",1); --EXPECTF-- fufu -Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'str_repeat', because the function returned 'fufufu', which matched a rule in %a/disabled_functions_ret_val_dump.php on line 3 +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on return of the function 'str_repeat', because the function returned 'fufufu', which matched a rule in %a/disabled_functions_ret_val_dump.php on line 3 diff --git a/src/tests/disable_function/disabled_functions_ret_val_rx.phpt b/src/tests/disable_function/disabled_functions_ret_val_rx.phpt index ba06649..9623ef4 100644 --- a/src/tests/disable_function/disabled_functions_ret_val_rx.phpt +++ b/src/tests/disable_function/disabled_functions_ret_val_rx.phpt @@ -12,4 +12,4 @@ echo str_repeat("fufufu",1); --EXPECTF-- fufu -Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'str_repeat', because the function returned 'fufufu', which matched a rule in %a/disabled_functions_ret_val_rx.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on return of the function 'str_repeat', because the function returned 'fufufu', which matched a rule in %a/disabled_functions_ret_val_rx.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_runtime.phpt b/src/tests/disable_function/disabled_functions_runtime.phpt index 4ba1a53..cd6f44d 100644 --- a/src/tests/disable_function/disabled_functions_runtime.phpt +++ b/src/tests/disable_function/disabled_functions_runtime.phpt @@ -29,4 +29,4 @@ unlink("file_to_include2.php"); --EXPECTF-- 1338 -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'test', because its argument '$param' content (1337) matched a rule in %a/src/file_to_include%d.php on line 1 +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'test', because its argument '$param' content (1337) matched a rule in %a/src/file_to_include%d.php on line 1 diff --git a/src/tests/disable_function/disabled_functions_upper.phpt b/src/tests/disable_function/disabled_functions_upper.phpt index 8fa8ea3..f7cdcbb 100644 --- a/src/tests/disable_function/disabled_functions_upper.phpt +++ b/src/tests/disable_function/disabled_functions_upper.phpt @@ -13,4 +13,4 @@ vaR_DUmp("this is a super test"); echo sTRPOs("pouet", "o"); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system' in %a/disabled_functions_upper.php on line 2 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'system' in %a/disabled_functions_upper.php on line 2 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_functions_variadic.phpt b/src/tests/disable_function/disabled_functions_variadic.phpt index 95d308e..5bace63 100644 --- a/src/tests/disable_function/disabled_functions_variadic.phpt +++ b/src/tests/disable_function/disabled_functions_variadic.phpt @@ -13,6 +13,6 @@ function foo(...$b) { echo foo(5, 4, 3, 2, 1); ?> --EXPECTF-- -Warning: [snuffleupagus][disable_function] Snuffleupagus doesn't support variadic functions yet, sorry. Check https://github.com/nbs-system/snuffleupagus/issues/164 for details. in %a/disabled_functions_variadic.php on line %d +Warning: [snuffleupagus][0.0.0.0][disable_function] Snuffleupagus doesn't support variadic functions yet, sorry. Check https://github.com/nbs-system/snuffleupagus/issues/164 for details. in %a/disabled_functions_variadic.php on line %d -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'foo' in %a/disabled_functions_variadic.php on line %d +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'foo' in %a/disabled_functions_variadic.php on line %d diff --git a/src/tests/disable_function/disabled_functions_zero_cidr.phpt b/src/tests/disable_function/disabled_functions_zero_cidr.phpt index 4e5f930..0ec596c 100644 --- a/src/tests/disable_function/disabled_functions_zero_cidr.phpt +++ b/src/tests/disable_function/disabled_functions_zero_cidr.phpt @@ -14,4 +14,4 @@ system("echo 42"); printf("1337"); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system' in %a/disabled_functions_zero_cidr.php on line 2 \ No newline at end of file +Fatal error: [snuffleupagus][127.0.0.1][disabled_function] Aborted execution on call of the function 'system' in %a/disabled_functions_zero_cidr.php on line 2 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_native_functions_indirect.phpt b/src/tests/disable_function/disabled_native_functions_indirect.phpt index ba355d6..bcbb1eb 100644 --- a/src/tests/disable_function/disabled_native_functions_indirect.phpt +++ b/src/tests/disable_function/disabled_native_functions_indirect.phpt @@ -9,4 +9,4 @@ sp.configuration_file={PWD}/config/disabled_functions.ini array_map('system', [1,2,3,4]); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system' in %a/disabled_native_functions_indirect.php on line 2 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'system' in %a/disabled_native_functions_indirect.php on line 2 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_user_functions.phpt b/src/tests/disable_function/disabled_user_functions.phpt index 9c17b79..66303ec 100644 --- a/src/tests/disable_function/disabled_user_functions.phpt +++ b/src/tests/disable_function/disabled_user_functions.phpt @@ -12,4 +12,4 @@ function my_super_function() { my_super_function(); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'my_super_function' in %a/disabled_user_functions.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'my_super_function' in %a/disabled_user_functions.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/disabled_user_functions_indirect.phpt b/src/tests/disable_function/disabled_user_functions_indirect.phpt index f663ded..6631866 100644 --- a/src/tests/disable_function/disabled_user_functions_indirect.phpt +++ b/src/tests/disable_function/disabled_user_functions_indirect.phpt @@ -12,4 +12,4 @@ function my_super_function() { array_map('my_super_function', [1,2,3,4]); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'my_super_function' in %a/disabled_user_functions_indirect.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'my_super_function' in %a/disabled_user_functions_indirect.php on line 3 \ No newline at end of file diff --git a/src/tests/disable_function/noncore_function_hooking.phpt b/src/tests/disable_function/noncore_function_hooking.phpt index 52bb114..a1639e5 100644 --- a/src/tests/disable_function/noncore_function_hooking.phpt +++ b/src/tests/disable_function/noncore_function_hooking.phpt @@ -12,4 +12,4 @@ function custom_fun($a) { custom_fun("hello"); ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'custom_fun' in %a/noncore_function_hooking.php on line 3 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'custom_fun' in %a/noncore_function_hooking.php on line 3 \ No newline at end of file diff --git a/src/tests/dump_request/dump_eval_blacklist.phpt b/src/tests/dump_request/dump_eval_blacklist.phpt index 459a584..f3c0b2b 100644 --- a/src/tests/dump_request/dump_eval_blacklist.phpt +++ b/src/tests/dump_request/dump_eval_blacklist.phpt @@ -36,5 +36,5 @@ if ($res[2] != "GET:get_a='data_get_a' get_b='data_get_b' \n") { --EXPECTF-- Outside of eval: 1337 1337 1337 -Warning: [snuffleupagus][eval] A call to strtoupper was tried in eval, in %a/dump_eval_blacklist.php:1, logging it. in %a/dump_eval_blacklist.php(9) : eval()'d code on line 1 +Warning: [snuffleupagus][0.0.0.0][eval] A call to strtoupper was tried in eval, in %a/dump_eval_blacklist.php:1, logging it. in %a/dump_eval_blacklist.php(9) : eval()'d code on line 1 After eval: 1234 diff --git a/src/tests/dump_request/dump_eval_whitelist.phpt b/src/tests/dump_request/dump_eval_whitelist.phpt index 88bfcf6..d4f5305 100644 --- a/src/tests/dump_request/dump_eval_whitelist.phpt +++ b/src/tests/dump_request/dump_eval_whitelist.phpt @@ -48,5 +48,5 @@ if ($res[2] != "GET:get_a='data_get_a' get_b='data_get_b' \n") { Outside of eval: my_fun: 1337 1337 1337 After allowed eval: my_fun: 1234 -Warning: [snuffleupagus][Eval_whitelist] The function 'my_other_fun' isn't in the eval whitelist, logging its call. in %a/dump_eval_whitelist.php on line 12 +Warning: [snuffleupagus][0.0.0.0][Eval_whitelist] The function 'my_other_fun' isn't in the eval whitelist, logging its call. in %a/dump_eval_whitelist.php on line 12 After eval: my_other_fun: 1234 diff --git a/src/tests/dump_request/dump_request.phpt b/src/tests/dump_request/dump_request.phpt index dae1dd7..8e174f8 100644 --- a/src/tests/dump_request/dump_request.phpt +++ b/src/tests/dump_request/dump_request.phpt @@ -40,5 +40,5 @@ if ($res[2] != "GET:get_a='data_get_a' get_b='data_get_b' \n") { --EXPECTF-- 1 -Warning: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system' in %a/dump_request.php on line 7 +Warning: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'system' in %a/dump_request.php on line 7 1337 diff --git a/src/tests/dump_request/dump_request_invalid_folder.phpt b/src/tests/dump_request/dump_request_invalid_folder.phpt index 3d1ce10..79a1935 100644 --- a/src/tests/dump_request/dump_request_invalid_folder.phpt +++ b/src/tests/dump_request/dump_request_invalid_folder.phpt @@ -21,6 +21,6 @@ echo "2\n"; --EXPECTF-- 1 -Warning: [snuffleupagus][request_logging] Unable to create the folder '/root/NON_EXISTENT/FOLDER/PLEASE/' in %a/dump_request_invalid_folder.php on line %d +Warning: [snuffleupagus][0.0.0.0][request_logging] Unable to create the folder '/root/NON_EXISTENT/FOLDER/PLEASE/' in %a/dump_request_invalid_folder.php on line %d -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system' in %a/dump_request_invalid_folder.php on line %d +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'system' in %a/dump_request_invalid_folder.php on line %d diff --git a/src/tests/dump_request/dump_request_nonwriteable_folder.phpt b/src/tests/dump_request/dump_request_nonwriteable_folder.phpt index 8052bc3..5292467 100644 --- a/src/tests/dump_request/dump_request_nonwriteable_folder.phpt +++ b/src/tests/dump_request/dump_request_nonwriteable_folder.phpt @@ -33,6 +33,6 @@ echo "2\n"; --EXPECTF-- 1 -Warning: [snuffleupagus][request_logging] Unable to open %a: Permission denied in %a/dump_request_nonwriteable_folder.php on line %d +Warning: [snuffleupagus][0.0.0.0][request_logging] Unable to open %a: Permission denied in %a/dump_request_nonwriteable_folder.php on line %d -Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system' in %a/dump_request_nonwriteable_folder.php on line 3 +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'system' in %a/dump_request_nonwriteable_folder.php on line 3 diff --git a/src/tests/dump_request/dump_request_too_big.phpt b/src/tests/dump_request/dump_request_too_big.phpt index 48cb1c5..6a3f590 100644 --- a/src/tests/dump_request/dump_request_too_big.phpt +++ b/src/tests/dump_request/dump_request_too_big.phpt @@ -40,5 +40,5 @@ if ($res[2] != "GET:get_a='data_get_a' get_b='data_get_b' get_c='aaaaaaaaaaaaaaa --EXPECTF-- 1 -Warning: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system' in %a/dump_request_too_big.php on line 8 +Warning: [snuffleupagus][127.0.0.1][disabled_function] Aborted execution on call of the function 'system' in %a/dump_request_too_big.php on line 8 1337 diff --git a/src/tests/dump_request/dump_segfault1.phpt b/src/tests/dump_request/dump_segfault1.phpt index bb35aa6..27f8af8 100644 --- a/src/tests/dump_request/dump_segfault1.phpt +++ b/src/tests/dump_request/dump_segfault1.phpt @@ -9,4 +9,4 @@ sp.configuration_file={PWD}/config/config_dump_segfault1.ini echo strpos("pouet", "p") . "\n"; ?> --EXPECTF-- -Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'strpos', because the function returned '0', which matched the rule 'test' in %a/dump_segfault1.php on line 2 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on return of the function 'strpos', because the function returned '0', which matched the rule 'test' in %a/dump_segfault1.php on line 2 \ No newline at end of file diff --git a/src/tests/eval_blacklist/eval_backlist.phpt b/src/tests/eval_blacklist/eval_backlist.phpt index 1dbe887..67643d7 100644 --- a/src/tests/eval_blacklist/eval_backlist.phpt +++ b/src/tests/eval_blacklist/eval_backlist.phpt @@ -14,4 +14,4 @@ echo "After eval: $a\n"; --EXPECTF-- Outside of eval: 1337 1337 1337 -Fatal error: [snuffleupagus][eval] A call to strtoupper was tried in eval, in %a/eval_backlist.php:1, dropping it. in %a/eval_backlist.php(4) : eval()'d code on line 1 +Fatal error: [snuffleupagus][0.0.0.0][eval] A call to strtoupper was tried in eval, in %a/eval_backlist.php:1, dropping it. in %a/eval_backlist.php(4) : eval()'d code on line 1 diff --git a/src/tests/eval_blacklist/eval_backlist_call_user_func.phpt b/src/tests/eval_blacklist/eval_backlist_call_user_func.phpt index ac48515..7578eac 100644 --- a/src/tests/eval_blacklist/eval_backlist_call_user_func.phpt +++ b/src/tests/eval_blacklist/eval_backlist_call_user_func.phpt @@ -11,4 +11,4 @@ eval(' ') ?> --EXPECTF-- -Fatal error: [snuffleupagus][eval] A call to strtoupper was tried in eval, in %s/eval_backlist_call_user_func.php:%d, dropping it. in %s/eval_backlist_call_user_func.php(%d) : eval()'d code on line %d +Fatal error: [snuffleupagus][0.0.0.0][eval] A call to strtoupper was tried in eval, in %s/eval_backlist_call_user_func.php:%d, dropping it. in %s/eval_backlist_call_user_func.php(%d) : eval()'d code on line %d diff --git a/src/tests/eval_blacklist/eval_backlist_chained.phpt b/src/tests/eval_blacklist/eval_backlist_chained.phpt index dc23857..7eabc02 100644 --- a/src/tests/eval_blacklist/eval_backlist_chained.phpt +++ b/src/tests/eval_blacklist/eval_backlist_chained.phpt @@ -13,4 +13,4 @@ eval(' ') ?> --EXPECTF-- -Fatal error: [snuffleupagus][eval] A call to strtoupper was tried in eval, in %s/eval_backlist_chained.php:%d, dropping it. in %s/eval_backlist_chained.php(%d) : eval()'d code on line %d +Fatal error: [snuffleupagus][0.0.0.0][eval] A call to strtoupper was tried in eval, in %s/eval_backlist_chained.php:%d, dropping it. in %s/eval_backlist_chained.php(%d) : eval()'d code on line %d diff --git a/src/tests/eval_blacklist/eval_backlist_list.phpt b/src/tests/eval_blacklist/eval_backlist_list.phpt index d5bbd00..7cb0183 100644 --- a/src/tests/eval_blacklist/eval_backlist_list.phpt +++ b/src/tests/eval_blacklist/eval_backlist_list.phpt @@ -14,4 +14,4 @@ echo "After eval: $a\n"; --EXPECTF-- Outside of eval: 1337 1337 1337 -Fatal error: [snuffleupagus][eval] A call to strtoupper was tried in eval, in %a/eval_backlist_list.php:1, dropping it. in %a/eval_backlist_list.php(4) : eval()'d code on line 1 +Fatal error: [snuffleupagus][0.0.0.0][eval] A call to strtoupper was tried in eval, in %a/eval_backlist_list.php:1, dropping it. in %a/eval_backlist_list.php(4) : eval()'d code on line 1 diff --git a/src/tests/eval_blacklist/eval_backlist_simulation.phpt b/src/tests/eval_blacklist/eval_backlist_simulation.phpt index be4cd3a..d81398c 100644 --- a/src/tests/eval_blacklist/eval_backlist_simulation.phpt +++ b/src/tests/eval_blacklist/eval_backlist_simulation.phpt @@ -14,5 +14,5 @@ echo "After eval: $a\n"; --EXPECTF-- Outside of eval: 1337 1337 1337 -Warning: [snuffleupagus][eval] A call to strtoupper was tried in eval, in %a/eval_backlist_simulation.php:1, logging it. in %a/eval_backlist_simulation.php(4) : eval()'d code on line 1 +Warning: [snuffleupagus][0.0.0.0][eval] A call to strtoupper was tried in eval, in %a/eval_backlist_simulation.php:1, logging it. in %a/eval_backlist_simulation.php(4) : eval()'d code on line 1 After eval: 1234 diff --git a/src/tests/eval_blacklist/eval_backlist_whitelist.phpt b/src/tests/eval_blacklist/eval_backlist_whitelist.phpt index e5650b2..7e6524b 100644 --- a/src/tests/eval_blacklist/eval_backlist_whitelist.phpt +++ b/src/tests/eval_blacklist/eval_backlist_whitelist.phpt @@ -21,4 +21,4 @@ echo "After eval: $a\n"; Outside of eval: my_fun: 1337 1337 1337 After allowed eval: my_fun: 1234 -Fatal error: [snuffleupagus][Eval_whitelist] The function 'cos' isn't in the eval whitelist, dropping its call. in %a/eval_backlist_whitelist.php(10) : eval()'d code on line 1 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][Eval_whitelist] The function 'cos' isn't in the eval whitelist, dropping its call. in %a/eval_backlist_whitelist.php(10) : eval()'d code on line 1 \ No newline at end of file diff --git a/src/tests/eval_blacklist/eval_backlist_whitelist_builtin.phpt b/src/tests/eval_blacklist/eval_backlist_whitelist_builtin.phpt index 2f8bc19..8b05821 100644 --- a/src/tests/eval_blacklist/eval_backlist_whitelist_builtin.phpt +++ b/src/tests/eval_blacklist/eval_backlist_whitelist_builtin.phpt @@ -21,4 +21,4 @@ echo "After eval: $a\n"; Outside of eval: 1.5574077246549 After allowed eval: 1.5574077246549 -Fatal error: [snuffleupagus][Eval_whitelist] The function 'cos' isn't in the eval whitelist, dropping its call. in %a/eval_backlist_whitelist_builtin.php(10) : eval()'d code on line 1 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][Eval_whitelist] The function 'cos' isn't in the eval whitelist, dropping its call. in %a/eval_backlist_whitelist_builtin.php(10) : eval()'d code on line 1 \ No newline at end of file diff --git a/src/tests/eval_blacklist/eval_whitelist.phpt b/src/tests/eval_blacklist/eval_whitelist.phpt index a602d0d..d5b9d1c 100644 --- a/src/tests/eval_blacklist/eval_whitelist.phpt +++ b/src/tests/eval_blacklist/eval_whitelist.phpt @@ -25,4 +25,4 @@ echo "After eval: $a\n"; Outside of eval: my_fun: 1337 1337 1337 After allowed eval: my_fun: 1234 -Fatal error: [snuffleupagus][Eval_whitelist] The function 'my_other_fun' isn't in the eval whitelist, dropping its call. in %a/eval_whitelist.php on line 7 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][Eval_whitelist] The function 'my_other_fun' isn't in the eval whitelist, dropping its call. in %a/eval_whitelist.php on line 7 \ No newline at end of file diff --git a/src/tests/eval_blacklist/eval_whitelist_builtin.phpt b/src/tests/eval_blacklist/eval_whitelist_builtin.phpt index 5ed383d..9b406b5 100644 --- a/src/tests/eval_blacklist/eval_whitelist_builtin.phpt +++ b/src/tests/eval_blacklist/eval_whitelist_builtin.phpt @@ -17,4 +17,4 @@ echo "After eval: $a\n"; Outside of eval: 0.54030230586814 After allowed eval: 0.28366218546323 -Fatal error: [snuffleupagus][Eval_whitelist] The function 'sin' isn't in the eval whitelist, dropping its call. in %a/eval_whitelist_builtin.php(6) : eval()'d code on line 1 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][Eval_whitelist] The function 'sin' isn't in the eval whitelist, dropping its call. in %a/eval_whitelist_builtin.php(6) : eval()'d code on line 1 \ No newline at end of file diff --git a/src/tests/eval_blacklist/eval_whitelist_include_then_user.phpt b/src/tests/eval_blacklist/eval_whitelist_include_then_user.phpt index 5ff3bff..f3be8a8 100644 --- a/src/tests/eval_blacklist/eval_whitelist_include_then_user.phpt +++ b/src/tests/eval_blacklist/eval_whitelist_include_then_user.phpt @@ -27,4 +27,4 @@ unlink($dir . '/test.bla'); Outside of eval: 0.54030230586814 After allowed eval: 0.28366218546323 -Fatal error: [snuffleupagus][Eval_whitelist] The function 'sin' isn't in the eval whitelist, dropping its call. in %a/test.bla on line 1 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][Eval_whitelist] The function 'sin' isn't in the eval whitelist, dropping its call. in %a/test.bla on line 1 \ No newline at end of file diff --git a/src/tests/eval_blacklist/eval_whitelist_simulation.phpt b/src/tests/eval_blacklist/eval_whitelist_simulation.phpt index c4a3efa..7648dad 100644 --- a/src/tests/eval_blacklist/eval_whitelist_simulation.phpt +++ b/src/tests/eval_blacklist/eval_whitelist_simulation.phpt @@ -25,5 +25,5 @@ echo "After eval: $a\n"; Outside of eval: my_fun: 1337 1337 1337 After allowed eval: my_fun: 1234 -Warning: [snuffleupagus][Eval_whitelist] The function 'my_other_fun' isn't in the eval whitelist, logging its call. in %a/eval_whitelist_simulation.php on line 7 +Warning: [snuffleupagus][0.0.0.0][Eval_whitelist] The function 'my_other_fun' isn't in the eval whitelist, logging its call. in %a/eval_whitelist_simulation.php on line 7 After eval: my_other_fun: 1234 \ No newline at end of file diff --git a/src/tests/eval_blacklist/eval_whitelist_user_then_builtin.phpt b/src/tests/eval_blacklist/eval_whitelist_user_then_builtin.phpt index dbc7d93..aeb4d70 100644 --- a/src/tests/eval_blacklist/eval_whitelist_user_then_builtin.phpt +++ b/src/tests/eval_blacklist/eval_whitelist_user_then_builtin.phpt @@ -21,4 +21,4 @@ echo "After eval: $a\n"; --EXPECTF-- Outside of eval: -0.54402111088937 -Fatal error: [snuffleupagus][Eval_whitelist] The function 'sin' isn't in the eval whitelist, dropping its call. in %a/eval_whitelist_user_then_builtin.php on line 4 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][Eval_whitelist] The function 'sin' isn't in the eval whitelist, dropping its call. in %a/eval_whitelist_user_then_builtin.php on line 4 \ No newline at end of file diff --git a/src/tests/eval_blacklist/nested_eval_blacklist.phpt b/src/tests/eval_blacklist/nested_eval_blacklist.phpt index 244007e..2d99449 100644 --- a/src/tests/eval_blacklist/nested_eval_blacklist.phpt +++ b/src/tests/eval_blacklist/nested_eval_blacklist.phpt @@ -26,4 +26,4 @@ Inception lvl 1... Inception lvl 2... Inception lvl 3... -Fatal error: [snuffleupagus][eval] A call to strtoupper was tried in eval, in %a/nested_eval_blacklist.php(5) : eval()'d code(4) : eval()'d code:3, dropping it. in %a/nested_eval_blacklist.php(5) : eval()'d code(4) : eval()'d code(4) : eval()'d code on line 3 +Fatal error: [snuffleupagus][0.0.0.0][eval] A call to strtoupper was tried in eval, in %a/nested_eval_blacklist.php(5) : eval()'d code(4) : eval()'d code:3, dropping it. in %a/nested_eval_blacklist.php(5) : eval()'d code(4) : eval()'d code(4) : eval()'d code on line 3 diff --git a/src/tests/eval_blacklist/nested_eval_blacklist2.phpt b/src/tests/eval_blacklist/nested_eval_blacklist2.phpt index 9f7a4d0..d84a1f6 100644 --- a/src/tests/eval_blacklist/nested_eval_blacklist2.phpt +++ b/src/tests/eval_blacklist/nested_eval_blacklist2.phpt @@ -26,4 +26,4 @@ Inception lvl 1... Inception lvl 2... Inception lvl 3... -Fatal error: [snuffleupagus][eval] A call to strtoupper was tried in eval, in %a/nested_eval_blacklist2.php(5) : eval()'d code:7, dropping it. in %a/nested_eval_blacklist2.php(5) : eval()'d code(4) : eval()'d code on line 7 +Fatal error: [snuffleupagus][0.0.0.0][eval] A call to strtoupper was tried in eval, in %a/nested_eval_blacklist2.php(5) : eval()'d code:7, dropping it. in %a/nested_eval_blacklist2.php(5) : eval()'d code(4) : eval()'d code on line 7 diff --git a/src/tests/glob_config.phpt b/src/tests/glob_config.phpt index b557c8b..2d62c3a 100644 --- a/src/tests/glob_config.phpt +++ b/src/tests/glob_config.phpt @@ -16,8 +16,8 @@ foo(); bla(); ?> --EXPECTF-- -Warning: [snuffleupagus][disabled_function] Aborted execution on call of the function 'foo' in %a/glob_config.php on line 3 +Warning: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'foo' in %a/glob_config.php on line 3 1 -Warning: [snuffleupagus][disabled_function] Aborted execution on call of the function 'bla' in %a/glob_config.php on line 6 +Warning: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'bla' in %a/glob_config.php on line 6 2 \ No newline at end of file diff --git a/src/tests/inexistent_conf_file.phpt b/src/tests/inexistent_conf_file.phpt index a68ca9e..9b5e3d6 100644 --- a/src/tests/inexistent_conf_file.phpt +++ b/src/tests/inexistent_conf_file.phpt @@ -7,9 +7,9 @@ sp.configuration_file={PWD}/config/unexistent_configuration_file.ini --FILE-- --EXPECTF-- -PHP Fatal error: [snuffleupagus][config] Could not open configuration file %a/config/unexistent_configuration_file.ini : No such file or directory in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Could not open configuration file %a/config/unexistent_configuration_file.ini : No such file or directory in Unknown on line 0 -Fatal error: [snuffleupagus][config] Could not open configuration file %a/config/unexistent_configuration_file.ini : No such file or directory in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Could not open configuration file %a/config/unexistent_configuration_file.ini : No such file or directory in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/inexistent_conf_file_list.phpt b/src/tests/inexistent_conf_file_list.phpt index 3f91f38..b8b3bea 100644 --- a/src/tests/inexistent_conf_file_list.phpt +++ b/src/tests/inexistent_conf_file_list.phpt @@ -7,9 +7,9 @@ sp.configuration_file={PWD}/../../config/default.rules,{PWD}/non_existent_config --FILE-- --EXPECTF-- -PHP Fatal error: [snuffleupagus][config] Could not open configuration file %a/non_existent_configuration_file : No such file or directory in Unknown on line 0 +PHP Fatal error: [snuffleupagus][0.0.0.0][config] Could not open configuration file %a/non_existent_configuration_file : No such file or directory in Unknown on line 0 -Fatal error: [snuffleupagus][config] Could not open configuration file %a/non_existent_configuration_file : No such file or directory in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Could not open configuration file %a/non_existent_configuration_file : No such file or directory in Unknown on line 0 -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. \ No newline at end of file diff --git a/src/tests/loading.phpt b/src/tests/loading.phpt index db6395f..d48703e 100644 --- a/src/tests/loading.phpt +++ b/src/tests/loading.phpt @@ -7,5 +7,5 @@ Check for snuffleupagus presence echo "snuffleupagus extension is available"; ?> --EXPECT-- -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 Could not startup. diff --git a/src/tests/multi_config.phpt b/src/tests/multi_config.phpt index 2bdc372..558d9a1 100644 --- a/src/tests/multi_config.phpt +++ b/src/tests/multi_config.phpt @@ -16,8 +16,8 @@ foo(); bla(); ?> --EXPECTF-- -Warning: [snuffleupagus][disabled_function] Aborted execution on call of the function 'foo' in %a/multi_config.php on line 3 +Warning: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'foo' in %a/multi_config.php on line 3 1 -Warning: [snuffleupagus][disabled_function] Aborted execution on call of the function 'bla' in %a/multi_config.php on line 6 +Warning: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'bla' in %a/multi_config.php on line 6 2 \ No newline at end of file diff --git a/src/tests/session_encryption/crypt_session_corrupted_session.phpt b/src/tests/session_encryption/crypt_session_corrupted_session.phpt index 5853efd..2c4f085 100644 --- a/src/tests/session_encryption/crypt_session_corrupted_session.phpt +++ b/src/tests/session_encryption/crypt_session_corrupted_session.phpt @@ -27,4 +27,4 @@ session_start(); var_dump($_SESSION); ?> --EXPECTF-- -Fatal error: [snuffleupagus][cookie_encryption] Buffer underflow tentative detected in cookie encryption handling in %s/crypt_session_corrupted_session.php on line %s +Fatal error: [snuffleupagus][127.0.0.1][cookie_encryption] Buffer underflow tentative detected in cookie encryption handling in %s/crypt_session_corrupted_session.php on line %s diff --git a/src/tests/session_encryption/crypt_session_invalid.phpt b/src/tests/session_encryption/crypt_session_invalid.phpt index 8a57149..9d9a88a 100644 --- a/src/tests/session_encryption/crypt_session_invalid.phpt +++ b/src/tests/session_encryption/crypt_session_invalid.phpt @@ -21,4 +21,4 @@ session_start(); // Re start the session, It will read and decrypt the non em var_dump($_SESSION); // Dump the session ?> --EXPECTF-- -Warning: [snuffleupagus][cookie_encryption] Something went wrong with the decryption of the session in %s/crypt_session_invalid.php on line %d +Warning: [snuffleupagus][127.0.0.2][cookie_encryption] Something went wrong with the decryption of the session in %s/crypt_session_invalid.php on line %d diff --git a/src/tests/unserialize/dump_unserialize.phpt b/src/tests/unserialize/dump_unserialize.phpt index 4b54cbb..d07fcbe 100644 --- a/src/tests/unserialize/dump_unserialize.phpt +++ b/src/tests/unserialize/dump_unserialize.phpt @@ -36,4 +36,4 @@ if ($res[2] != "GET:get_a='data_get_a' get_b='data_get_b' \n") { --EXPECTF-- 1 -Fatal error: [snuffleupagus][unserialize] Invalid HMAC for s:1:"a";alyualskdufyhalkdjsfh in %a/dump_unserialize.php on line 8 +Fatal error: [snuffleupagus][0.0.0.0][unserialize] Invalid HMAC for s:1:"a";alyualskdufyhalkdjsfh in %a/dump_unserialize.php on line 8 diff --git a/src/tests/unserialize/unserialize_fail.phpt b/src/tests/unserialize/unserialize_fail.phpt index c6411a5..5e7912c 100644 --- a/src/tests/unserialize/unserialize_fail.phpt +++ b/src/tests/unserialize/unserialize_fail.phpt @@ -12,4 +12,4 @@ var_dump(unserialize('s:1:"a";dslfjklfjfkjfdjffjfjads')); var_dump(unserialize(1,2,3,4)); ?> --EXPECTF-- -Fatal error: [snuffleupagus][unserialize] The serialized object is too small. in %a/unserialize_fail.php on line 2 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][unserialize] The serialized object is too small. in %a/unserialize_fail.php on line 2 \ No newline at end of file diff --git a/src/tests/unserialize/unserialize_sim.phpt b/src/tests/unserialize/unserialize_sim.phpt index d919af1..cbc02a4 100644 --- a/src/tests/unserialize/unserialize_sim.phpt +++ b/src/tests/unserialize/unserialize_sim.phpt @@ -14,5 +14,5 @@ var_dump(unserialize('s:1:"a";alyualskdufyhalkdjsfhalkjdhflaksjdfhlkasdhflkahdaw --EXPECTF-- s:1:"a";650609b417904d0d9bbf1fc44a975d13ecdf6b02b715c1a06271fb3b673f25b1string(1) "a" -Warning: [snuffleupagus][unserialize] Invalid HMAC for s:1:"a";alyualskdufyhalkdjsfh in %a/unserialize_sim.php on line 5 +Warning: [snuffleupagus][0.0.0.0][unserialize] Invalid HMAC for s:1:"a";alyualskdufyhalkdjsfh in %a/unserialize_sim.php on line 5 string(1) "a" diff --git a/src/tests/upload_validation/upload_validation.phpt b/src/tests/upload_validation/upload_validation.phpt index 1daebb6..4a45771 100644 --- a/src/tests/upload_validation/upload_validation.phpt +++ b/src/tests/upload_validation/upload_validation.phpt @@ -13,6 +13,6 @@ Content-Disposition: form-data; name="test"; filename="test.php" echo 1; ?> --EXPECTF-- -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 -Fatal error: [snuffleupagus][config] A rule can't be enabled and disabled on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] A rule can't be enabled and disabled on line 1 in Unknown on line 0 diff --git a/src/tests/upload_validation/upload_validation_invalid.phpt b/src/tests/upload_validation/upload_validation_invalid.phpt index 0dbdbbb..5d64f57 100644 --- a/src/tests/upload_validation/upload_validation_invalid.phpt +++ b/src/tests/upload_validation/upload_validation_invalid.phpt @@ -13,9 +13,9 @@ Content-Disposition: form-data; name="test"; filename="test.php" echo 1; ?> --EXPECTF-- -Warning: [snuffleupagus][upload_validation] Could not call './tests/data/upload_invalid.sh' : Exec format error in Unknown on line 0 +Warning: [snuffleupagus][0.0.0.0][upload_validation] Could not call './tests/data/upload_invalid.sh' : Exec format error in Unknown on line 0 X-Powered-By: PHP/%a Content-type: text/html; charset=UTF-8%a %a -Fatal error: [snuffleupagus][upload_validation] The upload of test.php on ? was rejected. in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][upload_validation] The upload of test.php on ? was rejected. in Unknown on line 0 diff --git a/src/tests/upload_validation/upload_validation_ko.phpt b/src/tests/upload_validation/upload_validation_ko.phpt index d632e60..54f384a 100644 --- a/src/tests/upload_validation/upload_validation_ko.phpt +++ b/src/tests/upload_validation/upload_validation_ko.phpt @@ -11,4 +11,4 @@ Content-Disposition: form-data; name="test"; filename="test.php" --blabla-- --FILE-- --EXPECTF-- -Fatal error: [snuffleupagus][upload_validation] The upload of test.php on ? was rejected. in Unknown on line 0 \ No newline at end of file +Fatal error: [snuffleupagus][0.0.0.0][upload_validation] The upload of test.php on ? was rejected. in Unknown on line 0 \ No newline at end of file diff --git a/src/tests/upload_validation/upload_validation_ko_simulation.phpt b/src/tests/upload_validation/upload_validation_ko_simulation.phpt index b47c405..553874c 100644 --- a/src/tests/upload_validation/upload_validation_ko_simulation.phpt +++ b/src/tests/upload_validation/upload_validation_ko_simulation.phpt @@ -12,5 +12,5 @@ Content-Disposition: form-data; name="test"; filename="test.php" --FILE-- --EXPECTF-- -Warning: [snuffleupagus][upload_validation] The upload of test.php on ? was rejected. in Unknown on line 0 +Warning: [snuffleupagus][0.0.0.0][upload_validation] The upload of test.php on ? was rejected. in Unknown on line 0 1337 \ No newline at end of file diff --git a/src/tests/upload_validation/upload_validation_no_exec.phpt b/src/tests/upload_validation/upload_validation_no_exec.phpt index a6cde10..cf935fd 100644 --- a/src/tests/upload_validation/upload_validation_no_exec.phpt +++ b/src/tests/upload_validation/upload_validation_no_exec.phpt @@ -14,6 +14,6 @@ Content-Disposition: form-data; name="test"; filename="test.php" var_dump($_FILES); ?> --EXPECTF-- -Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] Invalid configuration file in Unknown on line 0 -Fatal error: [snuffleupagus][config] The `script` (tests/data/upload_no_exec.sh) isn't executable on line 1 in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][config] The `script` (tests/data/upload_no_exec.sh) isn't executable on line 1 in Unknown on line 0 diff --git a/src/tests/upload_validation/upload_validation_real.phpt b/src/tests/upload_validation/upload_validation_real.phpt index a945c5f..47df3d1 100644 --- a/src/tests/upload_validation/upload_validation_real.phpt +++ b/src/tests/upload_validation/upload_validation_real.phpt @@ -41,4 +41,4 @@ Some random text again echo 1; ?> --EXPECTF-- -Fatal error: [snuffleupagus][upload_validation] The upload of test.php on ? was rejected. in Unknown on line 0 +Fatal error: [snuffleupagus][0.0.0.0][upload_validation] The upload of test.php on ? was rejected. in Unknown on line 0 -- cgit v1.3 From 4a6e9ce42982612a2ea1e5d0f79164b160172f08 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Wed, 19 Feb 2020 21:43:26 +0100 Subject: Fix some dead links --- README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 418ae84..a7ad302 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@


- Snuffleupagus' logo + Snuffleupagus' logo
Snuffleupagus
@@ -10,8 +10,8 @@

Security module for php7 - Killing bugclasses and virtual-patching the rest!

- - + Travis-ci @@ -30,8 +30,8 @@ readthedocs.org - - + coveralls @@ -45,7 +45,7 @@ Download • Examples • Documentation • - License • + License • Thanks

@@ -76,7 +76,7 @@ without having to touch the PHP code. * Enforcing TLS certificate validation when using [curl](https://secure.php.net/manual/en/book.curl.php) * Request dumping capability * A relatively sane code base: - * A [comprehensive](https://coveralls.io/github/nbs-system/snuffleupagus?branch=master) test suite close to 100% coverage + * A [comprehensive](https://coveralls.io/github/jvoisin/snuffleupagus?branch=master) test suite close to 100% coverage * Every commit is tested on [several distributions](https://gitlab.com/jvoisin/snuffleupagus/pipelines) * An `clang-format`-enforced code style * A [comprehensive documentation](https://snuffleupagus.rtfd.io) @@ -87,11 +87,11 @@ without having to touch the PHP code. We've got a [download page](https://snuffleupagus.readthedocs.io/download.html), where you can find packages for your distribution, but you can of course just `git clone` this -repo, or check the releases on [github](https://github.com/nbs-system/snuffleupagus/releases). +repo, or check the releases on [github](https://github.com/jvoisin/snuffleupagus/releases). ## Examples -We're providing [various example rules](https://github.com/nbs-system/snuffleupagus/tree/master/config), +We're providing [various example rules](https://github.com/jvoisin/snuffleupagus/tree/master/config), that are looking like this: ```python @@ -112,10 +112,10 @@ Upon violation of a rule, you should see lines like this in your logs: We've got a [comprehensive website](https://snuffleupagus.readthedocs.io/) with all the documentation that you could possibly wish for. You can of course -[build it yourself](https://github.com/nbs-system/snuffleupagus/tree/master/doc). +[build it yourself](https://github.com/jvoisin/snuffleupagus/tree/master/doc). ## Thanks Many thanks to the [Suhosin project](https://suhosin.org) for being a __huge__ source of inspiration, and to all [our -contributors](https://github.com/nbs-system/snuffleupagus/graphs/contributors). +contributors](https://github.com/jvoisin/snuffleupagus/graphs/contributors). -- cgit v1.3 From 394edbf3b5232c30dd3019f8c3a5dfadc310884f Mon Sep 17 00:00:00 2001 From: jvoisin Date: Wed, 19 Feb 2020 21:52:32 +0100 Subject: Improve a bit php8 compatibility PHP changed the way it exposes if a function has variadic arguments or not, hence why we need yet an other ifdef. --- src/sp_disabled_functions.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/sp_disabled_functions.c b/src/sp_disabled_functions.c index c088f20..9e64993 100644 --- a/src/sp_disabled_functions.c +++ b/src/sp_disabled_functions.c @@ -352,7 +352,12 @@ static void should_disable(zend_execute_data* execute_data, if (config_node->param || config_node->r_param || (config_node->pos != -1)) { if (!builtin_param && - execute_data->func->op_array.arg_info->is_variadic) { +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_IS_VARIADIC(execute_data->func->op_array.arg_info) +#else + execute_data->func->op_array.arg_info->is_variadic +#endif + ){ sp_log_warn( "disable_function", "Snuffleupagus doesn't support variadic functions yet, sorry. " -- cgit v1.3 From d7b7a0d4e10d7b87b124889821b14e9858ed0a9c Mon Sep 17 00:00:00 2001 From: jvoisin Date: Wed, 4 Mar 2020 19:30:42 +0100 Subject: %s/nbs-system/jvoisin Since I'm the only one to maintain Snuffleupagus, let's adjust the links and contact addresses of my fork, to point to well… my fork. --- APKBUILD | 4 +- CONTRIBUTING.md | 20 ++++---- PKGBUILD | 4 +- debian/control | 6 +-- debian/copyright | 4 +- debian/watch | 2 +- doc/source/config.rst | 8 ++-- doc/source/debug.rst | 4 +- doc/source/download.rst | 8 ++-- doc/source/faq.rst | 55 +++++----------------- doc/source/installation.rst | 4 +- src/php_snuffleupagus.h | 2 +- src/sp_config_keywords.c | 2 +- src/sp_disabled_functions.c | 2 +- src/sp_upload_validation.c | 2 +- .../disabled_functions_drop_include.phpt | 2 +- ...disabled_functions_drop_include_simulation.phpt | 2 +- .../disabled_functions_variadic.phpt | 2 +- 18 files changed, 49 insertions(+), 84 deletions(-) diff --git a/APKBUILD b/APKBUILD index b784e38..b3345f6 100644 --- a/APKBUILD +++ b/APKBUILD @@ -1,4 +1,4 @@ -# Maintainer: +# Maintained by Julien (jvoisin) Voisin pkgname="php7-snuffleupagus" _pkgname="snuffleupagus" pkgver=0.1 @@ -10,7 +10,7 @@ license="LGPL3" depends="php7-dev php7-fpm" source="" -_giturl="https://github.com/nbs-system/snuffleupagus.git" +_giturl="https://github.com/jvoisin/snuffleupagus.git" prepare() { default_prepare diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 88a3297..40ad357 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,9 +6,9 @@ First off, thank you for considering contributing to snuffleupagus. If you've noticed a bug or have a question, look at the [faq](https://snuffleupagus.readthedocs.io/faq.html) and -[search the issue tracker](https://github.com/nbs-system/snuffleupagus/issues) +[search the issue tracker](https://github.com/jvoisin/snuffleupagus/issues) to see if someone else has already created a ticket. If not, go ahead and -[make one](https://github.com/nbs-system/snuffleupagus/issues/new)! +[make one](https://github.com/jvoisin/snuffleupagus/issues/new)! ### 2. Fork & create a branch @@ -28,7 +28,7 @@ Just type `make coverage` or `make debug`, the testsuite should be run automatically. Please add tests if you're fixing a bug or adding a new feature: we do have a -[high coverage](https://coveralls.io/github/nbs-system/snuffleupagus?branch=master) +[high coverage](https://coveralls.io/github/jvoisin/snuffleupagus?branch=master) (functions, lines and branches), and intend to keep it that way. #### 3.3 Debugging failures in the test suite @@ -45,9 +45,9 @@ launching it, in order to run the failing test inside GDB. ### 4. Did you find a bug? * **Ensure the bug was not already reported** by - [searching all issues](https://github.com/nbs-system/snuffleupagus/issues?q=). + [searching all issues](https://github.com/jvoisin/snuffleupagus/issues?q=). * If you're unable to find an open issue addressing the problem, - [open a new one](https://github.com/nbs-system/snuffleupagus/issues/new). + [open a new one](https://github.com/jvoisin/snuffleupagus/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not @@ -67,7 +67,7 @@ At this point, you should switch back to your master branch and make sure it's up to date with our upstream master branch: ```sh -git remote add upstream git@github.com:nbs-system/snuffleupagus.git +git remote add upstream git@github.com:jvoisin/snuffleupagus.git git checkout master git pull upstream master ``` @@ -82,7 +82,7 @@ git push --set-upstream origin 325-kill-sql-injections Finally, go to GitHub and [make a Pull Request](https://help.github.com/articles/creating-a-pull-request) :D -Travis CI will [run our test suite](https://travis-ci.org/nbs-system/snuffleupagus) +Travis CI will [run our test suite](https://travis-ci.org/jvoisin/snuffleupagus) against all supported PHP versions. We care about quality, so your PR won't be merged until all tests pass. It's unlikely, but it's possible that your changes pass tests in one PHP version but fail in another. In that case, you'll have to @@ -121,7 +121,7 @@ Maintainers need to do the following to push out a release: 1. Make sure that all pending and mergeable pull requests are in 2. Close the corresponding - [milestone](https://github.com/nbs-system/snuffleupagus/milestones) + [milestone](https://github.com/jvoisin/snuffleupagus/milestones) 2. Run `valgrind` (by adding a `-m` after the `-q` in the Makefile) and check that everything is ok. Don't mind the python-related issues. 3. Update the `src/php_snuffleupagus.h` according to [semantic versioning](https://semver.org/) @@ -132,15 +132,13 @@ Maintainers need to do the following to push out a release: 8. Create a tag for the release: ```sh - git config user.signingkey 498C46FF087EDC36E7EAF9D445414A82A9B22D78 - git config user.email security@nbs-system.com git tag -s v$MAJOR.$MINOR.$PATCH -m "v$MAJOR.$MINOR.$PATCH" git push --tags git push origin master ``` 9. Build the debian package with `make debian` -10. Create the [release on github](https://github.com/nbs-system/snuffleupagus/releases) +10. Create the [release on github](https://github.com/jvoisin/snuffleupagus/releases) 11. Add the freshly built Debian package to the release 12. Publish a [tweet](https://twitter.com/sp_php) 13. Do the *secret release dance* diff --git a/PKGBUILD b/PKGBUILD index 9c7239e..8ef050d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer NBS System Security Team +# Maintained by Julien (jvoisin) Voisin pkgname="snuffleupagus" pkgver=r169.424845a pkgrel=1 @@ -8,7 +8,7 @@ arch=('i686' 'x86_64') license=('LGPL3') depends=('php' 'php-fpm') checkdepends=() -source=("${pkgname}::git+https://github.com/nbs-system/${pkgname}.git") +source=("${pkgname}::git+https://github.com/jvoisin/${pkgname}.git") md5sums=('SKIP') pkgver() { diff --git a/debian/control b/debian/control index 5ec0480..bd9c361 100644 --- a/debian/control +++ b/debian/control @@ -1,11 +1,11 @@ Source: snuffleupagus Priority: optional -Maintainer: NBS System +Maintainer: Julien (jvoisin) Voisin Build-Depends: debhelper (>= 9), php7.0-dev | php7.1-dev | php7.2-dev Standards-Version: 4.1.3 -Homepage: https://snuffleupagus.fr +Homepage: https://github.com/jvoisin/snuffleupagus Section: php -Vcs-Git: https://github.com/nbs-system/snuffleupagus +Vcs-Git: https://github.com/jvoisin/snuffleupagus Package: snuffleupagus Architecture: any diff --git a/debian/copyright b/debian/copyright index a792452..af8f542 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Snuffleupagus -Upstream-Contact: NBS System -Source: https://github.com/nbs-system/snuffleupagus +Upstream-Contact: Julien (jvoisin) Voisin +Source: https://github.com/jvoisin/snuffleupagus Files: * Copyright: 2017 NBS System diff --git a/debian/watch b/debian/watch index 86028c7..2f88601 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -https://github.com/nbs-system/snuffleupagus/tags /nbs-system/snuffleupagus/archive/snuffleupagus-([0-9.]+)\.tar\.(gz|xz|bz2) +https://github.com/jvoisin/snuffleupagus/tags /jvoisin/snuffleupagus/archive/snuffleupagus-([0-9.]+)\.tar\.(gz|xz|bz2) diff --git a/doc/source/config.rst b/doc/source/config.rst index 4be8db7..7691f89 100644 --- a/doc/source/config.rst +++ b/doc/source/config.rst @@ -199,8 +199,8 @@ argument and various information about it in the environment: This feature can be used, for example, to check if an uploaded file contains php code, using `vld `_, -via `a python script `__, -or `a php one `__. +via `a python script `__, +or `a php one `__. The upload will be **allowed** if the script returns the value ``0``. Every other value will prevent the file from being uploaded. @@ -342,7 +342,7 @@ For clarity, the presence of the ``allow`` or ``drop`` action is **mandatory**. because it'll match the deny first. If you're paranoid, we're providing a `php script -`__ +`__ to automatically generate hash of files containing dangerous functions, and blacklisting them everywhere else. @@ -358,7 +358,7 @@ It's currently not possible to: things like this, odds are that you're doing something wrong anyway. - Hooks on ``echo`` and on ``print`` are equivalent: there is no way to hook one without hooking the other, at least - `for now `__). + `for now `__). This is why hooked ``print`` will be displayed as ``echo`` in the logs. - Hook `strlen`, since in latest PHP versions, this function is usually optimized away by the compiled. diff --git a/doc/source/debug.rst b/doc/source/debug.rst index b339366..b2a1f28 100644 --- a/doc/source/debug.rst +++ b/doc/source/debug.rst @@ -18,7 +18,7 @@ We're using `php qa `__ tests format for our testsuite, it is automatically run when you're building snuffleupagus. If it happens to have unexpected failures (Since we're using `TDD `__ as much -as we can, we do have some expected failures), please do `open an issue `__ +as we can, we do have some expected failures), please do `open an issue `__ on our bugtracker, and attach the generated ``.diff`` and ``.out`` files to it, so we can see what's happening. @@ -27,7 +27,7 @@ Snuffleupagus is crashing While we do our very best to make snuffleupagus solid as possible, we're humans, and computers are hard, so crashes can happen. If you're encountering one in production, -please try to launch the `testsuite `__ +please try to launch the `testsuite `__ to see if it's failing. If it does, please :ref:`tell us `. If the testsuite is passing, odds are that you're encountering an issue tied to your php code, diff --git a/doc/source/download.rst b/doc/source/download.rst index dfe4768..fd61099 100644 --- a/doc/source/download.rst +++ b/doc/source/download.rst @@ -4,20 +4,20 @@ Download Arch Linux ---------- -We're providing a `PKGBUILD `__, +We're providing a `PKGBUILD `__, so you can build a package yourself. Alpine Linux ------------ -We're providing a `APKBUILD `__, +We're providing a `APKBUILD `__, so you can build a package yourself. Debian and Ubuntu ----------------- We're currently not providing a Debian/Ubuntu repository, -but you can grab the latest release on `github `__, +but you can grab the latest release on `github `__, or build your own package by cloning the source code and typing ``make debian``. Fedora @@ -39,4 +39,4 @@ We're currently using *github* as public code repository. :: - git clone https://github.com/nbs-system/snuffleupagus + git clone https://github.com/jvoisin/snuffleupagus diff --git a/doc/source/faq.rst b/doc/source/faq.rst index 4974c70..285f0c8 100644 --- a/doc/source/faq.rst +++ b/doc/source/faq.rst @@ -46,6 +46,8 @@ with a strong focus on security. We do have several layers of hardening `IDS `_, etc), but we had nothing for PHP7. +Nowadays, Snuffleupagus is maintained by Julien (jvoisin) Voisin. + Why not Suhosin? """""""""""""""" @@ -70,7 +72,8 @@ What license is Snuffleupagus released under and why? """"""""""""""""""""""""""""""""""""""""""""""""""""" Snuffleupagus is licensed under the `LGPL `_ -and is developed by the fine people from `NBS System `__. +was developed by the fine people from `NBS System `__, +and is maintained by Julien (jvoisin) Voisin. We chose the LGPL because we don't care that much how you're using Snuffleupagus, but we'd like to force people to make their improvements/contributions @@ -171,7 +174,7 @@ By checking the logs; Snuffleupagus systematically prefix them with ``[snuffleup Does Snuffleupagus run on Windows? """""""""""""""""""""""""""""""""" -No idea, feel free to `try `_. +No idea, feel free to `try `_. Does Snuggleupagus run on `HHVM `_? @@ -204,46 +207,13 @@ discuss potential impact of the vulnerability, reference applicable patches or workarounds, and credit the discoverer. -Please send it us a mail to the ``security`` user, -on ``nbs-system.com``, using the gpg key -``498C46FF087EDC36E7EAF9D445414A82A9B22D78``: - -:: - - -----BEGIN PGP PUBLIC KEY BLOCK----- - - mQENBFnKHhoBCADaOa0MKEqRy0h2ohIzczblzkMQCbU9oD1HwJ1VkYnn7TGW2iKi - NISxisExIXpy2Bn/pA27GiV0V/Do3NL6D9r0oOCrGR27muGM0N/dk9UMv7MWw8zv - K8cO+Sa28s0cAv7r2ogUJj5YOo8D4wHEpE8424TE89V9+Qg/SaFCxKoELFP0c7wu - mtsm0PnL65piZ1EB7lQo2gxg+8AV45MD1Y2rREMKUoZE23X+nXKsmEh9BFEPaU5M - 7WQp0NasqeMNoGhwfw9ttVAeLhkEkaTjW1PkNRIb7vrtV9KVb5uKucflfbOnDlzu - tQ9U3tYto0mcSCRchAClfEmoSi/0mKyb5N6ZABEBAAG0NVNlY3VyaXR5IHRlYW0g - b2YgTkJTIFN5c3RlbSA8c2VjdXJpdHlAbmJzLXN5c3RlbS5jb20+iQE3BBMBCAAh - BQJZyh4aAhsDBQsJCAcCBhUICQoLAgQWAgMBAh4BAheAAAoJEEVBSoKpsi14jy0H - /1/XB9THhvmG0ow81sld2Zx8qhnNed8VvYDS6mEjpDWNVPxENwDbnakEjisq1Hrb - 2UQPYCyQ5dekPNFVwQHIGXkX0eb1Ank+4esBJuEpQ2985tgNhJy5ZX+Imb5C8nZC - 90uYSN1UUg559nUsFeElOXSEH6tIXK/TvjsvMYoi2Ukl6lb7PbIU2fjLY9Iqv3QY - 32p8/Bl1fVKWbXOk0HDgJ6zA3Kr56QhZOLBkxjOa2XAnnIE76jZxUJ9qPCwWd1vW - GFxtx1Y+eZriqHiC9CPe6aBWcIHaTXSu1WBbXrFu8/eCWw243Rxm8l9wgA/a7VWq - WBfO45IhJUwh95naRpw8/4a5AQ0EWcoeGgEIAJtzSyyzfn2RX+BsyoRFANUpIgrV - /9eohYQVNqK3AFthmq7Kjmt4+hszF5+0wCFmWwYqGnqk1/dsWmqpkXsJldEn6oPJ - Bng+Dc67Yki2dR3TroAf95UmI08fhyM7TMXp8m46BPRRMzPNwalEeEm49Oclmfxb - JsWWCChWVLWGz2xgPEAv3fPHqus7Rwz/WIl53l/qy1Wf0ewmjRpVEfnEMKBExtBK - 4kRxQ40LzUZ1SfpyGc3nMbswhevT7/klqrdJdCnlu67Y/IfRGxGZuNj1n1Dib3Hx - zTBHo3Y2R3BB93Ix8dkbLaxLqFbOYVdijCgJklqUWhx7btpQ2xnZyzyCMuUAEQEA - AYkBHwQYAQgACQUCWcoeGgIbDAAKCRBFQUqCqbIteFRvB/9u3Mae8n8ELrJKOn+P - PEbWjutObIuTplvY4QcbnNb9dsgsKryamp4CFJsA5XuitPpC31GDMXBZO5/LLOuH - HoMaXFJdic0NToL/3REhu+aZkNIU6S/iaPRNVhkSV4lwQsvncz+nBaiDUJjyfJm2 - kEjVcRTM8yqzcNo/9Gn0ts+XCUqRj7+S1M4Bj3NySoO/w2n+7OLbIAj+wQZcj3Gf - 5QhBYaY4YaFxrJE0IZxyXGHw8xhKR6AN+u4TO7LRCW+cWV/sHWir1MXieJoEG8+R - W/BhrB0Rz5uxOXMoGCCD2TUiHq7zpuHGnYFVmAnHQZaaQxXve4VrcmznxgpV8lpW - mZug - =+eIv - -----END PGP PUBLIC KEY BLOCK----- +Please do send a mail to [Julien (jvoisin) Voisin](https://dustri.org) should +you find a security issue. + I found a bug. How can I report it? """"""""""""""""""""""""""""""""""" -We do have an issue tracker on `Github `_. +We do have an issue tracker on `Github `_. Please make sure to include as much information as possible when reporting your issue, such as your operating system, your version of PHP 7, your version of Snuffleupagus, your logs, the problematic php code, the request, a brief description, … long story short, @@ -255,12 +225,9 @@ it's not that hard. Where can I find even more help? """""""""""""""""""""""""""""""" The :doc:`configuration page ` might be what you're looking for. -If you're adventurous, you can also check the `issue tracker `_ -(make sure to check the `closed issues `_ too). +If you're adventurous, you can also check the `issue tracker `_ +(make sure to check the `closed issues `_ too). -I need professional support for my company. -""""""""""""""""""""""""""""""""""""""""""" -Contact `NBS System `_. Unimplemented mitigations and abandoned ideas --------------------------------------------- diff --git a/doc/source/installation.rst b/doc/source/installation.rst index 74d5d4f..a6b0ff8 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -1,7 +1,7 @@ Installation ============ -Snuffleupagus is tested against `various PHP 7+ versions `_. +Snuffleupagus is tested against `various PHP 7+ versions `_. Manual installation ------------------- @@ -21,7 +21,7 @@ Quickstart :: - git clone https://github.com/nbs-system/snuffleupagus + git clone https://github.com/jvoisin/snuffleupagus cd snuffleupagus/src phpize ./configure --enable-snuffleupagus diff --git a/src/php_snuffleupagus.h b/src/php_snuffleupagus.h index 0141a87..5a02e93 100644 --- a/src/php_snuffleupagus.h +++ b/src/php_snuffleupagus.h @@ -4,7 +4,7 @@ #define PHP_SNUFFLEUPAGUS_VERSION "0.5.0" #define PHP_SNUFFLEUPAGUS_EXTNAME "snuffleupagus" #define PHP_SNUFFLEUPAGUS_AUTHOR "NBS System" -#define PHP_SNUFFLEUPAGUS_URL "https://github.com/nbs-system/snuffleupagus" +#define PHP_SNUFFLEUPAGUS_URL "https://github.com/jvoisin/snuffleupagus" #define PHP_SNUFFLEUPAGUS_COPYRIGHT "LGPLv2" #include diff --git a/src/sp_config_keywords.c b/src/sp_config_keywords.c index aebe45c..c3a9c19 100644 --- a/src/sp_config_keywords.c +++ b/src/sp_config_keywords.c @@ -44,7 +44,7 @@ int parse_session(char *line) { "You're trying to use the session cookie encryption feature " "on line %zu without having session support statically built into PHP. " "This isn't supported, see " - "https://github.com/nbs-system/snuffleupagus/issues/278 for details.", + "https://github.com/jvoisin/snuffleupagus/issues/278 for details.", sp_line_no); pefree(session, 0); return -1; diff --git a/src/sp_disabled_functions.c b/src/sp_disabled_functions.c index 9e64993..4807955 100644 --- a/src/sp_disabled_functions.c +++ b/src/sp_disabled_functions.c @@ -361,7 +361,7 @@ static void should_disable(zend_execute_data* execute_data, sp_log_warn( "disable_function", "Snuffleupagus doesn't support variadic functions yet, sorry. " - "Check https://github.com/nbs-system/snuffleupagus/issues/164 for " + "Check https://github.com/jvoisin/snuffleupagus/issues/164 for " "details."); } else if (false == is_param_matching( execute_data, config_node, builtin_param, diff --git a/src/sp_upload_validation.c b/src/sp_upload_validation.c index ee19df9..54b0481 100644 --- a/src/sp_upload_validation.c +++ b/src/sp_upload_validation.c @@ -15,7 +15,7 @@ int sp_rfc1867_callback_win(unsigned int event, void *event_data, void **extra) { sp_log_msg("upload_validation", SP_LOG_SIMULATION, "The upload validation doesn't work for now on Windows yet, " - "see https://github.com/nbs-system/snuffleupagus/issues/248 for " + "see https://github.com/jvoisin/snuffleupagus/issues/248 for " "details."); return SUCCESS; } diff --git a/src/tests/disable_function/disabled_functions_drop_include.phpt b/src/tests/disable_function/disabled_functions_drop_include.phpt index e18dd73..ba1c955 100644 --- a/src/tests/disable_function/disabled_functions_drop_include.phpt +++ b/src/tests/disable_function/disabled_functions_drop_include.phpt @@ -1,5 +1,5 @@ --TEST-- -Disable function, bug : https://github.com/nbs-system/snuffleupagus/issues/181 +Disable function, bug : https://github.com/jvoisin/snuffleupagus/issues/181 --SKIPIF-- --INI-- diff --git a/src/tests/disable_function/disabled_functions_drop_include_simulation.phpt b/src/tests/disable_function/disabled_functions_drop_include_simulation.phpt index 07c3e98..1b13915 100644 --- a/src/tests/disable_function/disabled_functions_drop_include_simulation.phpt +++ b/src/tests/disable_function/disabled_functions_drop_include_simulation.phpt @@ -1,5 +1,5 @@ --TEST-- -Disable function, bug : https://github.com/nbs-system/snuffleupagus/issues/181 +Disable function, bug : https://github.com/jvoisin/snuffleupagus/issues/181 --SKIPIF-- --INI-- diff --git a/src/tests/disable_function/disabled_functions_variadic.phpt b/src/tests/disable_function/disabled_functions_variadic.phpt index 5bace63..32b6b0e 100644 --- a/src/tests/disable_function/disabled_functions_variadic.phpt +++ b/src/tests/disable_function/disabled_functions_variadic.phpt @@ -13,6 +13,6 @@ function foo(...$b) { echo foo(5, 4, 3, 2, 1); ?> --EXPECTF-- -Warning: [snuffleupagus][0.0.0.0][disable_function] Snuffleupagus doesn't support variadic functions yet, sorry. Check https://github.com/nbs-system/snuffleupagus/issues/164 for details. in %a/disabled_functions_variadic.php on line %d +Warning: [snuffleupagus][0.0.0.0][disable_function] Snuffleupagus doesn't support variadic functions yet, sorry. Check https://github.com/jvoisin/snuffleupagus/issues/164 for details. in %a/disabled_functions_variadic.php on line %d Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'foo' in %a/disabled_functions_variadic.php on line %d -- cgit v1.3 From ced22b18a43bd33e65aca84b721b09136e5bb385 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Mon, 9 Mar 2020 15:13:06 +0100 Subject: Mention Synacktiv's latest talk --- doc/source/papers.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/source/papers.rst b/doc/source/papers.rst index be99ddb..1007eaf 100644 --- a/doc/source/papers.rst +++ b/doc/source/papers.rst @@ -19,6 +19,9 @@ Talks - `Pass the Salt `_ - `slides `__ - `video `__ - `44con `__ - `slides `__ +2020 +"""" +- `Modern PHP security - sec4dev 2020, Vienna - Synacktiv `__ - `sec4dev 2020 `__ Mentions -------- -- cgit v1.3 From aff65b2578f7e8695da0871df1f089bd6951f942 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Thu, 19 Mar 2020 14:53:20 +0100 Subject: Fix coverity integration --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7eade9f..4e2ec64 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,14 +8,14 @@ matrix: - env: TARGET="coverity" php: "7.2" script: echo "Coverity, nothing to do." - after_success: cat /home/travis/build/nbs-system/snuffleupagus/cov-int/scm_log.txt + after_success: cat /home/travis/build/jvoisin/snuffleupagus/cov-int/scm_log.txt before_install: echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- addons: coverity_scan: project: - name: "nbs-system/snuffleupagus" + name: "jvoisin/snuffleupagus" description: "Build submitted via Travis CI" - notification_email: "devnull@nbs-system.com" + notification_email: "julien.voisin+travisci@dustri.org" build_command_prepend: "cd src; phpize; ./configure --enable-snuffleupagus; cd -" build_command: "make debug -j2" branch_pattern: "master" -- cgit v1.3 From 94620108d3dbdb8c2fd11fbf8dbe12bba321ee72 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Wed, 1 Apr 2020 17:09:36 +0200 Subject: Document why SP doesn't provide a `.nop` action --- doc/source/faq.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/doc/source/faq.rst b/doc/source/faq.rst index 285f0c8..3c09409 100644 --- a/doc/source/faq.rst +++ b/doc/source/faq.rst @@ -245,3 +245,19 @@ if someone can manage to get better results than us. The possibility of having this natively in PHP has `been discussed `_, but as 2017, nothing has been merged yet. + +Nop'ing function execution +"""""""""""""""""""""""""" + +Snuffleupagus can be configured to either *allow* or *drop* the execution of +particular functions and optionally *log* and *dump* them, but it doesn't +provide any mechanism to *nop* their execution. + +We thought about adding this, but didn't for several reasons: + +- What should the return value of a *nop'ed* function be? +- It would add confusion between ``drop``, ``nop`` and ``log``. +- Usually, when a specific function is called, either it's a dangerous one + and you want to stop the execution immediately, or you want to let it + continue and log it. There isn't really any middle-ground, or at least we + failed to find any. -- cgit v1.3 From bcc28c55c36fefc9daa03837f86fdf72b496ac5c Mon Sep 17 00:00:00 2001 From: jvoisin Date: Fri, 3 Apr 2020 11:21:34 +0200 Subject: Add cPanel to the list of users --- doc/source/papers.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/source/papers.rst b/doc/source/papers.rst index 1007eaf..91be4d4 100644 --- a/doc/source/papers.rst +++ b/doc/source/papers.rst @@ -88,3 +88,4 @@ Notable users - `Oceanet Technology `__ - a French hosting company - `SwissCenter `__ - a Swiss datacenter & web hosting company - `Toolslib `__ - an `Alexa top 10k `__ website +- `cPanel `__ - one of the most popular web hosting control panel -- cgit v1.3 From 8deedf62c8486bd2987e5fe144830785224ba4ca Mon Sep 17 00:00:00 2001 From: jvoisin Date: Fri, 3 Apr 2020 15:23:12 +0200 Subject: Add an other article mentioning Snuffleupagus --- doc/source/papers.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/source/papers.rst b/doc/source/papers.rst index 91be4d4..3d5e42a 100644 --- a/doc/source/papers.rst +++ b/doc/source/papers.rst @@ -58,6 +58,7 @@ Articles - `Behold the Snuffleupagus `__ - memze.ro - `How to harden AdwCleaner’s web backend using PHP `__ - Malwarebyte's blog - `First release of Snuffleupagus `__ - dustri.org +- `PHP Magazine `__ - phpmagazine.net 2018 """" -- cgit v1.3 From a205f438dbc9a498d4cad31a54e50b63007d4ef2 Mon Sep 17 00:00:00 2001 From: Travis Paul Date: Tue, 14 Apr 2020 17:27:15 +0800 Subject: Typofix s/than/that/ --- doc/source/features.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/features.rst b/doc/source/features.rst index 407b9c7..3f40120 100644 --- a/doc/source/features.rst +++ b/doc/source/features.rst @@ -444,7 +444,7 @@ or ``is_callable`` with *suspicious* parameters. Some PHP applications are using broad rights when using the ``chmod`` function, like the infamous ``chmod(777)`` command, effectively making the file writable by everyone. Snuffleupagus is preventing this kind of behaviour by restricting the parameters -than can be passed to ``chmod``. +that can be passed to ``chmod``. Arbitrary file inclusion hardening """""""""""""""""""""""""""""""""" -- cgit v1.3 From f0d873bd8295f06773f66b359581902a3b528341 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Fri, 24 Apr 2020 15:12:43 +0200 Subject: Add yet another disabled_functions bypass --- config/default.rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/default.rules b/config/default.rules index dc749e5..1446fb8 100644 --- a/config/default.rules +++ b/config/default.rules @@ -42,6 +42,9 @@ sp.disable_function.function("mail").param("additional_parameters").value_r("\\- # Since it's now burned, me might as well mitigate it publicly sp.disable_function.function("putenv").param("setting").value_r("LD_").drop() +# This one was burned in Nov 2019 - https://gist.github.com/LoadLow/90b60bd5535d6c3927bb24d5f9955b80 +sp.disable_function.function("putenv").param("setting").value_r("GCONV_").drop() + # This is also burned: # ini_set('open_basedir','..');chdir('..');…;chdir('..');ini_set('open_basedir','/');echo(file_get_contents('/etc/passwd')); # Since we have no way of matching on two parameters at the same time, we're -- cgit v1.3 From 15b4b451f1997267848fb7a23f7310adaff04f54 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Fri, 24 Apr 2020 15:18:55 +0200 Subject: Add missing dependencies for Ubuntu's CI --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 73181c5..78d28b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,7 +21,7 @@ testsuite:ubuntu: stage: testsuite script: - apt-get -qqy update - - DEBIAN_FRONTEND=noninteractive apt-get -qqy install --no-install-recommends php-dev gcc make + - DEBIAN_FRONTEND=noninteractive apt-get -qqy install --no-install-recommends php-dev gcc make libpcre3-dev php-cgi php-curl - make debug testsuite:alpine: -- cgit v1.3 From bbdf470f4e2d87d90c9ea11f4ce572e4416ffeab Mon Sep 17 00:00:00 2001 From: jvoisin Date: Sat, 25 Apr 2020 15:08:40 +0200 Subject: Add yet an other stupid things to the default set of rules --- config/default.rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/default.rules b/config/default.rules index 1446fb8..9dfa68e 100644 --- a/config/default.rules +++ b/config/default.rules @@ -45,6 +45,9 @@ sp.disable_function.function("putenv").param("setting").value_r("LD_").drop() # This one was burned in Nov 2019 - https://gist.github.com/LoadLow/90b60bd5535d6c3927bb24d5f9955b80 sp.disable_function.function("putenv").param("setting").value_r("GCONV_").drop() +# Since people are stupid enough to use `extract` on things like $_GET or $_POST, we might as well mitigate this vector +sp.disable_function.function("extract").param("array").value_r("^_").drop() + # This is also burned: # ini_set('open_basedir','..');chdir('..');…;chdir('..');ini_set('open_basedir','/');echo(file_get_contents('/etc/passwd')); # Since we have no way of matching on two parameters at the same time, we're -- cgit v1.3 From 7f5f00eaa6be38e4fe39e3eb6424c2be7fd40907 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Sat, 25 Apr 2020 15:29:00 +0200 Subject: Fix and improve the previous commit --- config/default.rules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/default.rules b/config/default.rules index 9dfa68e..040a54b 100644 --- a/config/default.rules +++ b/config/default.rules @@ -46,7 +46,8 @@ sp.disable_function.function("putenv").param("setting").value_r("LD_").drop() sp.disable_function.function("putenv").param("setting").value_r("GCONV_").drop() # Since people are stupid enough to use `extract` on things like $_GET or $_POST, we might as well mitigate this vector -sp.disable_function.function("extract").param("array").value_r("^_").drop() +sp.disable_function.function("extract").param("var_array").value_r("^_").drop() +sp.disable_function.function("extract").param("extract_type").value("0").drop() # This is also burned: # ini_set('open_basedir','..');chdir('..');…;chdir('..');ini_set('open_basedir','/');echo(file_get_contents('/etc/passwd')); -- cgit v1.3 From 4a5a1922f105bf0d4ee002088a6e6ece67ae0b9e Mon Sep 17 00:00:00 2001 From: jvoisin Date: Sat, 25 Apr 2020 15:37:40 +0200 Subject: Update a bit debian/control --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index bd9c361..51e0b15 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: snuffleupagus Priority: optional Maintainer: Julien (jvoisin) Voisin -Build-Depends: debhelper (>= 9), php7.0-dev | php7.1-dev | php7.2-dev +Build-Depends: debhelper (>= 9), php7.0-dev | php7.1-dev | php7.2-dev | php7.3-dev | php7.4-dev Standards-Version: 4.1.3 Homepage: https://github.com/jvoisin/snuffleupagus Section: php -- cgit v1.3 From 3e2b6545b623f0ba1b016c03b43d999cfcbc8d2f Mon Sep 17 00:00:00 2001 From: jvoisin Date: Fri, 1 May 2020 19:50:56 +0200 Subject: Make the testsuite work on php7.4 Before php7.4, it seems that the curl module was loaded by default, but since it's no the case anymore, it has to be manually specified in the testsuite. Interestingly, Php's testsuite mechanism is running snippets to determine some runtime parameters like the extension directory. Unfortunately,it tries to run them with Snuffleupagus loaded, resulting in an error, since no configuration file is passed. --- .travis.yml | 2 ++ Makefile | 1 + .../disabled_function_ensure_client_valid_certs.phpt | 2 ++ ...sabled_function_ensure_client_valid_certs_curl_multi_setopt.phpt | 2 ++ ...sabled_function_ensure_client_valid_certs_curl_setopt_array.phpt | 2 ++ .../disabled_function_ensure_server_valid_certs.phpt | 2 ++ ...sabled_function_ensure_server_valid_certs_curl_multi_setopt.phpt | 2 ++ ...sabled_function_ensure_server_valid_certs_curl_setopt_array.phpt | 6 ++++-- src/tests/xxe/disable_xxe_dom.phpt | 2 ++ src/tests/xxe/disable_xxe_dom_disabled.phpt | 2 ++ src/tests/xxe/disable_xxe_simplexml.phpt | 2 ++ src/tests/xxe/disable_xxe_simplexml_oop.phpt | 2 ++ src/tests/xxe/disable_xxe_xml_parse.phpt | 2 ++ 13 files changed, 27 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e2ec64..f5a8fee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,6 +42,8 @@ script: - phpize - ./configure --enable-snuffleupagus --enable-coverage - make -j 2 + - sed -i "s/\$ext_params -d display_errors=0 -r/-d display_errors=0 -r/" run-tests.php + - cat run-tests.php - TEST_PHP_ARGS="-q" REPORT_EXIT_STATUS=1 make test after_success: diff --git a/Makefile b/Makefile index c0d65c2..db5878e 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,7 @@ compile_debug: ## compile a debug build make -C src debug: compile_debug ## compile and run a debug build + sed -i "s/\$$ext_params -d display_errors=0 -r/-d display_errors=0 -r/" src/run-tests.php TEST_PHP_ARGS='-q' REPORT_EXIT_STATUS=1 make -C src test coverage: ## compile snuffleugpaus, and run the testsuite with coverage diff --git a/src/tests/disable_function/disabled_function_ensure_client_valid_certs.phpt b/src/tests/disable_function/disabled_function_ensure_client_valid_certs.phpt index 1d51b05..dc53593 100644 --- a/src/tests/disable_function/disabled_function_ensure_client_valid_certs.phpt +++ b/src/tests/disable_function/disabled_function_ensure_client_valid_certs.phpt @@ -5,6 +5,8 @@ Disable functions - Ensure that client certificates validation can't be disabled if (!extension_loaded("snuffleupagus")) { die("skip"); } if (!extension_loaded("curl")) { die("skip"); } ?> +--EXTENSIONS-- +curl --INI-- sp.configuration_file={PWD}/config/disabled_function_curl_verify_certs.ini --FILE-- diff --git a/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_multi_setopt.phpt b/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_multi_setopt.phpt index a79ff48..9ff37ec 100644 --- a/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_multi_setopt.phpt +++ b/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_multi_setopt.phpt @@ -5,6 +5,8 @@ Disable functions - Ensure that client certificates validation can't be disabled if (!extension_loaded("snuffleupagus")) { die("skip"); } if (!extension_loaded("curl")) { die("skip"); } ?> +--EXTENSIONS-- +curl --INI-- sp.configuration_file={PWD}/config/disabled_function_curl_verify_certs.ini --FILE-- diff --git a/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_setopt_array.phpt b/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_setopt_array.phpt index 6c7bc93..246fee6 100644 --- a/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_setopt_array.phpt +++ b/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_setopt_array.phpt @@ -5,6 +5,8 @@ Disable functions - Ensure that client certificates validation can't be disabled if (!extension_loaded("snuffleupagus")) { die("skip"); } if (!extension_loaded("curl")) { die("skip"); } ?> +--EXTENSIONS-- +curl --INI-- sp.configuration_file={PWD}/config/disabled_function_curl_verify_certs.ini --FILE-- diff --git a/src/tests/disable_function/disabled_function_ensure_server_valid_certs.phpt b/src/tests/disable_function/disabled_function_ensure_server_valid_certs.phpt index 40b58cc..fa583b0 100644 --- a/src/tests/disable_function/disabled_function_ensure_server_valid_certs.phpt +++ b/src/tests/disable_function/disabled_function_ensure_server_valid_certs.phpt @@ -5,6 +5,8 @@ Disable functions - Ensure that server certificates validation can't be disabled if (!extension_loaded("snuffleupagus")) { die("skip"); } if (!extension_loaded("curl")) { die("skip"); } ?> +--EXTENSIONS-- +curl --INI-- sp.configuration_file={PWD}/config/disabled_function_curl_verify_certs.ini --FILE-- diff --git a/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_multi_setopt.phpt b/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_multi_setopt.phpt index 06acd6c..3b374ee 100644 --- a/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_multi_setopt.phpt +++ b/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_multi_setopt.phpt @@ -5,6 +5,8 @@ Disable functions - Ensure that server certificates validation can't be disabled if (!extension_loaded("snuffleupagus")) { die("skip"); } if (!extension_loaded("curl")) { die("skip"); } ?> +--EXTENSIONS-- +curl --INI-- sp.configuration_file={PWD}/config/disabled_function_curl_verify_certs.ini --FILE-- diff --git a/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_setopt_array.phpt b/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_setopt_array.phpt index c716625..97accce 100644 --- a/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_setopt_array.phpt +++ b/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_setopt_array.phpt @@ -2,9 +2,11 @@ Disable functions - Ensure that server certificates validation can't be disabled via `curl_setopt_array` --SKIPIF-- +--EXTENSIONS-- +curl --INI-- sp.configuration_file={PWD}/config/disabled_function_curl_verify_certs.ini --FILE-- diff --git a/src/tests/xxe/disable_xxe_dom.phpt b/src/tests/xxe/disable_xxe_dom.phpt index e1459e3..2f45f66 100644 --- a/src/tests/xxe/disable_xxe_dom.phpt +++ b/src/tests/xxe/disable_xxe_dom.phpt @@ -8,6 +8,8 @@ Disable XXE echo "skip"; } ?> +--EXTENSIONS-- +dom --INI-- sp.configuration_file={PWD}/config/disable_xxe.ini --FILE-- diff --git a/src/tests/xxe/disable_xxe_dom_disabled.phpt b/src/tests/xxe/disable_xxe_dom_disabled.phpt index a791ebc..59526d2 100644 --- a/src/tests/xxe/disable_xxe_dom_disabled.phpt +++ b/src/tests/xxe/disable_xxe_dom_disabled.phpt @@ -5,6 +5,8 @@ Disable XXE if (!extension_loaded("snuffleupagus")) echo "skip"; if (!extension_loaded("dom")) echo "skip"; ?> +--extensions-- +dom --INI-- sp.configuration_file={PWD}/config/disable_xxe_disable.ini --FILE-- diff --git a/src/tests/xxe/disable_xxe_simplexml.phpt b/src/tests/xxe/disable_xxe_simplexml.phpt index 88396c0..35d79de 100644 --- a/src/tests/xxe/disable_xxe_simplexml.phpt +++ b/src/tests/xxe/disable_xxe_simplexml.phpt @@ -5,6 +5,8 @@ Disable XXE if (!extension_loaded("snuffleupagus")) echo "skip"; if (!extension_loaded("simplexml")) echo "skip"; ?> +--EXTENSIONS-- +xml --INI-- sp.configuration_file={PWD}/config/disable_xxe.ini --FILE-- diff --git a/src/tests/xxe/disable_xxe_simplexml_oop.phpt b/src/tests/xxe/disable_xxe_simplexml_oop.phpt index 43c4fbf..33c3bb5 100644 --- a/src/tests/xxe/disable_xxe_simplexml_oop.phpt +++ b/src/tests/xxe/disable_xxe_simplexml_oop.phpt @@ -5,6 +5,8 @@ Disable XXE if (!extension_loaded("snuffleupagus")) echo "skip"; if (!extension_loaded("simplexml")) echo "skip"; ?> +--EXTENSIONS-- +xml --INI-- sp.configuration_file={PWD}/config/disable_xxe.ini --FILE-- diff --git a/src/tests/xxe/disable_xxe_xml_parse.phpt b/src/tests/xxe/disable_xxe_xml_parse.phpt index ca77729..b6dec2d 100644 --- a/src/tests/xxe/disable_xxe_xml_parse.phpt +++ b/src/tests/xxe/disable_xxe_xml_parse.phpt @@ -8,6 +8,8 @@ Disable XXE in xml_parse echo "skip because the `xml` extension isn't loaded"; } ?> +--EXTENSIONS-- +xml --INI-- sp.configuration_file={PWD}/config/disable_xxe.ini --FILE-- -- cgit v1.3 From e8c97f3f16351b750c3395383269d6d206c7048d Mon Sep 17 00:00:00 2001 From: jvoisin Date: Thu, 14 May 2020 00:38:57 +0200 Subject: Fix the testsuite under php7.4 --- src/tests/xxe/disable_xxe_dom.phpt | 12 +++--------- src/tests/xxe/disable_xxe_dom_disabled.phpt | 9 +++------ src/tests/xxe/disable_xxe_simplexml.phpt | 9 +++------ src/tests/xxe/disable_xxe_simplexml_oop.phpt | 9 +++------ 4 files changed, 12 insertions(+), 27 deletions(-) diff --git a/src/tests/xxe/disable_xxe_dom.phpt b/src/tests/xxe/disable_xxe_dom.phpt index 2f45f66..58467f7 100644 --- a/src/tests/xxe/disable_xxe_dom.phpt +++ b/src/tests/xxe/disable_xxe_dom.phpt @@ -1,17 +1,11 @@ --TEST-- Disable XXE --SKIPIF-- - ---EXTENSIONS-- -dom + --INI-- sp.configuration_file={PWD}/config/disable_xxe.ini +--EXTENSIONS-- +dom --FILE-- ---extensions-- -dom + --INI-- sp.configuration_file={PWD}/config/disable_xxe_disable.ini +--EXTENSIONS-- +dom --FILE-- ---EXTENSIONS-- -xml + --INI-- sp.configuration_file={PWD}/config/disable_xxe.ini +--EXTENSIONS-- +simplexml --FILE-- ---EXTENSIONS-- -xml + --INI-- sp.configuration_file={PWD}/config/disable_xxe.ini +--EXTENSIONS-- +simplexml --FILE-- + --INI-- sp.configuration_file={PWD}/config/disable_xxe.ini --EXTENSIONS-- diff --git a/src/tests/xxe/disable_xxe_simplexml_oop.phpt b/src/tests/xxe/disable_xxe_simplexml_oop.phpt index e11e565..5f38889 100644 --- a/src/tests/xxe/disable_xxe_simplexml_oop.phpt +++ b/src/tests/xxe/disable_xxe_simplexml_oop.phpt @@ -1,7 +1,7 @@ --TEST-- Disable XXE --SKIPIF-- - + --INI-- sp.configuration_file={PWD}/config/disable_xxe.ini --EXTENSIONS-- -- cgit v1.3 From ddaa664cd349e841f483bdc344a8e655f3a8e96e Mon Sep 17 00:00:00 2001 From: jvoisin Date: Sun, 7 Jun 2020 19:42:51 +0200 Subject: Mark simplexml tests as broken --- src/tests/xxe/disable_xxe_simplexml.phpt | 1 + src/tests/xxe/disable_xxe_simplexml_oop.phpt | 1 + 2 files changed, 2 insertions(+) diff --git a/src/tests/xxe/disable_xxe_simplexml.phpt b/src/tests/xxe/disable_xxe_simplexml.phpt index 85be5b4..1d3ef4c 100644 --- a/src/tests/xxe/disable_xxe_simplexml.phpt +++ b/src/tests/xxe/disable_xxe_simplexml.phpt @@ -6,6 +6,7 @@ Disable XXE sp.configuration_file={PWD}/config/disable_xxe.ini --EXTENSIONS-- simplexml +--XFAIL-- --FILE-- --EXPECTF-- TEST -Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_super_global_var.php on line 3 +Fatal error: [snuffleupagus][0.0.0.0][disabled_function] Aborted execution on call of the function 'strtoupper' in %a/disabled_function_super_global_var.php on line 4 -- cgit v1.3 From c709d4f77869c7de84fb717723029bffaf3c3c0a Mon Sep 17 00:00:00 2001 From: jvoisin Date: Sun, 7 Jun 2020 20:16:56 +0200 Subject: Install php-xml on the ubuntu runner on gitlab --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 78d28b5..75aa17e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,7 +21,7 @@ testsuite:ubuntu: stage: testsuite script: - apt-get -qqy update - - DEBIAN_FRONTEND=noninteractive apt-get -qqy install --no-install-recommends php-dev gcc make libpcre3-dev php-cgi php-curl + - DEBIAN_FRONTEND=noninteractive apt-get -qqy install --no-install-recommends php-dev gcc make libpcre3-dev php-cgi php-curl php-xml - make debug testsuite:alpine: -- cgit v1.3 From e9ca6c39ac734e0e37f78405293e551d7f2863d0 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Thu, 1 Aug 2019 11:13:15 +0200 Subject: Lockdown of the logging directives This is done to prevent an attacker who obtained arbitrary code execution to mess with the logging configuration. --- config/default.rules | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/default.rules b/config/default.rules index 040a54b..05dd91d 100644 --- a/config/default.rules +++ b/config/default.rules @@ -138,3 +138,8 @@ sp.disable_function.function("curl_setopt").param("option").value("81").drop().a #File upload sp.disable_function.function("move_uploaded_file").param("destination").value_r("\\.ph").drop(); sp.disable_function.function("move_uploaded_file").param("destination").value_r("\\.ht").drop(); + +# Logging lockdown +sp.disable_function.function("ini_set").param("varname").value_r("error_log").drop() +sp.disable_function.function("ini_set").param("varname").value_r("error_reporting").drop() +sp.disable_function.function("ini_set").param("varname").value_r("display_errors").drop() -- cgit v1.3 From 47d25cea2b34f8dc214a8aa5f748c5efe6455b96 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Sun, 7 Jun 2020 21:20:57 +0200 Subject: Fix a link in the documentation Instead of linking to an intermediary page, link directly to the cookie's one. --- doc/source/features.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/features.rst b/doc/source/features.rst index 3f40120..0c23dc1 100644 --- a/doc/source/features.rst +++ b/doc/source/features.rst @@ -73,7 +73,7 @@ Like *Suhosin*, we are encrypting the cookies with a secret key, an environment variable (usually the IP of the user) and the user's user-agent. This means that an attacker with an XSS won't be able to use the stolen cookie, since he can't spoof the content of the value of the environment -variable for the user. Please do read the :ref:`documentation about this feature ` +variable for the user. Please do read the :ref:`documentation about this feature ` if you're planning to use it. This feature is roughly the same than the `Suhosin one `_. -- cgit v1.3 From 7f9602ebc23582195d63eb35f1de1961297f2e00 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Tue, 9 Jun 2020 19:38:26 +0200 Subject: Improve the documentation wrt. "modifiers" --- doc/source/config.rst | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/doc/source/config.rst b/doc/source/config.rst index 7691f89..91e085c 100644 --- a/doc/source/config.rst +++ b/doc/source/config.rst @@ -254,8 +254,11 @@ blacklisted, it'll be allowed. Virtual-patching ---------------- -Snuffleupagus provides virtual-patching via the ``disable_function`` directive, allowing you to stop or control dangerous behaviours. -In the situation where you have a call to ``system()`` that lacks proper user-input validation, this could cause issues as it would lead to an **RCE**. The virtual-patching would allow this to be prevented. +Snuffleupagus provides virtual-patching via the ``disable_function`` directive, +allowing you to stop or control dangerous behaviours. In the situation where +you have a call to ``system()`` that lacks proper user-input validation, this +could cause issues as it would lead to an **RCE**. The virtual-patching would +allow this to be prevented. :: @@ -305,8 +308,14 @@ The ``type`` must be one of the following values: Actions ^^^^^^^ +Every rule *must* have one action. + - ``allow()``: **allow** the request if the rule matches - ``drop()``: **drop** the request if the rule matches + +Modifications +^^^^^^^^^^^^^ + - ``dump(directory)``: dump the request in the ``directory`` if it matches the rule - ``simulation()``: enabled the simulation mode -- cgit v1.3