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

Properly ignore invalid server-side data when executing webhooks

Browse Source
This commit is contained in:
Ske 2020-03-08 10:55:47 +01:00
parent 0f8786143f
commit f8d0fb2f4b
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PluralKit.Bot/Services/WebhookExecutorService.cs
View File

@ -75,11 +75,18 @@ namespace PluralKit.Bot
timerCtx.Dispose(); timerCtx.Dispose();
var responseString = await response.Content.ReadAsStringAsync(); var responseString = await response.Content.ReadAsStringAsync();
if (responseString.StartsWith("<"))
// if the response starts with a < it's probably a CloudFlare error or similar, so just force-break
throw new WebhookExecutionErrorOnDiscordsEnd();
var responseJson = JsonConvert.DeserializeObject<JObject>(responseString); JObject responseJson;
try
{
responseJson = JsonConvert.DeserializeObject<JObject>(responseString);
}
catch (JsonReaderException)
{
// Sometimes we get invalid JSON from the server, just ignore all of it
throw new WebhookExecutionErrorOnDiscordsEnd();
}
if (responseJson.ContainsKey("code")) if (responseJson.ContainsKey("code"))
{ {
var errorCode = responseJson["code"].Value<int>(); var errorCode = responseJson["code"].Value<int>();