oliverbooth/VPLink
oliverbooth
/
VPLink
mirror of https://github.com/oliverbooth/VPLink
1
0
Fork 0
Code Issues Wiki

fix: validate reply and attachment length (fixes #4)

This commit is contained in:
Oliver Booth 2024-02-14 22:29:10 +00:00
parent a88edcc47b
commit 231ed19eca
Signed by: oliverbooth
GPG Key ID: E60B570D1B7557B5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
VPLink/Services/DiscordMessageService.cs
View File

@ -121,7 +121,7 @@ internal sealed class DiscordMessageService : BackgroundService, IDiscordMessage
replyContent = builder.ToString(); replyContent = builder.ToString();
messages.Add(new RelayedMessage(null!, $"↩️ Replying to {name}:", true)); messages.Add(new RelayedMessage(null!, $"↩️ Replying to {name}:", true));
messages.Add(new RelayedMessage(null!, replyContent, true)); AddMessage(messages, null, replyContent, true);
} }
} }
@ -137,7 +137,7 @@ internal sealed class DiscordMessageService : BackgroundService, IDiscordMessage
IReadOnlyCollection<IAttachment> attachments = message.Attachments; IReadOnlyCollection<IAttachment> attachments = message.Attachments;
foreach (IAttachment attachment in attachments) foreach (IAttachment attachment in attachments)
{ {
messages.Add(new RelayedMessage(displayName, attachment.Url, false)); AddMessage(messages, displayName, attachment.Url);
} }
messages.ForEach(_messageReceived.OnNext); messages.ForEach(_messageReceived.OnNext);
@ -145,7 +145,7 @@ internal sealed class DiscordMessageService : BackgroundService, IDiscordMessage
return Task.CompletedTask; return Task.CompletedTask;
} }
private static void AddMessage(ICollection<RelayedMessage> messages, string displayName, string content) private static void AddMessage(ICollection<RelayedMessage> messages, string? displayName, string content, bool isReply = false)
{ {
int byteCount = Utf8Encoding.GetByteCount(content); int byteCount = Utf8Encoding.GetByteCount(content);
Span<byte> buffer = stackalloc byte[byteCount]; Span<byte> buffer = stackalloc byte[byteCount];
@ -156,7 +156,7 @@ internal sealed class DiscordMessageService : BackgroundService, IDiscordMessage
{ {
int length = Math.Min(byteCount - offset, 255); // VP message length limit int length = Math.Min(byteCount - offset, 255); // VP message length limit
Span<byte> slice = buffer.Slice(offset, length); Span<byte> slice = buffer.Slice(offset, length);
messages.Add(new RelayedMessage(displayName, Utf8Encoding.GetString(slice), false)); messages.Add(new RelayedMessage(displayName, Utf8Encoding.GetString(slice), isReply));
offset += length; offset += length;
} }
} }