Skip to content

Add validation http requests #668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alanmcgovern merged 2 commits into from
Aug 4, 2024
Merged

Add validation http requests #668

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad628e8
RequestMessages aren't always sequential or adjacent. Break the reque…
borigas Mar 5, 2023
0abb8c0
Tweak prior commit to raise an error instead
alanmcgovern Aug 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 35 additions & 12 deletions src/MonoTorrent.Client/MonoTorrent.Connections/HttpPeerConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
using System.Threading;
using System.Threading.Tasks;

using MonoTorrent.Logging;
using MonoTorrent.Messages;
using MonoTorrent.Messages.Peer;

Expand All @@ -44,6 +45,8 @@ namespace MonoTorrent.Connections.Peer
{
sealed class HttpPeerConnection : IPeerConnection
{
static readonly Logger Log = Logger.Create (nameof (HttpPeerConnection));

static readonly Uri PaddingFileUri = new Uri ("http://__paddingfile__");

class HttpRequestData
Expand Down Expand Up @@ -305,17 +308,20 @@ public async ReusableTask<int> SendAsync (Memory<byte> socketBuffer)
{
SendResult = new TaskCompletionSource<object?> ();

var info = TorrentData.TorrentInfo;
List<BlockInfo> bundle = DecodeMessages (socketBuffer.Span);
if (bundle.Count > 0) {
RequestMessages.AddRange (bundle);
// The RequestMessages are always sequential
BlockInfo start = RequestMessages[0];
BlockInfo end = RequestMessages[RequestMessages.Count - 1];
CreateWebRequests (start, end);
} else {

// If the messages in the send buffer are anything *other* than piece request messages,
// just pretend the bytes were sent and everything was fine.
if (bundle.Count == 0 || info == null)
return socketBuffer.Length;
}

// Otherwise, if there were 1 or more piece request messages, convert these to HTTP requests.
// and only mark the bytes as successfully sent after all webrequests have run to completion
// and the data has been received.
RequestMessages.AddRange (bundle);
ValidateWebRequests (info, RequestMessages.ToArray ());
CreateWebRequestsForSequentialRange (RequestMessages[0], RequestMessages[RequestMessages.Count - 1]);
ReceiveWaiter.Set ();
await SendResult.Task;
return socketBuffer.Length;
Expand All @@ -334,8 +340,26 @@ static List<BlockInfo> DecodeMessages (ReadOnlySpan<byte> buffer)
return messages;
}

static void ValidateWebRequests (ITorrentInfo torrentInfo, BlockInfo[] blocks)
{
if (blocks.Length > 0) {
BlockInfo startBlock = blocks[0];
BlockInfo currentBlock = startBlock;
for (int i = 1; i < blocks.Length; i++) {
BlockInfo previousBlock = blocks[i - 1];
currentBlock = blocks[i];
long endOffsetOfPreviousEndBlock = torrentInfo.PieceIndexToByteOffset (previousBlock.PieceIndex) + previousBlock.StartOffset + previousBlock.RequestLength;
long startOffsetOfCurrentBlock = torrentInfo.PieceIndexToByteOffset (currentBlock.PieceIndex) + currentBlock.StartOffset;
if (endOffsetOfPreviousEndBlock != startOffsetOfCurrentBlock) {
var msg = "Piece requests made from HTTP peers must be a strictly sequential range of blocks. The range must be 1 or more blocks long.";
Log.Error (msg);
throw new InvalidOperationException (msg);
}
}
}
}

void CreateWebRequests (BlockInfo start, BlockInfo end)
void CreateWebRequestsForSequentialRange (BlockInfo start, BlockInfo end)
{
Uri uri = Uri;

Expand All @@ -354,11 +378,10 @@ void CreateWebRequests (BlockInfo start, BlockInfo end)
if (count == 0)
break;

var lengthWithPadding = file.Length + file.Padding;
// If the first byte of data is from the next file, move to the next file immediately
// and adjust start offset to be relative to that file.
if (startOffset >= lengthWithPadding) {
startOffset -= lengthWithPadding;
if (startOffset >= file.Length + file.Padding) {
startOffset -= file.Length + file.Padding;
continue;
}

Expand Down