fix(scheduler): send environment to the process

Author: Matthew Fisher

controller/api/models.py

@@ -406,7 +406,7 @@ def _get_command(self):
             return ''
         try:
             # ensure they cannot break out and run commands on the host
-            return "bash -c '{}'".format(self.release.build.procfile[self.type])
+            return "env '{}'".format(self.release.build.procfile[self.type])
         # if the key is not present or if a parent attribute is None
         except (KeyError, TypeError):
             return 'start {}'.format(self.type)

controller/api/tests/test_container.py

@@ -461,9 +461,9 @@ def test_command_good(self):
                                      release=release,
                                      type='web',
                                      num=1)
-        self.assertEqual(c._command, "bash -c 'node server.js'")
+        self.assertEqual(c._command, "env 'node server.js'")
         c.type = 'worker'
-        self.assertEqual(c._command, "bash -c 'node worker.js'")
+        self.assertEqual(c._command, "env 'node worker.js'")
         c.release.build.procfile = None
         self.assertEqual(c._command, 'start worker')
         c.type = 'cmd'

tests/config_test.go

@@ -12,7 +12,7 @@ var (
 	configListCmd  = "config:list --app={{.AppName}}"
 	configSetCmd   = "config:set FOO=讲台 --app={{.AppName}}"
 	configSet2Cmd  = "config:set FOO=10 --app={{.AppName}}"
-	configSet3Cmd  = "config:set HELLO=\"from the Deis team\" --app={{.AppName}}"
+	configSet3Cmd  = "config:set POWERED_BY=\"the Deis team\" --app={{.AppName}}"
 	configUnsetCmd = "config:unset FOO --app={{.AppName}}"
 )
 
@@ -43,8 +43,9 @@ func configSetup(t *testing.T) *utils.DeisTestConfig {
 	utils.Execute(t, appsCreateCmd, cfg, false, "")
 	// ensure envvars with spaces work fine on `git push`
 	// https://github.com/deis/deis/issues/2477
-	utils.Execute(t, configSet3Cmd, cfg, false, "from the Deis team")
+	utils.Execute(t, configSet3Cmd, cfg, false, "the Deis team")
 	utils.Execute(t, gitPushCmd, cfg, false, "")
+	utils.CurlWithFail(t, cfg, false, "the Deis team")
 	if err := utils.Chdir(".."); err != nil {
 		t.Fatal(err)
 	}