Merge pull request #2673 from bacongobbler/no-bash-wrapping

fix(controller): revert to `start proctype` for buildpack images

Author: Matthew Fisher

api/models.py

@@ -407,8 +407,13 @@ def _get_command(self):
         if self.type == 'cmd':
             return ''
         try:
-            # ensure they cannot break out and run commands on the host
-            return "bash -c '{}'".format(self.release.build.procfile[self.type])
+            # if this is not procfile-based app, ensure they cannot break out
+            # and run arbitrary commands on the host
+            # FIXME: remove slugrunner's hardcoded entrypoint
+            if self.release.build.dockerfile or not self.release.build.sha:
+                return "bash -c '{}'".format(self.release.build.procfile[self.type])
+            else:
+                return 'start {}'.format(self.type)
         # if the key is not present or if a parent attribute is None
         except (KeyError, TypeError):
             return 'start {}'.format(self.type)

api/tests/test_container.py

@@ -456,11 +456,14 @@ def test_command_good(self):
         app_id = response.data['id']
         app = App.objects.get(id=app_id)
         user = User.objects.get(username='autotest')
+        # Heroku Buildpack app
         build = Build.objects.create(owner=user,
                                      app=app,
                                      image="qwerty",
                                      procfile={'web': 'node server.js',
-                                               'worker': 'node worker.js'})
+                                               'worker': 'node worker.js'},
+                                     sha='african-swallow',
+                                     dockerfile='')
         # create an initial release
         release = Release.objects.create(version=2,
                                          owner=user,
@@ -473,10 +476,22 @@ def test_command_good(self):
                                      release=release,
                                      type='web',
                                      num=1)
+        # use `start web` for backwards compatibility with slugrunner
+        self.assertEqual(c._command, 'start web')
+        c.type = 'worker'
+        self.assertEqual(c._command, 'start worker')
+        # switch to docker image app
+        build.sha = None
+        c.type = 'web'
+        self.assertEqual(c._command, "bash -c 'node server.js'")
+        # switch to dockerfile app
+        build.sha = 'european-swallow'
+        build.dockerfile = 'dockerdockerdocker'
         self.assertEqual(c._command, "bash -c 'node server.js'")
         c.type = 'worker'
         self.assertEqual(c._command, "bash -c 'node worker.js'")
         c.release.build.procfile = None
+        # for backwards compatibility if no Procfile is supplied
         self.assertEqual(c._command, 'start worker')
         c.type = 'cmd'
         self.assertEqual(c._command, '')