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

Correctly check remote extension

pull/2460/head
Chocobozzz 2020-02-12 10:26:35 +01:00
parent c6de3a85ee
commit 5224f71303
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/lib/activitypub/actor.ts
View File

@ -221,9 +221,15 @@ function getAvatarInfoIfExists (actorJSON: ActivityPubActor) {
if (!icon || icon.type !== 'Image' || !isActivityPubUrlValid(icon.url)) return undefined
const extension = icon.mediaType
? mimetypes.MIMETYPE_EXT[icon.mediaType]
: extname(icon.url)
let extension: string
if (icon.mediaType) {
extension = mimetypes.MIMETYPE_EXT[icon.mediaType]
} else {
const tmp = extname(icon.url)
if (mimetypes.EXT_MIMETYPE[tmp] !== undefined) extension = tmp
}
if (!extension) return undefined