Build your personal knowledge base with Trilium Notes
TypeScript electronelectron-appknowledge-baseknowledge-graphknowledge-managementknowledge-management-graphlocal-firstnote-managmentnote-takernote-takingnotebooknotesnotes-apppersonal-knowledge-basepersonal-wikiscriptableself-hostedself-hostingwiki
fix(pwa): refuse share-target posts from other pages, cap file size
Elian Doran896159a62166
diff --git a/apps/server/src/assets/translations/en/server.json b/apps/server/src/assets/translations/en/server.jsonindex bdd5051794..5cf059b951 100644--- a/apps/server/src/assets/translations/en/server.json+++ b/apps/server/src/assets/translations/en/server.json@@ -594,6 +594,9 @@"stalled": "Downloading {{name}} stopped: nothing arrived for {{seconds}} seconds. Check your connection, then try again."},"share_target": {- "default-title": "Shared content"+ "default-title": "Shared content",+ "nothing-to-share": "Nothing to share: no text, link or files were received.",+ "rejected": "Share rejected: {{- reason}}",+ "other-page": "Only the system share menu can send content to this address."}}diff --git a/apps/server/src/routes/api/share_target.spec.ts b/apps/server/src/routes/api/share_target.spec.tsindex a65ab49f13..25682474d3 100644--- a/apps/server/src/routes/api/share_target.spec.ts+++ b/apps/server/src/routes/api/share_target.spec.ts@@ -52,6 +52,19 @@ describe("POST /share-target", () => {expect(Object.keys(becca.notes)).toHaveLength(notesBefore);});+ it("refuses a form posted by another page and accepts the share sheet's navigation", async () => {+ const notesBefore = Object.keys(becca.notes).length;+ for (const site of [ "same-site", "cross-site" ]) {+ const res = await agent.post("/share-target").set("Sec-Fetch-Site", site).field("text", "hello");+ expect(res.status).toBe(403);+ }+ expect(Object.keys(becca.notes)).toHaveLength(notesBefore);++ for (const site of [ "none", "same-origin" ]) {+ await agent.post("/share-target").set("Sec-Fetch-Site", site).field("text", "hello").expect(303);+ }+ });+it("saves shared text and a url as a text note with a pageUrl label", async () => {const res = await agent.post("/share-target")diff --git a/apps/server/src/routes/api/share_target.ts b/apps/server/src/routes/api/share_target.tsindex 2b78829254..599e8313f4 100644--- a/apps/server/src/routes/api/share_target.ts+++ b/apps/server/src/routes/api/share_target.ts@@ -1,6 +1,6 @@import { isAcceptedImageMime } from "@triliumnext/commons";import { type BNote, date_utils as dateUtils, getSql, note_service as noteService, protected_session as protectedSessionService, sanitize, special_notes as specialNotesService, utils } from "@triliumnext/core";-import type { Request, Response } from "express";+import type { NextFunction, Request, Response } from "express";import { readFileSync } from "fs";import { t } from "i18next";@@ -19,7 +19,7 @@ async function handleShare(req: Request, res: Response) {const files = (req.files as Express.Multer.File[] | undefined) ?? [];if (!text && !url && files.length === 0) {- res.status(400).type("text/plain").send("Nothing to share: no text, url or files were provided.");+ res.status(400).type("text/plain").send(t("share_target.nothing-to-share"));return;}@@ -31,6 +31,20 @@ async function handleShare(req: Request, res: Response) {res.redirect(303, `./#${openNote.getBestNotePathString()}`);}+/**+ * Rejects a form that another page posts to `/share-target`. The route takes no CSRF token, and the+ * `SameSite=Lax` session cookie still reaches it from a page on the same site (another subdomain).+ * The share sheet's navigation is browser-initiated, so it arrives as `Sec-Fetch-Site: none`.+ */+function rejectOtherPages(req: Request, res: Response, next: NextFunction) {+ const site = req.headers["sec-fetch-site"];+ if (site === "same-site" || site === "cross-site") {+ res.status(403).type("text/plain").send(t("share_target.other-page"));+ return;+ }+ next();+}+/*** Creates the shared notes. Text, a URL or several files go into a new text note; a single file* without text goes straight into the inbox.@@ -135,5 +149,6 @@ export function needsContainerNote(hasText: boolean, fileCount: number): boolean}export default {- handleShare+ handleShare,+ rejectOtherPages};diff --git a/apps/server/src/routes/route_api.spec.ts b/apps/server/src/routes/route_api.spec.tsindex c9fa396fcc..d9f9ada6da 100644--- a/apps/server/src/routes/route_api.spec.ts+++ b/apps/server/src/routes/route_api.spec.ts@@ -7,6 +7,7 @@ import { beforeAll, describe, expect, it, vi } from "vitest";import {apiResultHandler,asyncRoute,+ createShareTargetMiddleware,importMiddlewareWithErrorHandling,route,router,@@ -142,6 +143,21 @@ describe("uploadMiddlewareWithErrorHandling (in-memory)", () => {});});+describe("createShareTargetMiddleware", () => {+ it("rejects a file above the size limit before the handler runs", async () => {+ const app = express();+ const handler = vi.fn((_req: express.Request, res: express.Response) => res.sendStatus(200));+ app.post("/share", createShareTargetMiddleware(4), handler);++ const res = await request(app).post("/share").attach("files", Buffer.from("12345"), "big.bin");++ expect(res.status).toBe(400);+ expect(res.text).toContain("Share rejected");+ expect(handler).not.toHaveBeenCalled();+ await request(app).post("/share").attach("files", Buffer.from("1234"), "fits.bin").expect(200);+ });+});+describe("stripNulBeforeDelimiters", () => {it("drops the NUL before every delimiter, wherever the chunks split it", async () => {const input = Buffer.from("--b\r\n\r\nx\0y\r\n\0--b\r\n\r\nz\r\n\0--b--\r\n", "latin1");diff --git a/apps/server/src/routes/route_api.ts b/apps/server/src/routes/route_api.tsindex b4d20b32db..1d7d6208df 100644--- a/apps/server/src/routes/route_api.ts+++ b/apps/server/src/routes/route_api.ts@@ -1,8 +1,9 @@-import { entity_changes as entityChangesService, HttpError, routes, utils as coreUtils } from "@triliumnext/core";+import { entity_changes as entityChangesService, HttpError, MAX_BLOB_CONTENT_LENGTH, routes, utils as coreUtils } from "@triliumnext/core";import express, { type RequestHandler } from "express";import type { ParamsDictionary } from "express-serve-static-core";import { mkdirSync } from "fs";import { readFile, rm } from "fs/promises";+import { t } from "i18next";import multer from "multer";import { join } from "path";import { Transform } from "stream";@@ -198,7 +199,40 @@ export function createImportUploadMiddleware(): RequestHandler {/** The most files a single Web Share Target request can carry. */export const MAX_SHARED_FILES = 20;-export function createShareTargetUploadMiddleware(): RequestHandler {+/**+ * Parses a Web Share Target POST into `req.body` and `req.files` and deletes its temp files once+ * the response closes. Each shared file becomes one blob, so `maxFileSize` defaults to the blob limit:+ * a file above it is rejected here, before the handler creates any note.+ */+export function createShareTargetMiddleware(maxFileSize = MAX_BLOB_CONTENT_LENGTH): RequestHandler {+ const uploadMiddleware = createShareTargetUploadMiddleware(maxFileSize);++ return (req, res, next) => {+ uploadMiddleware(req, res, (err) => {+ const files = (req.files as Express.Multer.File[] | undefined) ?? [];+ res.on("close", () => {+ for (const file of files) {+ void rm(file.path, { force: true }).catch(() => {});+ }+ });++ if (rejectedNestedField(err, res)) {+ return;+ }+ if (err instanceof multer.MulterError) {+ res.setHeader("Content-Type", "text/plain").status(400).send(t("share_target.rejected", { reason: err.message }));+ return;+ }+ if (err) {+ next(err);+ return;+ }+ next();+ });+ };+}++function createShareTargetUploadMiddleware(maxFileSize: number): RequestHandler {// Disk storage: a share can carry several large files, so the handler reads them back from// `file.path` one at a time instead of holding all of them in memory.const options: multer.Options & { streamHandler?: (req: express.Request, busboy: NodeJS.WritableStream) => void } = {@@ -215,7 +249,7 @@ export function createShareTargetUploadMiddleware(): RequestHandler {}}};- options.limits = { ...options.limits, files: MAX_SHARED_FILES };+ options.limits = { ...options.limits, files: MAX_SHARED_FILES, fileSize: maxFileSize };return multer(options).array("files");}@@ -263,7 +297,6 @@ function tmpDirStorage(): multer.StorageEngine {const uploadMiddleware = createUploadMiddleware();const importUploadMiddleware = createImportUploadMiddleware();-const shareTargetUploadMiddleware = createShareTargetUploadMiddleware();/** Maps the multer field-nesting guard to a clean 400; returns true when the request was already answered. */function rejectedNestedField(err: { code?: string } | undefined, res: express.Response): boolean {@@ -310,30 +343,7 @@ export const importMiddlewareWithErrorHandling = function (req: express.Request,});};-/** Parses a Web Share Target POST and deletes its temp files once the response closes. */-export const shareTargetMiddlewareWithErrorHandling = function (req: express.Request, res: express.Response, next: express.NextFunction) {- shareTargetUploadMiddleware(req, res, (err) => {- const files = (req.files as Express.Multer.File[] | undefined) ?? [];- res.on("close", () => {- for (const file of files) {- void rm(file.path, { force: true }).catch(() => {});- }- });-- if (rejectedNestedField(err, res)) {- return;- }- if (err instanceof multer.MulterError) {- res.setHeader("Content-Type", "text/plain").status(400).send(`Share rejected: ${err.message}`);- return;- }- if (err) {- next(err);- return;- }- next();- });-};+export const shareTargetMiddlewareWithErrorHandling = createShareTargetMiddleware();/*** Whether this upload is a `.zip` read by a zip-reading importer — the case worth streaming from disk. Thatdiff --git a/apps/server/src/routes/routes.ts b/apps/server/src/routes/routes.tsindex 72c8b12ad9..4458aac1d2 100644--- a/apps/server/src/routes/routes.ts+++ b/apps/server/src/routes/routes.ts@@ -167,9 +167,9 @@ function register(app: express.Application) {asyncRoute(PST, "/api/sender/image", [auth.checkEtapiToken, uploadMiddlewareWithErrorHandling], senderRoute.uploadImage, apiResultHandler);asyncRoute(PST, "/api/sender/note", [auth.checkEtapiToken], senderRoute.saveNote, apiResultHandler);- // The OS share sheet posts this form, so it carries no CSRF token; the session cookie is- // `SameSite=Lax`, which a cross-site POST does not carry.- asyncRoute(PST, "/share-target", [auth.checkApiAuth, shareTargetMiddlewareWithErrorHandling], shareTargetRoute.handleShare, null);+ // The OS share sheet posts this form, so it carries no CSRF token; `rejectOtherPages` refuses+ // the same form when another page posts it.+ asyncRoute(PST, "/share-target", [auth.checkApiAuth, shareTargetRoute.rejectOtherPages, shareTargetMiddlewareWithErrorHandling], shareTargetRoute.handleShare, null);// POST rather than GET: the URL would otherwise sit in the query string of every access-log// line (Trilium's own, and any reverse proxy in front of it), and a pasted URL can carry adiff --git a/packages/trilium-core/src/index.ts b/packages/trilium-core/src/index.tsindex ac4de67041..7e8a4fbc79 100644--- a/packages/trilium-core/src/index.ts+++ b/packages/trilium-core/src/index.ts@@ -116,7 +116,7 @@ export { default as BNote } from "./becca/entities/bnote";export { default as BOption } from "./becca/entities/boption";export { default as BRecentNote } from "./becca/entities/brecent_note";export { default as BRevision } from "./becca/entities/brevision";-export { default as AbstractBeccaEntity } from "./becca/entities/abstract_becca_entity";+export { default as AbstractBeccaEntity, MAX_BLOB_CONTENT_LENGTH } from "./becca/entities/abstract_becca_entity";export { default as Becca } from "./becca/becca-interface";export type { NotePojo } from "./becca/becca-interface";