Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2024-10-27 20:44:07 +00:00
Code Issues Projects Releases Wiki Activity

(core) move some untagged assets served on plugin port

Browse Source 
Summary: Some untagged assets on the plugin port could be a problem if that port is merged with the regular Grist app port, so we nest them within a non-conflicting path (/plugins/assets).

Test Plan: see if a test fails anywhere

Reviewers: georgegevoian

Reviewed By: georgegevoian

Differential Revision: https://phab.getgrist.com/D4116
This commit is contained in:
Paul Fitzpatrick 2023-11-14 14:14:08 -05:00
parent 5197891427
commit 12317097f7
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/server/lib/FlexServer.ts
View File

@ -596,14 +596,19 @@ export class FlexServer implements GristServer {
// Plugin operation relies currently on grist-plugin-api.js being available, // Plugin operation relies currently on grist-plugin-api.js being available,
// and with Grist's static assets to be also available on the untrusted // and with Grist's static assets to be also available on the untrusted
// host. The assets should be available without version tags. // host. The assets should be available without version tags, but not
// at the root level - we nest them in /plugins/assets.
public async addAssetsForPlugins() { public async addAssetsForPlugins() {
if (this._check('pluginUntaggedAssets', 'dir')) { return; } if (this._check('pluginUntaggedAssets', 'dir')) { return; }
this.app.use(/^\/(grist-plugin-api.js)$/, expressWrap(async (req, res) => this.app.use(/^\/(grist-plugin-api.js)$/, expressWrap(async (req, res) =>
res.sendFile(req.params[0], {root: getAppPathTo(this.appRoot, 'static')}))); res.sendFile(req.params[0], {root: getAppPathTo(this.appRoot, 'static')})));
// Plugins get access to static resources without a tag // Plugins get access to static resources without a tag
this.app.use(limitToPlugins(this, express.static(getAppPathTo(this.appRoot, 'static')))); this.app.use(
this.app.use(limitToPlugins(this, express.static(getAppPathTo(this.appRoot, 'bower_components')))); '/plugins/assets',
limitToPlugins(this, express.static(getAppPathTo(this.appRoot, 'static'))));
this.app.use(
'/plugins/assets',
limitToPlugins(this, express.static(getAppPathTo(this.appRoot, 'bower_components'))));
// Serve custom-widget.html message for anyone. // Serve custom-widget.html message for anyone.
this.app.use(/^\/(custom-widget.html)$/, expressWrap(async (req, res) => this.app.use(/^\/(custom-widget.html)$/, expressWrap(async (req, res) =>
res.sendFile(req.params[0], {root: getAppPathTo(this.appRoot, 'static')}))); res.sendFile(req.params[0], {root: getAppPathTo(this.appRoot, 'static')})));

2
test/fixtures/plugins/browserInstalledPlugins/plugins/custom-section/test-subscribe-api.html vendored
View File

@ -1,7 +1,7 @@
<html> <html>
<head> <head>
<script src="/grist-plugin-api.js"></script> <script src="/grist-plugin-api.js"></script>
<script src="/jquery/dist/jquery.min.js"></script> <script src="/plugins/assets/jquery/dist/jquery.min.js"></script>
<script src="test-subscribe-api.js"></script> <script src="test-subscribe-api.js"></script>
</head> </head>
<body> <body>

2
test/fixtures/plugins/browserInstalledPlugins/plugins/dummy-importer/index.html vendored
View File

@ -3,7 +3,7 @@
<script src="/grist-plugin-api.js"></script> <script src="/grist-plugin-api.js"></script>
<script src="script.js"></script> <script src="script.js"></script>
<!-- jquery is required for running browser test (see: `test/browser/webdriverjq.js`) --> <!-- jquery is required for running browser test (see: `test/browser/webdriverjq.js`) -->
<script src="/jquery/dist/jquery.min.js"></script> <script src="/plugins/assets/jquery/dist/jquery.min.js"></script>
<style type="text/css"> <style type="text/css">
body { body {
background-color: #ffffffb0; background-color: #ffffffb0;