Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
fix: purify html before render
Stevene8ed437ca389
diff --git a/web/package.json b/web/package.jsonindex 33c2fa769..d5def0362 100644--- a/web/package.json+++ b/web/package.json@@ -21,6 +21,7 @@"clsx": "^2.1.1","copy-to-clipboard": "^3.3.3","dayjs": "^1.11.11",+ "dompurify": "^3.1.5","fuse.js": "^7.0.0","highlight.js": "^11.9.0","i18next": "^23.11.5",diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yamlindex e8ff6acc6..abdc320d5 100644--- a/web/pnpm-lock.yaml+++ b/web/pnpm-lock.yaml@@ -10,10 +10,10 @@ importers:dependencies:'@dnd-kit/core':specifier: ^6.1.0- version: 6.1.0([email protected])([email protected])'@dnd-kit/sortable':specifier: ^8.0.0- version: 8.0.0(@dnd-kit/[email protected])([email protected])+ version: 8.0.0(@dnd-kit/[email protected]([email protected]([email protected]))([email protected]))([email protected])'@dnd-kit/utilities':specifier: ^3.2.2version: 3.2.2([email protected])@@ -22,7 +22,7 @@ importers:version: 11.11.4(@types/[email protected])([email protected])'@emotion/styled':specifier: ^11.11.5+ version: 11.11.5(@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])'@github/relative-time-element':specifier: ^4.4.0version: 4.4.0@@ -31,10 +31,10 @@ importers:version: 3.1.3([email protected])([email protected])'@mui/joy':specifier: 5.0.0-beta.36- version: 5.0.0-beta.36(@emotion/[email protected])(@emotion/[email protected])(@types/[email protected])([email protected])([email protected])+ version: 5.0.0-beta.36(@emotion/[email protected](@types/[email protected])([email protected]))(@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])'@reduxjs/toolkit':specifier: ^2.2.4- version: 2.2.5([email protected])([email protected])+ version: 2.2.5([email protected](@types/[email protected])([email protected])([email protected]))([email protected])clsx:specifier: ^2.1.1version: 2.1.1@@ -44,6 +44,9 @@ importers:dayjs:specifier: ^1.11.11version: 1.11.11+ dompurify:+ specifier: ^3.1.5+ version: 3.1.5fuse.js:specifier: ^7.0.0version: 7.0.0@@ -73,19 +76,19 @@ importers:version: 18.3.1([email protected])react-hot-toast:specifier: ^2.4.1react-i18next:specifier: ^14.1.1react-redux:specifier: ^9.1.2react-router-dom:specifier: ^6.23.1- version: 6.23.1([email protected])([email protected])react-use:specifier: ^17.5.0- version: 17.5.0([email protected])([email protected])tailwindcss:specifier: ^3.4.3version: 3.4.3@@ -97,7 +100,7 @@ importers:version: 9.0.1zustand:specifier: ^4.5.2- version: 4.5.2(@types/[email protected])([email protected])devDependencies:'@bufbuild/buf':specifier: ^1.32.1@@ -137,13 +140,13 @@ importers:version: 9.0.8'@typescript-eslint/eslint-plugin':specifier: ^7.8.0+ version: 7.11.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])'@typescript-eslint/parser':specifier: ^7.10.0version: 7.11.0([email protected])([email protected])'@vitejs/plugin-react':specifier: ^4.3.0- version: 4.3.0([email protected])autoprefixer:specifier: ^10.4.19version: 10.4.19([email protected])@@ -155,7 +158,7 @@ importers:version: 9.1.0([email protected])eslint-plugin-prettier:specifier: ^5.1.3eslint-plugin-react:specifier: ^7.34.1version: 7.34.2([email protected])@@ -3265,7 +3268,7 @@ snapshots:react: 18.3.1tslib: 2.6.2dependencies:'@dnd-kit/accessibility': 3.1.0([email protected])'@dnd-kit/utilities': 3.2.2([email protected])@@ -3273,9 +3276,9 @@ snapshots:react-dom: 18.3.1([email protected])tslib: 2.6.2+ '@dnd-kit/[email protected](@dnd-kit/[email protected]([email protected]([email protected]))([email protected]))([email protected])':dependencies:- '@dnd-kit/core': 6.1.0([email protected])([email protected])'@dnd-kit/utilities': 3.2.2([email protected])react: 18.3.1tslib: 2.6.2@@ -3324,9 +3327,10 @@ snapshots:'@emotion/use-insertion-effect-with-fallbacks': 1.0.1([email protected])'@emotion/utils': 1.2.1'@emotion/weak-memoize': 0.3.1- '@types/react': 18.3.3hoist-non-react-statics: 3.3.2react: 18.3.1+ optionalDependencies:+ '@types/react': 18.3.3'@emotion/[email protected]':dependencies:@@ -3338,7 +3342,7 @@ snapshots:'@emotion/[email protected]': {}- '@emotion/[email protected](@emotion/[email protected])(@types/[email protected])([email protected])':+ '@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])':dependencies:'@babel/runtime': 7.24.6'@emotion/babel-plugin': 11.11.0@@ -3347,8 +3351,9 @@ snapshots:'@emotion/serialize': 1.1.4'@emotion/use-insertion-effect-with-fallbacks': 1.0.1([email protected])'@emotion/utils': 1.2.1- '@types/react': 18.3.3react: 18.3.1+ optionalDependencies:+ '@types/react': 18.3.3'@emotion/[email protected]': {}@@ -3461,7 +3466,7 @@ snapshots:'@floating-ui/core': 1.6.2'@floating-ui/utils': 0.2.2dependencies:'@floating-ui/dom': 1.6.5react: 18.3.1@@ -3514,82 +3519,88 @@ snapshots:katex: 0.16.10react: 18.3.1+ '@mui/[email protected](@types/[email protected])([email protected]([email protected]))([email protected])':dependencies:'@babel/runtime': 7.24.6- '@floating-ui/react-dom': 2.1.0([email protected])([email protected])'@mui/types': 7.2.14(@types/[email protected])'@mui/utils': 6.0.0-dev.20240529-082515-213b5e33ab(@types/[email protected])([email protected])'@popperjs/core': 2.11.8- '@types/react': 18.3.3clsx: 2.1.1prop-types: 15.8.1react: 18.3.1react-dom: 18.3.1([email protected])+ optionalDependencies:+ '@types/react': 18.3.3'@mui/[email protected]': {}- '@mui/[email protected](@emotion/[email protected])(@emotion/[email protected])(@types/[email protected])([email protected])([email protected])':+ '@mui/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':dependencies:'@babel/runtime': 7.24.6- '@emotion/react': 11.11.4(@types/[email protected])([email protected])- '@emotion/styled': 11.11.5(@emotion/[email protected])(@types/[email protected])([email protected])+ '@mui/base': 5.0.0-beta.42(@types/[email protected])([email protected]([email protected]))([email protected])'@mui/core-downloads-tracker': 6.0.0-dev.240424162023-9968b4889d- '@mui/system': 6.0.0-dev.240424162023-9968b4889d(@emotion/[email protected])(@emotion/[email protected])(@types/[email protected])([email protected])+ '@mui/system': 6.0.0-dev.240424162023-9968b4889d(@emotion/[email protected](@types/[email protected])([email protected]))(@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))(@types/[email protected])([email protected])'@mui/types': 7.2.14(@types/[email protected])'@mui/utils': 6.0.0-dev.20240529-082515-213b5e33ab(@types/[email protected])([email protected])- '@types/react': 18.3.3clsx: 2.1.1prop-types: 15.8.1react: 18.3.1react-dom: 18.3.1([email protected])+ optionalDependencies:+ '@emotion/react': 11.11.4(@types/[email protected])([email protected])+ '@emotion/styled': 11.11.5(@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])+ '@types/react': 18.3.3dependencies:'@babel/runtime': 7.24.6'@mui/utils': 6.0.0-dev.20240529-082515-213b5e33ab(@types/[email protected])([email protected])- '@types/react': 18.3.3prop-types: 15.8.1react: 18.3.1+ optionalDependencies:+ '@types/react': 18.3.3- '@mui/[email protected](@emotion/[email protected])(@emotion/[email protected])([email protected])':+ '@mui/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))([email protected])':dependencies:'@babel/runtime': 7.24.6'@emotion/cache': 11.11.0- '@emotion/react': 11.11.4(@types/[email protected])([email protected])- '@emotion/styled': 11.11.5(@emotion/[email protected])(@types/[email protected])([email protected])csstype: 3.1.3prop-types: 15.8.1react: 18.3.1+ optionalDependencies:+ '@emotion/react': 11.11.4(@types/[email protected])([email protected])+ '@emotion/styled': 11.11.5(@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])- '@mui/[email protected](@emotion/[email protected])(@emotion/[email protected])(@types/[email protected])([email protected])':+ '@mui/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))(@types/[email protected])([email protected])':dependencies:'@babel/runtime': 7.24.6- '@emotion/react': 11.11.4(@types/[email protected])([email protected])- '@emotion/styled': 11.11.5(@emotion/[email protected])(@types/[email protected])([email protected])'@mui/private-theming': 6.0.0-dev.20240529-082515-213b5e33ab(@types/[email protected])([email protected])- '@mui/styled-engine': 6.0.0-dev.20240529-082515-213b5e33ab(@emotion/[email protected])(@emotion/[email protected])([email protected])+ '@mui/styled-engine': 6.0.0-dev.20240529-082515-213b5e33ab(@emotion/[email protected](@types/[email protected])([email protected]))(@emotion/[email protected](@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))([email protected])'@mui/types': 7.2.14(@types/[email protected])'@mui/utils': 6.0.0-dev.20240529-082515-213b5e33ab(@types/[email protected])([email protected])- '@types/react': 18.3.3clsx: 2.1.1csstype: 3.1.3prop-types: 15.8.1react: 18.3.1+ optionalDependencies:+ '@emotion/react': 11.11.4(@types/[email protected])([email protected])+ '@emotion/styled': 11.11.5(@emotion/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])+ '@types/react': 18.3.3'@mui/[email protected](@types/[email protected])':- dependencies:+ optionalDependencies:'@types/react': 18.3.3dependencies:'@babel/runtime': 7.24.6'@types/prop-types': 15.7.12- '@types/react': 18.3.3prop-types: 15.8.1react: 18.3.1react-is: 18.3.1+ optionalDependencies:+ '@types/react': 18.3.3'@nodelib/[email protected]':dependencies:@@ -3633,14 +3644,15 @@ snapshots:'@protobufjs/[email protected]': {}+ '@reduxjs/[email protected]([email protected](@types/[email protected])([email protected])([email protected]))([email protected])':dependencies:immer: 10.1.1- react: 18.3.1redux: 5.0.1redux-thunk: 3.1.0([email protected])reselect: 5.1.1+ optionalDependencies:+ react: 18.3.1'@remix-run/[email protected]': {}@@ -3899,7 +3911,7 @@ snapshots:'@types/[email protected]': {}- '@typescript-eslint/[email protected](@typescript-eslint/[email protected])([email protected])([email protected])':+ '@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])':dependencies:'@eslint-community/regexpp': 4.10.1'@typescript-eslint/parser': 7.11.0([email protected])([email protected])@@ -3912,6 +3924,7 @@ snapshots:ignore: 5.3.1natural-compare: 1.4.0ts-api-utils: 1.3.0([email protected])+ optionalDependencies:typescript: 5.4.5transitivePeerDependencies:- supports-color@@ -3924,6 +3937,7 @@ snapshots:'@typescript-eslint/visitor-keys': 7.11.0debug: 4.3.5eslint: 8.57.0+ optionalDependencies:typescript: 5.4.5transitivePeerDependencies:- supports-color@@ -3940,6 +3954,7 @@ snapshots:debug: 4.3.5eslint: 8.57.0ts-api-utils: 1.3.0([email protected])+ optionalDependencies:typescript: 5.4.5transitivePeerDependencies:- supports-color@@ -3956,6 +3971,7 @@ snapshots:minimatch: 9.0.4semver: 7.6.2ts-api-utils: 1.3.0([email protected])+ optionalDependencies:typescript: 5.4.5transitivePeerDependencies:- supports-color@@ -3978,7 +3994,7 @@ snapshots:'@ungap/[email protected]': {}- '@vitejs/[email protected]([email protected])':dependencies:'@babel/core': 7.24.6'@babel/plugin-transform-react-jsx-self': 7.24.6(@babel/[email protected])@@ -4642,13 +4658,14 @@ snapshots:dependencies:eslint: 8.57.0dependencies:eslint: 8.57.0- eslint-config-prettier: 9.1.0([email protected])prettier: 3.3.0prettier-linter-helpers: 1.0.0synckit: 0.8.8+ optionalDependencies:+ eslint-config-prettier: 9.1.0([email protected])dependencies:@@ -5409,7 +5426,7 @@ snapshots:object-assign: 4.1.1thenify-all: 1.6.0dependencies:'@jridgewell/sourcemap-codec': 1.4.15css-tree: 1.1.3@@ -5570,8 +5587,9 @@ snapshots:dependencies:lilconfig: 3.1.1- postcss: 8.4.38yaml: 2.4.3+ optionalDependencies:+ postcss: 8.4.38dependencies:@@ -5633,7 +5651,7 @@ snapshots:react: 18.3.1scheduler: 0.23.2dependencies:goober: 2.1.14([email protected])react: 18.3.1@@ -5641,12 +5659,13 @@ snapshots:transitivePeerDependencies:- csstypedependencies:'@babel/runtime': 7.24.6html-parse-stringify: 3.0.1i18next: 23.11.5react: 18.3.1+ optionalDependencies:react-dom: 18.3.1([email protected])@@ -5655,15 +5674,16 @@ snapshots:dependencies:- '@types/react': 18.3.3'@types/use-sync-external-store': 0.0.3react: 18.3.1- redux: 5.0.1use-sync-external-store: 1.2.2([email protected])+ optionalDependencies:+ '@types/react': 18.3.3+ redux: 5.0.1dependencies:'@remix-run/router': 1.16.1react: 18.3.1@@ -5680,7 +5700,7 @@ snapshots:react: 18.3.1tslib: 2.6.2dependencies:'@types/js-cookie': 2.2.7'@xobotyi/scrollbar-width': 1.9.5@@ -5688,7 +5708,7 @@ snapshots:fast-deep-equal: 3.1.3fast-shallow-equal: 1.0.0js-cookie: 2.2.1- nano-css: 5.6.1([email protected])([email protected])react: 18.3.1react-dom: 18.3.1([email protected])react-universal-interface: 0.6.2([email protected])([email protected])@@ -6121,13 +6141,13 @@ snapshots:dependencies:- '@types/node': 20.14.0esbuild: 0.20.2- less: 4.2.0postcss: 8.4.38rollup: 4.18.0optionalDependencies:+ '@types/node': 20.14.0fsevents: 2.3.3+ less: 4.2.0@@ -6201,8 +6221,10 @@ snapshots:dependencies:+ use-sync-external-store: 1.2.0([email protected])+ optionalDependencies:'@types/react': 18.3.3+ immer: 10.1.1react: 18.3.1- use-sync-external-store: 1.2.0([email protected])diff --git a/web/src/components/MemoContent/CodeBlock.tsx b/web/src/components/MemoContent/CodeBlock.tsxindex ff21aeb92..e96838eb8 100644--- a/web/src/components/MemoContent/CodeBlock.tsx+++ b/web/src/components/MemoContent/CodeBlock.tsx@@ -1,5 +1,6 @@import clsx from "clsx";import copy from "copy-to-clipboard";+import DOMPurify from "dompurify";import hljs from "highlight.js";import { useCallback, useMemo } from "react";import toast from "react-hot-toast";@@ -23,7 +24,8 @@ const CodeBlock: React.FC<Props> = ({ language, content }: Props) => {// Users can set Markdown code blocks as `__html` to render HTML directly.if (formatedLanguage === SpecialLanguage.HTML) {- return <div className="w-full overflow-auto !my-2" dangerouslySetInnerHTML={{ __html: content }} />;+ const purify = DOMPurify(window);+ return <div className="w-full overflow-auto !my-2" dangerouslySetInnerHTML={{ __html: purify.sanitize(content) }} />;} else if (formatedLanguage === SpecialLanguage.MERMAID) {return <MermaidBlock content={content} />;}