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

fix(apiv2): correctly parse timestamp in SwitchPatch

Browse Source
This commit is contained in:
spiral 2021-10-13 08:59:42 -04:00
parent 098d804344
commit 431f7e8931
No known key found for this signature in database
GPG Key ID: A6059F0CA0E1BD31
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PluralKit.API/Controllers/v2/SwitchControllerV2.cs
View File

@ -163,11 +163,13 @@ namespace PluralKit.API
if (!Guid.TryParse(switchRef, out var switchId)) if (!Guid.TryParse(switchRef, out var switchId))
throw APIErrors.InvalidSwitchId; throw APIErrors.InvalidSwitchId;
var value = data.Value<Instant>("timestamp"); var valueStr = data.Value<string>("timestamp").NullIfEmpty();
if (value == null) if (valueStr == null)
// todo // todo
throw APIErrors.GenericBadRequest; throw APIErrors.GenericBadRequest;
var value = Instant.FromDateTimeOffset(DateTime.Parse(valueStr).ToUniversalTime());
var system = await ResolveSystem("@me"); var system = await ResolveSystem("@me");
if (system == null) if (system == null)
throw APIErrors.SystemNotFound; throw APIErrors.SystemNotFound;

5
PluralKit.API/Startup.cs
View File

@ -140,7 +140,10 @@ namespace PluralKit.API
var exc = ctx.Features.Get<IExceptionHandlerPathFeature>(); var exc = ctx.Features.Get<IExceptionHandlerPathFeature>();
// handle common ISEs that are generated by invalid user input // handle common ISEs that are generated by invalid user input
if (exc.Error is InvalidCastException && exc.Error.Message.Contains("Newtonsoft.Json")) if (
(exc.Error is InvalidCastException && exc.Error.Message.Contains("Newtonsoft.Json"))
|| (exc.Error is FormatException && exc.Error.Message.Contains("was not recognized as a valid DateTime"))
)
{ {
ctx.Response.StatusCode = 400; ctx.Response.StatusCode = 400;
await ctx.Response.WriteAsync("{\"message\":\"400: Bad Request\",\"code\":0}"); await ctx.Response.WriteAsync("{\"message\":\"400: Bad Request\",\"code\":0}");