@nocobase/server 1.9.36 → 1.9.38
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/lib/helper.js +20 -3
- package/package.json +16 -16
package/lib/helper.js
CHANGED
|
@@ -76,6 +76,25 @@ function createResourcer(options) {
|
|
|
76
76
|
return new import_resourcer.Resourcer({ ...options.resourcer });
|
|
77
77
|
}
|
|
78
78
|
__name(createResourcer, "createResourcer");
|
|
79
|
+
function resolveCorsOrigin(ctx) {
|
|
80
|
+
const origin = ctx.get("origin");
|
|
81
|
+
const disallowNoOrigin = process.env.CORS_DISALLOW_NO_ORIGIN === "true";
|
|
82
|
+
const whitelistString = process.env.CORS_ORIGIN_WHITELIST;
|
|
83
|
+
if (!origin && disallowNoOrigin) {
|
|
84
|
+
return false;
|
|
85
|
+
}
|
|
86
|
+
if (!whitelistString) {
|
|
87
|
+
return origin;
|
|
88
|
+
}
|
|
89
|
+
const whitelist = new Set(
|
|
90
|
+
whitelistString.split(",").map((item) => item.trim()).filter(Boolean)
|
|
91
|
+
);
|
|
92
|
+
if (whitelist.has(origin)) {
|
|
93
|
+
return origin;
|
|
94
|
+
}
|
|
95
|
+
return false;
|
|
96
|
+
}
|
|
97
|
+
__name(resolveCorsOrigin, "resolveCorsOrigin");
|
|
79
98
|
function registerMiddlewares(app, options) {
|
|
80
99
|
var _a;
|
|
81
100
|
app.use(
|
|
@@ -90,9 +109,7 @@ function registerMiddlewares(app, options) {
|
|
|
90
109
|
app.use(
|
|
91
110
|
(0, import_cors.default)({
|
|
92
111
|
exposeHeaders: ["content-disposition"],
|
|
93
|
-
origin
|
|
94
|
-
return ctx.get("origin");
|
|
95
|
-
},
|
|
112
|
+
origin: resolveCorsOrigin,
|
|
96
113
|
...options.cors
|
|
97
114
|
}),
|
|
98
115
|
{
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nocobase/server",
|
|
3
|
-
"version": "1.9.
|
|
3
|
+
"version": "1.9.38",
|
|
4
4
|
"main": "lib/index.js",
|
|
5
5
|
"types": "./lib/index.d.ts",
|
|
6
6
|
"license": "AGPL-3.0",
|
|
@@ -10,20 +10,20 @@
|
|
|
10
10
|
"@koa/cors": "^5.0.0",
|
|
11
11
|
"@koa/multer": "^3.1.0",
|
|
12
12
|
"@koa/router": "^13.1.0",
|
|
13
|
-
"@nocobase/acl": "1.9.
|
|
14
|
-
"@nocobase/actions": "1.9.
|
|
15
|
-
"@nocobase/auth": "1.9.
|
|
16
|
-
"@nocobase/cache": "1.9.
|
|
17
|
-
"@nocobase/data-source-manager": "1.9.
|
|
18
|
-
"@nocobase/database": "1.9.
|
|
19
|
-
"@nocobase/evaluators": "1.9.
|
|
20
|
-
"@nocobase/lock-manager": "1.9.
|
|
21
|
-
"@nocobase/logger": "1.9.
|
|
22
|
-
"@nocobase/resourcer": "1.9.
|
|
23
|
-
"@nocobase/sdk": "1.9.
|
|
24
|
-
"@nocobase/snowflake-id": "1.9.
|
|
25
|
-
"@nocobase/telemetry": "1.9.
|
|
26
|
-
"@nocobase/utils": "1.9.
|
|
13
|
+
"@nocobase/acl": "1.9.38",
|
|
14
|
+
"@nocobase/actions": "1.9.38",
|
|
15
|
+
"@nocobase/auth": "1.9.38",
|
|
16
|
+
"@nocobase/cache": "1.9.38",
|
|
17
|
+
"@nocobase/data-source-manager": "1.9.38",
|
|
18
|
+
"@nocobase/database": "1.9.38",
|
|
19
|
+
"@nocobase/evaluators": "1.9.38",
|
|
20
|
+
"@nocobase/lock-manager": "1.9.38",
|
|
21
|
+
"@nocobase/logger": "1.9.38",
|
|
22
|
+
"@nocobase/resourcer": "1.9.38",
|
|
23
|
+
"@nocobase/sdk": "1.9.38",
|
|
24
|
+
"@nocobase/snowflake-id": "1.9.38",
|
|
25
|
+
"@nocobase/telemetry": "1.9.38",
|
|
26
|
+
"@nocobase/utils": "1.9.38",
|
|
27
27
|
"@types/decompress": "4.2.7",
|
|
28
28
|
"@types/ini": "^1.3.31",
|
|
29
29
|
"@types/koa-send": "^4.1.3",
|
|
@@ -59,5 +59,5 @@
|
|
|
59
59
|
"@types/serve-handler": "^6.1.1",
|
|
60
60
|
"@types/ws": "^8.5.5"
|
|
61
61
|
},
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "9646a7fcd02c833a5b0c14ddf7c509a4a3e1e75c"
|
|
63
63
|
}
|