From 8245a519e01f1b91ece3ac15227a86fac279a021 Mon Sep 17 00:00:00 2001 From: Tilman Vatteroth Date: Fri, 26 Aug 2022 12:41:56 +0200 Subject: [PATCH] fix: Use more strict vimeo id regex Signed-off-by: Tilman Vatteroth --- .../markdown-extension/vimeo/replace-legacy-vimeo-short-code.ts | 2 +- .../markdown-extension/vimeo/replace-vimeo-link.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/markdown-renderer/markdown-extension/vimeo/replace-legacy-vimeo-short-code.ts b/src/components/markdown-renderer/markdown-extension/vimeo/replace-legacy-vimeo-short-code.ts index 854161941..5ce9a4c2c 100644 --- a/src/components/markdown-renderer/markdown-extension/vimeo/replace-legacy-vimeo-short-code.ts +++ b/src/components/markdown-renderer/markdown-extension/vimeo/replace-legacy-vimeo-short-code.ts @@ -9,7 +9,7 @@ import { VimeoMarkdownExtension } from './vimeo-markdown-extension' import type MarkdownIt from 'markdown-it' import markdownItRegex from 'markdown-it-regex' -export const legacyVimeoRegex = /^{%vimeo ([\d]{6,11}) ?%}$/ +export const legacyVimeoRegex = /^{%vimeo\s+(\d{6,11})\s*%}$/ /** * Configure the given {@link MarkdownIt} to render legacy hedgedoc 1 vimeo short codes as embeddings. diff --git a/src/components/markdown-renderer/markdown-extension/vimeo/replace-vimeo-link.ts b/src/components/markdown-renderer/markdown-extension/vimeo/replace-vimeo-link.ts index 9ed232c7b..d4245dae3 100644 --- a/src/components/markdown-renderer/markdown-extension/vimeo/replace-vimeo-link.ts +++ b/src/components/markdown-renderer/markdown-extension/vimeo/replace-vimeo-link.ts @@ -11,7 +11,7 @@ import markdownItRegex from 'markdown-it-regex' const protocolRegex = /(?:http(?:s)?:\/\/)?/ const domainRegex = /(?:player\.)?(?:vimeo\.com\/)(?:(?:channels|album|ondemand|groups)\/\w+\/)?(?:video\/)?/ -const idRegex = /([\d]{6,11})/ +const idRegex = /(\d{6,11})/ const tailRegex = /(?:[?#].*)?/ const vimeoVideoUrlRegex = new RegExp( `(?:${protocolRegex.source}${domainRegex.source}${idRegex.source}${tailRegex.source})`