sam/Foxchat.NET
sam/Foxchat.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

add FoxchatError type

Browse source
This commit is contained in:
sam 2024-05-14 14:50:01 +02:00
parent f6629fbb33
commit d34c41a126
Signed by: sam
GPG key ID: B4EF20DDE721CAA1
7 changed files with 42 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Foxchat.Core/Federation/RequestSigningService.Client.cs
View file

@ -1,4 +1,5 @@
using System.Net.Http.Headers;
using Foxchat.Core.Models;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
@ -9,9 +10,6 @@ public partial class RequestSigningService
public const string USER_AGENT_HEADER = "User-Agent";
public const string USER_AGENT = "Foxchat.NET";
public const string DATE_HEADER = "Date";
public const string CONTENT_LENGTH_HEADER = "Content-Length";
public const string CONTENT_TYPE_HEADER = "Content-Type";
public const string CONTENT_TYPE = "application/json; charset=utf-8";
public const string SERVER_HEADER = "X-Foxchat-Server";
public const string SIGNATURE_HEADER = "X-Foxchat-Signature";
@ -28,19 +26,16 @@ public partial class RequestSigningService
public async Task<T> RequestAsync<T>(HttpMethod method, string domain, string requestPath, string? userId = null, object? body = null)
{
var request = BuildHttpRequest(method, domain, requestPath, userId, body);
_logger.Debug("Content length in header: '{ContentLength}'", request.Headers.Where(c => c.Key == "Content-Length"));
var resp = await _httpClient.SendAsync(request);
if (!resp.IsSuccessStatusCode)
{
var error = await resp.Content.ReadAsStringAsync();
_logger.Error("Received {Status}, body: {Error}", resp.StatusCode, error);
// TODO: replace this with specific exception type
throw new Exception("oh no a request error");
throw new FoxchatError.OutgoingFederationError($"Request to {domain}/{requestPath} returned an error", DeserializeObject<ApiError>(error));
}
var bodyString = await resp.Content.ReadAsStringAsync();
// TODO: replace this with specific exception type
return DeserializeObject<T>(bodyString) ?? throw new Exception("oh no invalid json");
return DeserializeObject<T>(bodyString)
?? throw new FoxchatError.OutgoingFederationError($"Request to {domain}/{requestPath} returned invalid response body");
}
private HttpRequestMessage BuildHttpRequest(HttpMethod method, string domain, string requestPath, string? userId = null, object? bodyData = null)

10
Foxchat.Core/Federation/RequestSigningService.cs
View file

@ -27,7 +27,7 @@ public partial class RequestSigningService(ILogger logger, IClock clock, IDataba
formatter.SetHashAlgorithm(nameof(SHA256));
var signature = formatter.CreateSignature(hash);
_logger.Debug("Generated signature for {Host} {RequestPath}: {Signature}", data.Host, data.RequestPath, WebEncoders.Base64UrlEncode(signature));
_logger.Debug("Generated signature for {Host} {RequestPath}", data.Host, data.RequestPath);
return WebEncoders.Base64UrlEncode(signature);
}
@ -41,13 +41,11 @@ public partial class RequestSigningService(ILogger logger, IClock clock, IDataba
var time = ParseTime(dateHeader);
if ((now + Duration.FromMinutes(1)) < time)
{
// TODO: replace this with specific exception type
throw new Exception("Request was made in the future");
throw new FoxchatError.IncomingFederationError("Request was made in the future");
}
else if ((now - Duration.FromMinutes(1)) > time)
{
// TODO: replace this with specific exception type
throw new Exception("Request was made too long ago");
throw new FoxchatError.IncomingFederationError("Request was made too long ago");
}
var plaintext = GeneratePlaintext(new SignatureData(time, host, requestPath, contentLength, userId));
@ -67,8 +65,6 @@ public partial class RequestSigningService(ILogger logger, IClock clock, IDataba
var contentLength = data.ContentLength != null ? data.ContentLength.ToString() : "";
var userId = data.UserId ?? "";
Log.Information("Plaintext string: {Plaintext}", $"{time}:{data.Host}:{data.RequestPath}:{contentLength}:{userId}");
return $"{time}:{data.Host}:{data.RequestPath}:{contentLength}:{userId}";
}

2
Foxchat.Core/Federation/SignatureData.cs
View file

@ -8,4 +8,4 @@ public record SignatureData(
string RequestPath,
int? ContentLength,
string? UserId
) { }
);