PHP: fixed "rootfs" isolation dependency on system mounts.

1 files changed, 107 insertions, 55 deletions

diff --git a/src/nxt_php_sapi.c b/src/nxt_php_sapi.c
index d7e5b476..de329ad7 100644
--- a/src/nxt_php_sapi.c
+++ b/src/nxt_php_sapi.c
@@ -14,8 +14,6 @@
 #include <nxt_unit.h>
 #include <nxt_unit_request.h>
 
-#include NXT_PHP_MOUNTS_H
-
 
 #if PHP_VERSION_ID >= 50400
 #define NXT_HAVE_PHP_IGNORE_CWD 1
@@ -79,9 +77,13 @@ typedef void (*zif_handler)(INTERNAL_FUNCTION_PARAMETERS);
 #endif
 
 
+static nxt_int_t nxt_php_setup(nxt_task_t *task, nxt_process_t *process,
+    nxt_common_app_conf_t *conf);
 static nxt_int_t nxt_php_start(nxt_task_t *task, nxt_process_data_t *data);
 static nxt_int_t nxt_php_set_target(nxt_task_t *task, nxt_php_target_t *target,
     nxt_conf_value_t *conf);
+static nxt_int_t nxt_php_set_ini_path(nxt_task_t *task, nxt_str_t *path,
+    char *workdir);
 static void nxt_php_set_options(nxt_task_t *task, nxt_conf_value_t *options,
     int type);
 static nxt_int_t nxt_php_alter_option(nxt_str_t *name, nxt_str_t *value,
@@ -252,9 +254,9 @@ NXT_EXPORT nxt_app_module_t  nxt_app_module = {
     compat,
     nxt_string("php"),
     PHP_VERSION,
-    nxt_php_mounts,
-    nxt_nitems(nxt_php_mounts),
     NULL,
+    0,
+    nxt_php_setup,
     nxt_php_start,
 };
 
@@ -269,55 +271,20 @@ static void              ***tsrm_ls;
 
 
 static nxt_int_t
-nxt_php_start(nxt_task_t *task, nxt_process_data_t *data)
+nxt_php_setup(nxt_task_t *task, nxt_process_t *process,
+    nxt_common_app_conf_t *conf)
 {
-    u_char                 *p;
-    uint32_t               next;
-    nxt_str_t              ini_path, name;
-    nxt_int_t              ret;
-    nxt_uint_t             n;
-    nxt_unit_ctx_t         *unit_ctx;
-    nxt_unit_init_t        php_init;
-    nxt_conf_value_t       *value;
-    nxt_php_app_conf_t     *c;
-    nxt_common_app_conf_t  *conf;
+    nxt_str_t           ini_path;
+    nxt_int_t           ret;
+    nxt_conf_value_t    *value;
+    nxt_php_app_conf_t  *c;
 
     static nxt_str_t  file_str = nxt_string("file");
     static nxt_str_t  user_str = nxt_string("user");
     static nxt_str_t  admin_str = nxt_string("admin");
 
-    conf = data->app;
     c = &conf->u.php;
 
-    n = (c->targets != NULL) ? nxt_conf_object_members_count(c->targets) : 1;
-
-    nxt_php_targets = nxt_zalloc(sizeof(nxt_php_target_t) * n);
-    if (nxt_slow_path(nxt_php_targets == NULL)) {
-        return NXT_ERROR;
-    }
-
-    if (c->targets != NULL) {
-        next = 0;
-
-        for (n = 0; /* void */; n++) {
-            value = nxt_conf_next_object_member(c->targets, &name, &next);
-            if (value == NULL) {
-                break;
-            }
-
-            ret = nxt_php_set_target(task, &nxt_php_targets[n], value);
-            if (nxt_slow_path(ret != NXT_OK)) {
-                return NXT_ERROR;
-            }
-        }
-
-    } else {
-        ret = nxt_php_set_target(task, &nxt_php_targets[0], conf->self);
-        if (nxt_slow_path(ret != NXT_OK)) {
-            return NXT_ERROR;
-        }
-    }
-
 #ifdef ZTS
 
 #if PHP_VERSION_ID >= 70400
@@ -347,15 +314,12 @@ nxt_php_start(nxt_task_t *task, nxt_process_data_t *data)
         if (value != NULL) {
             nxt_conf_get_string(value, &ini_path);
 
-            p = nxt_malloc(ini_path.length + 1);
-            if (nxt_slow_path(p == NULL)) {
+            ret = nxt_php_set_ini_path(task, &ini_path,
+                                       conf->working_directory);
+
+            if (nxt_slow_path(ret != NXT_OK)) {
                 return NXT_ERROR;
             }
-
-            nxt_php_sapi_module.php_ini_path_override = (char *) p;
-
-            p = nxt_cpymem(p, ini_path.start, ini_path.length);
-            *p = '\0';
         }
     }
 
@@ -372,6 +336,55 @@ nxt_php_start(nxt_task_t *task, nxt_process_data_t *data)
         nxt_php_set_options(task, value, ZEND_INI_USER);
     }
 
+    return NXT_OK;
+}
+
+
+static nxt_int_t
+nxt_php_start(nxt_task_t *task, nxt_process_data_t *data)
+{
+    uint32_t               next;
+    nxt_int_t              ret;
+    nxt_str_t              name;
+    nxt_uint_t             n;
+    nxt_unit_ctx_t         *unit_ctx;
+    nxt_unit_init_t        php_init;
+    nxt_conf_value_t       *value;
+    nxt_php_app_conf_t     *c;
+    nxt_common_app_conf_t  *conf;
+
+    conf = data->app;
+    c = &conf->u.php;
+
+    n = (c->targets != NULL) ? nxt_conf_object_members_count(c->targets) : 1;
+
+    nxt_php_targets = nxt_zalloc(sizeof(nxt_php_target_t) * n);
+    if (nxt_slow_path(nxt_php_targets == NULL)) {
+        return NXT_ERROR;
+    }
+
+    if (c->targets != NULL) {
+        next = 0;
+
+        for (n = 0; /* void */; n++) {
+            value = nxt_conf_next_object_member(c->targets, &name, &next);
+            if (value == NULL) {
+                break;
+            }
+
+            ret = nxt_php_set_target(task, &nxt_php_targets[n], value);
+            if (nxt_slow_path(ret != NXT_OK)) {
+                return NXT_ERROR;
+            }
+        }
+
+    } else {
+        ret = nxt_php_set_target(task, &nxt_php_targets[0], conf->self);
+        if (nxt_slow_path(ret != NXT_OK)) {
+            return NXT_ERROR;
+        }
+    }
+
     ret = nxt_unit_default_init(task, &php_init);
     if (nxt_slow_path(ret != NXT_OK)) {
         nxt_alert(task, "nxt_unit_default_init() failed");
@@ -388,9 +401,8 @@ nxt_php_start(nxt_task_t *task, nxt_process_data_t *data)
 
     nxt_php_unit_ctx = unit_ctx;
 
-    nxt_unit_run(unit_ctx);
-
-    nxt_unit_done(unit_ctx);
+    nxt_unit_run(nxt_php_unit_ctx);
+    nxt_unit_done(nxt_php_unit_ctx);
 
     exit(0);
 
@@ -512,6 +524,46 @@ nxt_php_set_target(nxt_task_t *task, nxt_php_target_t *target,
 }
 
 
+static nxt_int_t
+nxt_php_set_ini_path(nxt_task_t *task, nxt_str_t *ini_path, char *workdir)
+{
+    size_t  wdlen;
+    u_char  *p, *start;
+
+    if (ini_path->start[0] == '/' || workdir == NULL) {
+        p = nxt_malloc(ini_path->length + 1);
+        if (nxt_slow_path(p == NULL)) {
+            return NXT_ERROR;
+        }
+
+        start = p;
+
+    } else {
+        wdlen = nxt_strlen(workdir);
+
+        p = nxt_malloc(wdlen + ini_path->length + 2);
+        if (nxt_slow_path(p == NULL)) {
+            return NXT_ERROR;
+        }
+
+        start = p;
+
+        p = nxt_cpymem(p, workdir, wdlen);
+
+        if (workdir[wdlen - 1] != '/') {
+            *p++ = '/';
+        }
+    }
+
+    p = nxt_cpymem(p, ini_path->start, ini_path->length);
+    *p = '\0';
+
+    nxt_php_sapi_module.php_ini_path_override = (char *) start;
+
+    return NXT_OK;
+}
+
+
 static void
 nxt_php_set_options(nxt_task_t *task, nxt_conf_value_t *options, int type)
 {