@nocobase/server 2.2.0-beta.13 → 2.2.0-beta.14

package/lib/application.js

@@ -944,6 +944,7 @@ const _Application = class _Application extends import_koa.default {
       }
     });
     this._dataSourceManager.use(this._authManager.middleware(), { tag: "auth", before: "default" });
+    this._dataSourceManager.use(import_auth.csrfMiddleware, { tag: "csrf", after: "auth", before: "default" });
     this._dataSourceManager.use(import_validate_filter_params.default, { tag: "validate-filter-params", before: ["auth"] });
     this._dataSourceManager.use(import_middlewares.parseVariables, {
       group: "parseVariables",

package/lib/gateway/index.js

@@ -78,6 +78,17 @@ function normalizeBasePath(path = "") {
   return normalized || "/";
 }
 __name(normalizeBasePath, "normalizeBasePath");
+function getFilesPathPrefixes(appPublicPath = "/") {
+  const normalizedPublicPath = normalizeBasePath(appPublicPath);
+  const canonicalPrefix = `${normalizedPublicPath === "/" ? "" : normalizedPublicPath}/files/`;
+  return canonicalPrefix === "/files/" ? ["/files/"] : [canonicalPrefix, "/files/"];
+}
+__name(getFilesPathPrefixes, "getFilesPathPrefixes");
+function getFileAccessRestPath(pathname, appPublicPath = "/") {
+  const prefix = getFilesPathPrefixes(appPublicPath).find((prefix2) => pathname.startsWith(prefix2));
+  return prefix ? pathname.slice(prefix.length) : null;
+}
+__name(getFileAccessRestPath, "getFileAccessRestPath");
 function getSocketPath() {
   const socketPath = import_node_process.default.env.SOCKET_PATH;
   if (socketPath) {
@@ -202,6 +213,17 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
             req.url = rewrittenUrl;
           }
         }
+        const fileAccessRestPath = parsedUrl.pathname ? getFileAccessRestPath(parsedUrl.pathname, import_node_process.default.env.APP_PUBLIC_PATH || "/") : null;
+        if (fileAccessRestPath) {
+          const restPath = fileAccessRestPath;
+          const [pathAppName] = restPath.split("/");
+          if (pathAppName) {
+            try {
+              ctx.resolvedAppName = decodeURIComponent(pathAppName);
+            } catch (error) {
+            }
+          }
+        }
         await next();
       },
       {
@@ -337,7 +359,7 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     return (0, import_utils3.injectRuntimeScript)(html, this.getV2RuntimeConfigScript());
   }
   async requestHandler(req, res) {
-    const { pathname } = (0, import_url.parse)(req.url);
+    const { pathname, search } = (0, import_url.parse)(req.url);
     const { PLUGIN_STATICS_PATH } = import_node_process.default.env;
     const APP_PUBLIC_PATH = this.getAppPublicPath();
     if (pathname.endsWith("/__umi/api/bundle-status")) {
@@ -345,6 +367,12 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
       res.end("ok");
       return;
     }
+    if (APP_PUBLIC_PATH !== "/" && pathname.startsWith("/files/")) {
+      res.statusCode = 302;
+      res.setHeader("Location", `${APP_PUBLIC_PATH.replace(/\/$/, "")}${pathname}${search || ""}`);
+      res.end();
+      return;
+    }
     const supervisor = import_app_supervisor.AppSupervisor.getInstance();
     let handleApp = "main";
     try {
@@ -361,7 +389,7 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
           return;
         }
       }
-      const headers = (0, import_static_file_security.getStorageUploadSecurityHeaders)(pathname);
+      const headers = (0, import_static_file_security.getStorageUploadSecurityHeaders)(`${pathname}${search || ""}`);
       for (const [key, value] of Object.entries(headers)) {
         res.setHeader(key, value);
       }
@@ -407,7 +435,8 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
         ]
       });
     }
-    if (!pathname.startsWith(import_node_process.default.env.API_BASE_PATH)) {
+    const isFilesRequest = Boolean(getFileAccessRestPath(pathname, APP_PUBLIC_PATH));
+    if (!pathname.startsWith(import_node_process.default.env.API_BASE_PATH) && !isFilesRequest) {
       if (this.isV2Request(pathname)) {
         if (handleApp !== "main") {
           const isProxy = await this.proxyRequestToSubApp(supervisor, handleApp, req, res);

package/lib/gateway/static-file-security.js

@@ -47,6 +47,15 @@ function stripQueryAndHash(pathname = "") {
   return pathname.split("?")[0].split("#")[0];
 }
 __name(stripQueryAndHash, "stripQueryAndHash");
+function shouldDownload(pathname = "") {
+  var _a;
+  const query = (_a = pathname.split("?")[1]) == null ? void 0 : _a.split("#")[0];
+  if (!query) {
+    return false;
+  }
+  return new URLSearchParams(query).get("download") === "1";
+}
+__name(shouldDownload, "shouldDownload");
 function hasActiveContentExtension(pathname = "") {
   const ext = import_node_path.default.extname(stripQueryAndHash(pathname)).toLowerCase();
   return ACTIVE_CONTENT_EXTENSIONS.has(ext);
@@ -56,7 +65,7 @@ function getStorageUploadSecurityHeaders(pathname = "") {
   const headers = {
     "X-Content-Type-Options": "nosniff"
   };
-  if (hasActiveContentExtension(pathname)) {
+  if (hasActiveContentExtension(pathname) || shouldDownload(pathname)) {
     headers["Content-Disposition"] = "attachment";
   }
   return headers;

package/lib/helper.js

@@ -76,23 +76,28 @@ function createResourcer(options) {
   return new import_resourcer.Resourcer({ ...options.resourcer });
 }
 __name(createResourcer, "createResourcer");
+function isWhitelistedCorsOrigin(ctx) {
+  const origin = ctx.get("origin");
+  const whitelist = (0, import_utils.getCorsWhitelist)();
+  if (!origin) {
+    return false;
+  }
+  if (!whitelist) {
+    return (0, import_utils.isTrustedOrigin)(ctx, origin);
+  }
+  return whitelist.has(origin);
+}
+__name(isWhitelistedCorsOrigin, "isWhitelistedCorsOrigin");
 function resolveCorsOrigin(ctx) {
   const origin = ctx.get("origin");
   const disallowNoOrigin = process.env.CORS_DISALLOW_NO_ORIGIN === "true";
-  const whitelistString = process.env.CORS_ORIGIN_WHITELIST;
   if (!origin && disallowNoOrigin) {
     return false;
   }
-  if (!whitelistString) {
+  if (isWhitelistedCorsOrigin(ctx)) {
     return origin;
   }
-  const whitelist = new Set(
-    whitelistString.split(",").map((item) => item.trim()).filter(Boolean)
-  );
-  if (whitelist.has(origin)) {
-    return origin;
-  }
-  return false;
+  return (0, import_utils.getCorsWhitelist)() ? false : origin;
 }
 __name(resolveCorsOrigin, "resolveCorsOrigin");
 function registerMiddlewares(app, options) {
@@ -108,6 +113,7 @@ function registerMiddlewares(app, options) {
   app.use((0, import_logger.requestLogger)(app.name, app.requestLogger, (_a = options.logger) == null ? void 0 : _a.request), { tag: "logger" });
   app.use(
     (0, import_cors.default)({
+      credentials: isWhitelistedCorsOrigin,
       exposeHeaders: ["content-disposition"],
       origin: resolveCorsOrigin,
       ...options.cors
@@ -134,8 +140,18 @@ function registerMiddlewares(app, options) {
   }
   app.use(/* @__PURE__ */ __name(async function getBearerToken(ctx, next) {
     ctx.getBearerToken = () => {
-      const token = ctx.get("Authorization").replace(/^Bearer\s+/gi, "");
-      return token || ctx.query.token;
+      const authorization = ctx.get("Authorization");
+      if (authorization) {
+        ctx.state.pendingAuthTokenSource = "authorization";
+        return authorization.replace(/^Bearer\s+/gi, "");
+      }
+      if (ctx.query.token) {
+        ctx.state.pendingAuthTokenSource = "query";
+        return ctx.query.token;
+      }
+      const cookieToken = ctx.cookies.get((0, import_utils.getAuthCookieName)("authToken", app.name));
+      ctx.state.pendingAuthTokenSource = cookieToken ? "cookie" : void 0;
+      return cookieToken;
     };
     await next();
   }, "getBearerToken"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.2.0-beta.13",
+  "version": "2.2.0-beta.14",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -10,21 +10,21 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.1.0",
     "@koa/router": "^13.1.0",
-    "@nocobase/acl": "2.2.0-beta.13",
-    "@nocobase/actions": "2.2.0-beta.13",
-    "@nocobase/ai": "2.2.0-beta.13",
-    "@nocobase/auth": "2.2.0-beta.13",
-    "@nocobase/cache": "2.2.0-beta.13",
-    "@nocobase/data-source-manager": "2.2.0-beta.13",
-    "@nocobase/database": "2.2.0-beta.13",
-    "@nocobase/evaluators": "2.2.0-beta.13",
-    "@nocobase/lock-manager": "2.2.0-beta.13",
-    "@nocobase/logger": "2.2.0-beta.13",
-    "@nocobase/resourcer": "2.2.0-beta.13",
-    "@nocobase/sdk": "2.2.0-beta.13",
-    "@nocobase/snowflake-id": "2.2.0-beta.13",
-    "@nocobase/telemetry": "2.2.0-beta.13",
-    "@nocobase/utils": "2.2.0-beta.13",
+    "@nocobase/acl": "2.2.0-beta.14",
+    "@nocobase/actions": "2.2.0-beta.14",
+    "@nocobase/ai": "2.2.0-beta.14",
+    "@nocobase/auth": "2.2.0-beta.14",
+    "@nocobase/cache": "2.2.0-beta.14",
+    "@nocobase/data-source-manager": "2.2.0-beta.14",
+    "@nocobase/database": "2.2.0-beta.14",
+    "@nocobase/evaluators": "2.2.0-beta.14",
+    "@nocobase/lock-manager": "2.2.0-beta.14",
+    "@nocobase/logger": "2.2.0-beta.14",
+    "@nocobase/resourcer": "2.2.0-beta.14",
+    "@nocobase/sdk": "2.2.0-beta.14",
+    "@nocobase/snowflake-id": "2.2.0-beta.14",
+    "@nocobase/telemetry": "2.2.0-beta.14",
+    "@nocobase/utils": "2.2.0-beta.14",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -61,5 +61,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "8fff12b34f41f4336075cdafcc700ec694f9b78a"
+  "gitHead": "1ef021f3ce0a84469e40f181a19551a50b6f850c"
 }