respect plugin manifest webapp bundle_path (#8393)

2 files changed, 22 insertions, 4 deletions

diff --git a/model/manifest.go b/model/manifest.go
index 5ba4854b6..2b415dc62 100644
--- a/model/manifest.go
+++ b/model/manifest.go
@@ -173,6 +173,11 @@ func (m *Manifest) ClientManifest() *Manifest {
 	cm.Name = ""
 	cm.Description = ""
 	cm.Backend = nil
+	if cm.Webapp != nil {
+		cm.Webapp = new(ManifestWebapp)
+		*cm.Webapp = *m.Webapp
+		cm.Webapp.BundlePath = "/static/" + m.Id + "_bundle.js"
+	}
 	return cm
 }
 
diff --git a/plugin/pluginenv/environment.go b/plugin/pluginenv/environment.go
index f53021f74..adc9ddbde 100644
--- a/plugin/pluginenv/environment.go
+++ b/plugin/pluginenv/environment.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
+	"path/filepath"
 	"sync"
 
 	"github.com/pkg/errors"
@@ -163,12 +164,24 @@ func (env *Environment) ActivatePlugin(id string) error {
 			return fmt.Errorf("env missing webapp path, cannot activate plugin: %v", id)
 		}
 
-		webappBundle, err := ioutil.ReadFile(fmt.Sprintf("%s/%s/webapp/%s_bundle.js", env.searchPath, id, id))
+		bundlePath := filepath.Clean(bundle.Manifest.Webapp.BundlePath)
+		if bundlePath == "" || bundlePath[0] == '.' {
+			return fmt.Errorf("invalid webapp bundle path")
+		}
+		bundlePath = filepath.Join(env.searchPath, id, bundlePath)
+
+		webappBundle, err := ioutil.ReadFile(bundlePath)
 		if err != nil {
-			if supervisor != nil {
-				supervisor.Stop()
+			// Backwards compatibility for plugins where webapp.bundle_path was ignored. This should
+			// be removed eventually.
+			if webappBundle2, err2 := ioutil.ReadFile(fmt.Sprintf("%s/%s/webapp/%s_bundle.js", env.searchPath, id, id)); err2 == nil {
+				webappBundle = webappBundle2
+			} else {
+				if supervisor != nil {
+					supervisor.Stop()
+				}
+				return errors.Wrapf(err, "unable to read webapp bundle: %v", id)
 			}
-			return errors.Wrapf(err, "unable to read webapp bundle: %v", id)
 		}
 
 		err = ioutil.WriteFile(fmt.Sprintf("%s/%s_bundle.js", env.webappPath, id), webappBundle, 0644)