OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Simpler ID match

pull/4461/head
Chocobozzz 2021-10-11 14:57:53 +02:00
parent c55d76206c
commit e5d9877f06
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/middlewares/validators/oembed.ts
View File

@ -28,7 +28,6 @@ function buildUrls (paths: string[]) {
const startPlaylistURLs = buildUrls(playlistPaths) const startPlaylistURLs = buildUrls(playlistPaths)
const startVideoURLs = buildUrls(videoPaths) const startVideoURLs = buildUrls(videoPaths)
const watchRegex = /\/([^/]+)$/
const isURLOptions = { const isURLOptions = {
require_host: true, require_host: true,
require_tld: true require_tld: true
@ -81,9 +80,9 @@ const oembedValidator = [
const startIsOk = isVideo || isPlaylist const startIsOk = isVideo || isPlaylist
const matches = watchRegex.exec(urlPath) const parts = urlPath.split('/')
if (startIsOk === false || matches === null) { if (startIsOk === false || parts.length === 0) {
return res.fail({ return res.fail({
status: HttpStatusCode.BAD_REQUEST_400, status: HttpStatusCode.BAD_REQUEST_400,
message: 'Invalid url.', message: 'Invalid url.',
@ -93,7 +92,7 @@ const oembedValidator = [
}) })
} }
const elementId = toCompleteUUID(matches[1]) const elementId = toCompleteUUID(parts.pop())
if (isIdOrUUIDValid(elementId) === false) { if (isIdOrUUIDValid(elementId) === false) {
return res.fail({ message: 'Invalid video or playlist id.' }) return res.fail({ message: 'Invalid video or playlist id.' })
} }