From d1df1837a4844a6e89dc3d96214d2d97ae04b143 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Mon, 9 Oct 2017 15:52:24 +0300
Subject: [PATCH] MXS-1464 When pre-parsing, only check maxscale section

When pre-parsing the configuration file, the existence of environment
variables is only done for the [maxscale] section. For other sections
a nicer error message is obtained if the comlplaint is made when the
configuration file is actually loaded.

Mechanism for providing custom error message from the pre-parsing
function added.
---
 server/core/config.cc  |  2 +-
 server/core/gateway.cc | 74 +++++++++++++++++++++++++++---------------
 2 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/server/core/config.cc b/server/core/config.cc
index a10ab4161..d23515170 100644
--- a/server/core/config.cc
+++ b/server/core/config.cc
@@ -472,7 +472,7 @@ static int ini_handler(void *userdata, const char *section, const char *name, co
             if (!env_value)
             {
                 MXS_ERROR("The environment variable %s, used as value for parameter %s "
-                          "in section %s, does not exist.", value, name, section);
+                          "in section %s, does not exist.", value + 1, name, section);
                 return 0;
             }
 
diff --git a/server/core/gateway.cc b/server/core/gateway.cc
index c5a2c2900..a7d43b9ef 100644
--- a/server/core/gateway.cc
+++ b/server/core/gateway.cc
@@ -2608,38 +2608,47 @@ void set_log_augmentation(const char* value)
 
 /**
  * Pre-parse the configuration file for various directory paths.
- * @param data Parameter passed by inih
+ * @param data    Pointer to variable where custom dynamically allocated
+ *                error message can be stored.
  * @param section Section name
- * @param name Parameter name
- * @param value Parameter value
+ * @param name    Parameter name
+ * @param value   Parameter value
  * @return 0 on error, 1 when successful
  */
 static int cnf_preparser(void* data, const char* section, const char* name, const char* value)
 {
     MXS_CONFIG* cnf = config_get_global_options();
 
-    if (cnf->substitute_variables)
-    {
-        if (*value == '$')
-        {
-            char* env_value = getenv(value + 1);
-
-            if (!env_value)
-            {
-                MXS_ERROR("The environment variable %s, used as value for parameter %s "
-                          "in section %s, does not exist.", value, name, section);
-                return 0;
-            }
-
-            value = env_value;
-        }
-    }
-
     char *tmp;
     /** These are read from the configuration file. These will not override
      * command line parameters but will override default values. */
     if (strcasecmp(section, "maxscale") == 0)
     {
+        if (cnf->substitute_variables)
+        {
+            if (*value == '$')
+            {
+                char* env_value = getenv(value + 1);
+
+                if (!env_value)
+                {
+                    char** s = (char**)data;
+
+                    static const char FORMAT[] = "The environment variable %s does not exist.";
+                    *s = (char*)MXS_MALLOC(sizeof(FORMAT) + strlen(value));
+
+                    if (*s)
+                    {
+                        sprintf(*s, FORMAT, value + 1);
+                    }
+
+                    return 0;
+                }
+
+                value = env_value;
+            }
+        }
+
         if (strcmp(name, "logdir") == 0)
         {
             if (strcmp(get_logdir(), default_logdir) == 0)
@@ -2981,23 +2990,36 @@ static bool daemonize(void)
  */
 static bool sniff_configuration(const char* filepath)
 {
-    int rv = ini_parse(filepath, cnf_preparser, NULL);
+    char* s = NULL;
+
+    int rv = ini_parse(filepath, cnf_preparser, &s);
 
     if (rv != 0)
     {
+        const char FORMAT_CUSTOM[] =
+            "Failed to pre-parse configuration file %s. Error on line %d. %s";
         const char FORMAT_SYNTAX[] =
-            "Error: Failed to pre-parse configuration file %s. Error on line %d.";
+            "Failed to pre-parse configuration file %s. Error on line %d.";
         const char FORMAT_OPEN[] =
-            "Error: Failed to pre-parse configuration file %s. Failed to open file.";
+            "Failed to pre-parse configuration file %s. Failed to open file.";
         const char FORMAT_MALLOC[] =
-            "Error: Failed to pre-parse configuration file %s. Memory allocation failed.";
+            "Failed to pre-parse configuration file %s. Memory allocation failed.";
 
+        size_t extra = strlen(filepath) + UINTLEN(abs(rv)) + (s ? strlen(s) : 0);
         // We just use the largest one.
-        char errorbuffer[sizeof(FORMAT_MALLOC) + strlen(filepath) + UINTLEN(abs(rv))];
+        char errorbuffer[sizeof(FORMAT_MALLOC) + extra];
 
         if (rv > 0)
         {
-            snprintf(errorbuffer, sizeof(errorbuffer), FORMAT_SYNTAX, filepath, rv);
+            if (s)
+            {
+                snprintf(errorbuffer, sizeof(errorbuffer), FORMAT_CUSTOM, filepath, rv, s);
+                MXS_FREE(s);
+            }
+            else
+            {
+                snprintf(errorbuffer, sizeof(errorbuffer), FORMAT_SYNTAX, filepath, rv);
+            }
         }
         else if (rv == -1)
         {