liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: correctly check banner image size (don't)

Browse Source
This commit is contained in:
spiral 2021-08-06 21:41:27 -04:00
parent b8bd53f3c0
commit a5a39cba0a
No known key found for this signature in database
GPG Key ID: A6059F0CA0E1BD31
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PluralKit.Bot/Utils/AvatarUtils.cs
View File

@ -1,4 +1,4 @@
using System; using System;
using System.Linq; using System.Linq;
using System.Net.Http; using System.Net.Http;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
@ -41,11 +41,15 @@ namespace PluralKit.Bot {
if (!acceptableMimeTypes.Contains(response.Content.Headers.ContentType.MediaType)) // Check MIME type if (!acceptableMimeTypes.Contains(response.Content.Headers.ContentType.MediaType)) // Check MIME type
throw Errors.AvatarNotAnImage(response.Content.Headers.ContentType.MediaType); throw Errors.AvatarNotAnImage(response.Content.Headers.ContentType.MediaType);
if (isFullSizeImage)
// no need to do size checking on banners
return;
// Parse the image header in a worker // Parse the image header in a worker
var stream = await response.Content.ReadAsStreamAsync(); var stream = await response.Content.ReadAsStreamAsync();
var image = await Task.Run(() => Image.Identify(stream)); var image = await Task.Run(() => Image.Identify(stream));
if (image == null) throw Errors.AvatarInvalid; if (image == null) throw Errors.AvatarInvalid;
if (!isFullSizeImage && (image.Width > Limits.AvatarDimensionLimit || image.Height > Limits.AvatarDimensionLimit)) // Check image size if (image.Width > Limits.AvatarDimensionLimit || image.Height > Limits.AvatarDimensionLimit) // Check image size
throw Errors.AvatarDimensionsTooLarge(image.Width, image.Height); throw Errors.AvatarDimensionsTooLarge(image.Width, image.Height);
} }
} }