Change how we're handling invalid configurations

Since our configuration format is a bit more complex than php's one, we have a `sp.allow_broken_configuration` parameter (`false` by default), that you can set to `true` if you want PHP to carry on if your Snuffleupagus' configuration contains syntax errors. You'll still get a big scary message in your logs of course. We do **not** recommend to use it of course, but sometimes it might be useful to be able to "debug in production" without breaking your website.
jvoisin · Aug 30, 2018 · b3f67a1 · b3f67a1
1 parent f61a477
commit b3f67a1
Show file tree

Hide file tree

Showing 82 changed files with 315 additions and 97 deletions.
diff --git a/doc/source/config.rst b/doc/source/config.rst
@@ -50,6 +50,14 @@ To sum up, you should put this in your ``php.ini``:
 
 And the **snuffleupagus rules** into the ``.rules`` files.
 
+Since our configuration format is a bit more complex than php's one,
+we have a ``sp.allow_broken_configuration`` parameter (``false`` by default),
+that you can set to ``true`` if you want PHP to carry on if your Snuffleupagus'
+configuration contains syntax errors. You'll still get a big scary message in
+your logs of course. We do **not** recommend to use it of course, but sometimes
+it might be useful to be able to "debug in production" without breaking your
+website.
+
 Miscellaneous
 -------------
 
@@ -70,6 +78,7 @@ 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 <config_cookie-encryption>`
 
+
 Bugclass-killer features
 ------------------------
 

diff --git a/src/php_snuffleupagus.h b/src/php_snuffleupagus.h
@@ -65,6 +65,7 @@ ZEND_BEGIN_MODULE_GLOBALS(snuffleupagus)
 size_t in_eval;
 sp_config config;
 bool is_config_valid;
+bool allow_broken_configuration;
 HashTable *disabled_functions_hook;
 HashTable *sp_internal_functions_hook;
 HashTable *sp_eval_blacklist_functions_hook;

diff --git a/src/snuffleupagus.c b/src/snuffleupagus.c
@@ -34,9 +34,21 @@ static inline void sp_op_array_handler(zend_op_array *op) {
 
 ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus)
 
+static PHP_INI_MH(StrictMode) {
+  TSRMLS_FETCH();
+
+  SNUFFLEUPAGUS_G(allow_broken_configuration) = false;
+  if (new_value && zend_string_equals_literal(new_value, "1")) {
+    SNUFFLEUPAGUS_G(allow_broken_configuration) = true;
+  }
+  return SUCCESS;
+}
+
 PHP_INI_BEGIN()
 PHP_INI_ENTRY("sp.configuration_file", "", PHP_INI_SYSTEM,
               OnUpdateConfiguration)
+PHP_INI_ENTRY("sp.allow_broken_configuration", "0", PHP_INI_SYSTEM,
+              StrictMode)
 PHP_INI_END()
 
 void free_disabled_functions_hashtable(HashTable *ht) {
@@ -181,6 +193,10 @@ PHP_RINIT_FUNCTION(snuffleupagus) {
   ZEND_TSRMLS_CACHE_UPDATE();
 #endif
 
+  if (!SNUFFLEUPAGUS_G(allow_broken_configuration) && !SNUFFLEUPAGUS_G(is_config_valid)) {
+    sp_log_err("config", "Invalid configuration file");
+  }
+
   // We need to disable wrappers loaded by extensions loaded after SNUFFLEUPAGUS.
   if (SNUFFLEUPAGUS_G(config).config_wrapper->enabled &&
       zend_hash_num_elements(php_stream_get_url_stream_wrappers_hash()) !=

diff --git a/src/tests/broken_conf.phpt b/src/tests/broken_conf.phpt
@@ -8,4 +8,7 @@ sp.configuration_file={PWD}/config/broken_conf.ini
 --EXPECT--
 PHP Fatal error:  [snuffleupagus][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][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
+Could not startup.
diff --git a/src/tests/broken_conf2.phpt b/src/tests/broken_conf2.phpt
@@ -8,4 +8,7 @@ sp.configuration_file={PWD}/config/broken_conf2.ini
 --EXPECT--
 PHP Fatal error:  [snuffleupagus][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][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
+Could not startup.
diff --git a/src/tests/broken_conf_allow_broken_disabled.phpt b/src/tests/broken_conf_allow_broken_disabled.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Broken configuration with allow broken turned off
+--SKIPIF--
+<?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
+--INI--
+sp.configuration_file={PWD}/config/broken_conf.ini
+sp.allow_broken_configuration=Off
+--FILE--
+<?php
+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
+
+Fatal error: [snuffleupagus][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
+Could not startup.
diff --git a/src/tests/broken_conf_allow_broken_enabled.phpt b/src/tests/broken_conf_allow_broken_enabled.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Broken configuration with allow broken turned on
+--SKIPIF--
+<?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
+--INI--
+sp.configuration_file={PWD}/config/broken_conf.ini
+sp.allow_broken_configuration=On
+--FILE--
+<?php
+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
+
+Fatal error: [snuffleupagus][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_conf_config_regexp.phpt b/src/tests/broken_conf_config_regexp.phpt
@@ -12,3 +12,6 @@ PHP Fatal error:  [snuffleupagus][config] '.filename_r()' is expecting a valid r
 Fatal error: [snuffleupagus][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][config] Invalid configuration file in Unknown on line 0
+Could not startup.
diff --git a/src/tests/broken_conf_config_regexp_no_closing_paren.phpt b/src/tests/broken_conf_config_regexp_no_closing_paren.phpt
@@ -11,4 +11,7 @@ PHP Fatal error:  [snuffleupagus][config] '.filename_r()' is expecting a valid r
 
 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][config] '.filename_r()' is expecting a valid regexp, and not '"*."' 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][config] Invalid configuration file in Unknown on line 0
+Could not startup.
diff --git a/src/tests/broken_conf_cookie_name_and_regexp.phpt b/src/tests/broken_conf_cookie_name_and_regexp.phpt
@@ -8,4 +8,7 @@ sp.configuration_file={PWD}/config/broken_conf_cookie_name_and_regexp.ini
 --EXPECT--
 PHP Fatal error:  [snuffleupagus][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][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
+Could not startup.
diff --git a/src/tests/broken_conf_enable_disable.phpt b/src/tests/broken_conf_enable_disable.phpt
@@ -8,4 +8,7 @@ sp.configuration_file={PWD}/config/borken_conf_enable_disable.ini
 --EXPECTF--
 PHP Fatal error:  [snuffleupagus][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][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
+Could not startup.
diff --git a/src/tests/broken_conf_eval.phpt b/src/tests/broken_conf_eval.phpt
@@ -8,4 +8,7 @@ sp.configuration_file={PWD}/config/broken_conf_eval.ini
 --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
 
-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][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
+Could not startup.
diff --git a/src/tests/broken_conf_expecting_bool.phpt b/src/tests/broken_conf_expecting_bool.phpt
@@ -8,4 +8,7 @@ sp.configuration_file={PWD}/config/broken_conf_expecting_bool.ini
 --EXPECT--
 PHP Fatal error:  [snuffleupagus][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][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
+Could not startup.
diff --git a/src/tests/broken_conf_invalid_cidr.phpt b/src/tests/broken_conf_invalid_cidr.phpt
@@ -8,4 +8,7 @@ sp.configuration_file={PWD}/config/broken_conf_invalid_cidr.ini
 --EXPECT--
 PHP Fatal error:  [snuffleupagus][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][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
+Could not startup.
diff --git a/src/tests/broken_conf_invalid_cidr6.phpt b/src/tests/broken_conf_invalid_cidr6.phpt
@@ -8,4 +8,7 @@ sp.configuration_file={PWD}/config/broken_conf_invalid_cidr6.ini
 --EXPECT--
 PHP Fatal error:  [snuffleupagus][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][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
+Could not startup.
diff --git a/src/tests/broken_conf_invalid_cidr6_no_slash.phpt b/src/tests/broken_conf_invalid_cidr6_no_slash.phpt
@@ -8,4 +8,7 @@ sp.configuration_file={PWD}/config/broken_conf_invalid_cidr6_no_slash.ini
 --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
 
-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][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
+Could not startup.
diff --git a/src/tests/broken_conf_invalid_cidr_value.phpt b/src/tests/broken_conf_invalid_cidr_value.phpt
@@ -12,4 +12,7 @@ PHP Fatal error:  [snuffleupagus][config] " doesn't contain a valid cidr on line
 
 Fatal error: [snuffleupagus][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][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
+Could not startup.
diff --git a/src/tests/broken_conf_invalid_filename.phpt b/src/tests/broken_conf_invalid_filename.phpt
@@ -8,4 +8,7 @@ sp.configuration_file={PWD}/config/broken_conf_invalid_filename.ini
 --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
 
-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][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
+Could not startup.
diff --git a/src/tests/broken_conf_invalid_type.phpt b/src/tests/broken_conf_invalid_type.phpt
@@ -8,4 +8,7 @@ sp.configuration_file={PWD}/config/broken_conf_invalid_type.ini
 --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
 
-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][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
+Could not startup.
diff --git a/src/tests/broken_conf_key_value.phpt b/src/tests/broken_conf_key_value.phpt
@@ -8,4 +8,7 @@ sp.configuration_file={PWD}/config/broken_conf_key_value.ini
 --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
 
-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][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
+Could not startup.
diff --git a/src/tests/broken_conf_line_empty_string.phpt b/src/tests/broken_conf_line_empty_string.phpt
@@ -8,4 +8,7 @@ sp.configuration_file={PWD}/config/broken_conf_line_empty_string.ini
 --EXPECT--
 PHP Fatal error:  [snuffleupagus][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][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
+Could not startup.
diff --git a/src/tests/broken_conf_line_no_closing.phpt b/src/tests/broken_conf_line_no_closing.phpt
@@ -8,4 +8,7 @@ sp.configuration_file={PWD}/config/broken_conf_line_no_closing.ini
 --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
 
-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][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
+Could not startup.
diff --git a/src/tests/broken_conf_local_var_1.phpt b/src/tests/broken_conf_local_var_1.phpt
@@ -11,4 +11,7 @@ PHP Fatal error:  [snuffleupagus][config] Invalid value ']' for `var` on line 1
 
 Fatal error: [snuffleupagus][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][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
+Could not startup.
diff --git a/src/tests/broken_conf_local_var_10.phpt b/src/tests/broken_conf_local_var_10.phpt
@@ -11,4 +11,7 @@ PHP Fatal error:  [snuffleupagus][config] Invalid value 'asd[asd]asd' for `var`
 
 Fatal error: [snuffleupagus][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][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
+Could not startup.
diff --git a/src/tests/broken_conf_local_var_11.phpt b/src/tests/broken_conf_local_var_11.phpt
@@ -11,4 +11,7 @@ PHP Fatal error:  [snuffleupagus][config] Invalid value 'asd::' for `param` on l
 
 Fatal error: [snuffleupagus][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][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
+Could not startup.
diff --git a/src/tests/broken_conf_local_var_12.phpt b/src/tests/broken_conf_local_var_12.phpt
@@ -8,4 +8,7 @@ sp.configuration_file={PWD}/config/broken_conf_local_var_12.ini
 --EXPECT--
 PHP Fatal error:  [snuffleupagus][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][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
+Could not startup.
diff --git a/src/tests/broken_conf_local_var_13.phpt b/src/tests/broken_conf_local_var_13.phpt
@@ -11,4 +11,7 @@ PHP Fatal error:  [snuffleupagus][config] Invalid value 'asd->asd' for `var` on
 
 Fatal error: [snuffleupagus][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][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
+Could not startup.
diff --git a/src/tests/broken_conf_local_var_14.phpt b/src/tests/broken_conf_local_var_14.phpt
@@ -11,4 +11,7 @@ PHP Fatal error:  [snuffleupagus][config] Invalid value '$i+valid var name ' for
 
 Fatal error: [snuffleupagus][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][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
+Could not startup.
diff --git a/src/tests/broken_conf_local_var_15.phpt b/src/tests/broken_conf_local_var_15.phpt
@@ -11,4 +11,7 @@ PHP Fatal error:  [snuffleupagus][config] Invalid value '$i$$!@#->qwe' for `var`
 
 Fatal error: [snuffleupagus][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][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
+Could not startup.
diff --git a/src/tests/broken_conf_local_var_16.phpt b/src/tests/broken_conf_local_var_16.phpt
@@ -11,4 +11,7 @@ PHP Fatal error:  [snuffleupagus][config] Invalid value '"' for `var` on line 1
 
 Fatal error: [snuffleupagus][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][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
+Could not startup.
diff --git a/src/tests/broken_conf_local_var_2.phpt b/src/tests/broken_conf_local_var_2.phpt
@@ -11,4 +11,7 @@ PHP Fatal error:  [snuffleupagus][config] Invalid value '""asd' for `var` on lin
 
 Fatal error: [snuffleupagus][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][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
+Could not startup.
diff --git a/src/tests/broken_conf_local_var_3.phpt b/src/tests/broken_conf_local_var_3.phpt
@@ -11,4 +11,7 @@ PHP Fatal error:  [snuffleupagus][config] Invalid value '$qwe->::' for `var` on
 
 Fatal error: [snuffleupagus][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][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
+Could not startup.