@steedos/service-pages 3.0.15-beta.51 → 3.0.15-beta.52

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -22,6 +22,8 @@ waitForThing(window, 'Builder').then(()=>{
22
22
 
23
23
  - STEEDOS_PUBLIC_PAGE_ASSETURLS: 资产包的url地址,多个用逗号分隔.如果未配置,则不加载
24
24
 
25
+ - STEEDOS_PAGE_ASSETURLS_WHITELIST: 页面渲染、设计器等接口中 url 参数 `assetUrls` 允许加载的资产包地址白名单,多个用逗号分隔.可以只写域名(如 `https://cdn.example.com`,该域名下都允许),也可以带路径(如 `https://cdn.example.com/assets/`,该路径下允许).`STEEDOS_PUBLIC_PAGE_ASSETURLS` 中的地址始终允许,不在白名单中的地址会被忽略.如果未配置,则不限制
26
+
25
27
  - STEEDOS_PUBLIC_PAGE_UNPKGURL: unpkg cdn配置, 默认为 https://npm.elemecdn.com
26
28
 
27
29
  ## 自定义渲染器
@@ -141,7 +141,7 @@
141
141
  schema.data.context.tenantId = tenantId;
142
142
  schema.data.context.userId = userId;
143
143
  schema.data.context.authToken = authToken;
144
- schema.data.context.user = <%- JSON.stringify(userSession) %>;
144
+ schema.data.context.user = <%- JSON.stringify(userSession).replace(/</g, "\\u003c") %>;
145
145
 
146
146
  if (objectName && pageType === "record") {
147
147
  const record = await axios.get(
@@ -7,6 +7,7 @@ const express = require('express');
7
7
  const router = express.Router();
8
8
  const auth = require('@steedos/auth');
9
9
  const ejs = require('ejs');
10
+ const { filterAssetUrls } = require("@steedos/utils");
10
11
  const fs = require('fs');
11
12
  const _ = require('lodash');
12
13
  const objectql = require('@steedos/objectql');
@@ -16,7 +17,7 @@ router.get('/api/pageDesign', auth.requireAuthentication, async function (req, r
16
17
  try {
17
18
  res.set('Content-Type', 'text/html');
18
19
  const userSession = req.user;
19
- let assetUrls = req.query.assetUrls;
20
+ let assetUrls = filterAssetUrls(req.query.assetUrls);
20
21
  const assetUrl = `assetUrl=${assetUrls.split(',').join("&assetUrl=")}&`;
21
22
 
22
23
  // const dataContext = {
@@ -9,6 +9,7 @@
9
9
  const express = require('express');
10
10
  const router = express.Router();
11
11
  const ejs = require('ejs');
12
+ const { filterAssetUrls, isAssetUrlsWhitelistEnabled } = require("@steedos/utils");
12
13
 
13
14
  router.get('/api/page/render', async function (req, res) {
14
15
  try {
@@ -23,7 +24,7 @@ router.get('/api/page/render', async function (req, res) {
23
24
  }
24
25
  }
25
26
 
26
- let assetUrls = req.query.assetUrls;
27
+ let assetUrls = filterAssetUrls(req.query.assetUrls);
27
28
 
28
29
  let locale = "zh-CN";
29
30
  if (req.query.locale == "en-us") {
@@ -47,6 +48,7 @@ router.get('/api/page/render', async function (req, res) {
47
48
  STEEDOS_UNPKG_URL: process.env.STEEDOS_UNPKG_URL,
48
49
  STEEDOS_AMIS_URL: process.env.STEEDOS_AMIS_URL,
49
50
  STEEDOS_PUBLIC_PAGE_ASSETURLS: assetUrls || process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS,
51
+ ASSET_URLS_WHITELIST_ENABLED: isAssetUrlsWhitelistEnabled(),
50
52
  NODE_ENV: process.env.NODE_ENV,
51
53
  ROOT_URL: process.env.ROOT_URL,
52
54
  STEEDOS_VERSION: process.env.STEEDOS_VERSION,
@@ -100,7 +100,12 @@
100
100
 
101
101
  let searchParams = new URLSearchParams(location.search);
102
102
  if (searchParams.get('assetUrls')) {
103
+ <%_ if (locals.ASSET_URLS_WHITELIST_ENABLED) { _%>
104
+ // 配置了资产包白名单时,只保存服务端过滤后的地址
105
+ sessionStorage.setItem('assetUrls', <%- JSON.stringify(STEEDOS_PUBLIC_PAGE_ASSETURLS || "").replace(/</g, "\\u003c") %>)
106
+ <%_ } else { _%>
103
107
  sessionStorage.setItem('assetUrls', searchParams.get('assetUrls'))
108
+ <%_ } _%>
104
109
  }
105
110
 
106
111
  let assetUrls = "<%=STEEDOS_PUBLIC_PAGE_ASSETURLS%>"
@@ -130,7 +135,7 @@
130
135
  steedosAmisVersion: "<%=STEEDOS_AMIS_VERSION%>",
131
136
  locale: "<%=STEEDOS_LOCALE%>" || getBrowserLocale(),
132
137
  useOpenAPI: STEEDOS_PUBLIC_USE_OPEN_API,
133
- context: <%- JSON.stringify(USER_CONTEXT) %>
138
+ context: <%- JSON.stringify(USER_CONTEXT).replace(/</g, "\\u003c") %>
134
139
  });
135
140
 
136
141
  window.axios = amisRequire('axios');
@@ -181,12 +186,12 @@
181
186
  const page = {
182
187
  render_engine: 'amis',
183
188
  name: "<%=pageApiName%>",
184
- schema: <%- JSON.stringify(pageSchema) %> || {}
189
+ schema: <%- (JSON.stringify(pageSchema) || "null").replace(/</g, "\\u003c") %> || {}
185
190
  }
186
191
 
187
192
  const container = $(".page-template-root")[0];
188
193
 
189
- const queryData = <%- JSON.stringify(locals.queryData || {}) %>;
194
+ const queryData = <%- JSON.stringify(locals.queryData || {}).replace(/</g, "\\u003c") %>;
190
195
 
191
196
  Steedos.Page.render(container, page, Object.assign({}, {
192
197
  appId: appId,
@@ -7,6 +7,7 @@ const express = require('express');
7
7
  const router = express.Router();
8
8
  const auth = require('@steedos/auth');
9
9
  const ejs = require('ejs');
10
+ const { filterAssetUrls, isAssetUrlsWhitelistEnabled } = require("@steedos/utils");
10
11
  const fs = require('fs');
11
12
  const _ = require('lodash');
12
13
  const path = require('path');
@@ -31,7 +32,7 @@ router.get('/api/page/view/:pageId', auth.authentication, async function (req, r
31
32
  return res.redirect(`/login?redirect_uri=${encodeURIComponent(`/api/page/view/${pageId}`)}`);
32
33
  }
33
34
 
34
- let assetUrls = req.query.assetUrls;
35
+ let assetUrls = filterAssetUrls(req.query.assetUrls);
35
36
 
36
37
  let locale = "zh-CN";
37
38
  if (req.query.locale == "en-us") {
@@ -47,6 +48,7 @@ router.get('/api/page/view/:pageId', auth.authentication, async function (req, r
47
48
  STEEDOS_UNPKG_URL: process.env.STEEDOS_UNPKG_URL,
48
49
  STEEDOS_AMIS_URL: process.env.STEEDOS_AMIS_URL,
49
50
  STEEDOS_PUBLIC_PAGE_ASSETURLS: assetUrls || process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS,
51
+ ASSET_URLS_WHITELIST_ENABLED: isAssetUrlsWhitelistEnabled(),
50
52
  NODE_ENV: process.env.NODE_ENV,
51
53
  ROOT_URL: process.env.ROOT_URL,
52
54
  STEEDOS_VERSION: process.env.STEEDOS_VERSION,
@@ -92,7 +94,7 @@ router.get('/api/page/public/:pageId', async function (req, res) {
92
94
  return res.status(404).send({ message: 'Must be App page.' });
93
95
  }
94
96
 
95
- let assetUrls = req.query.assetUrls;
97
+ let assetUrls = filterAssetUrls(req.query.assetUrls);
96
98
 
97
99
  let locale = "zh-CN";
98
100
  if (req.query.locale == "en-us") {
@@ -108,6 +110,7 @@ router.get('/api/page/public/:pageId', async function (req, res) {
108
110
  STEEDOS_UNPKG_URL: process.env.STEEDOS_UNPKG_URL,
109
111
  STEEDOS_AMIS_URL: process.env.STEEDOS_AMIS_URL,
110
112
  STEEDOS_PUBLIC_PAGE_ASSETURLS: assetUrls || process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS,
113
+ ASSET_URLS_WHITELIST_ENABLED: isAssetUrlsWhitelistEnabled(),
111
114
  NODE_ENV: process.env.NODE_ENV,
112
115
  ROOT_URL: process.env.ROOT_URL,
113
116
  STEEDOS_VERSION: process.env.STEEDOS_VERSION,
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@steedos/service-pages",
3
- "version": "3.0.15-beta.51",
3
+ "version": "3.0.15-beta.52",
4
4
  "main": "package.service.js",
5
5
  "license": "MIT",
6
6
  "publishConfig": {
7
7
  "access": "public"
8
8
  },
9
- "gitHead": "499f7339242f4e614daa610540fe2e4105e4607f",
9
+ "gitHead": "c0f569768b5d6636a315358a72e58d77f87614a9",
10
10
  "dependencies": {
11
11
  "clone": "^2.1.2",
12
12
  "ejs": "^3.1.8"