Skip to content
Closed
Changes from all commits
Commits
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
52 changes: 49 additions & 3 deletions src/Core/Extensions/Http.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Net.Http;
using System.Net.Sockets;
Expand Down Expand Up @@ -40,7 +42,7 @@ internal static async Task ExecuteHttpProxyOperationAsync(this HttpContext conte
throw new InvalidOperationException("Only forwarded addresses starting with 'http://' or 'https://' are supported for HTTP requests.");
}

var proxiedRequest = context.CreateProxiedHttpRequest(uri, options?.ShouldAddForwardedHeaders ?? true);
var proxiedRequest = await context.CreateProxiedHttpRequestAsync(uri, options?.ShouldAddForwardedHeaders ?? true);

if(options?.BeforeSend != null)
await options.BeforeSend(context, proxiedRequest).ConfigureAwait(false);
Expand Down Expand Up @@ -69,7 +71,45 @@ internal static async Task ExecuteHttpProxyOperationAsync(this HttpContext conte
}
}

private static HttpRequestMessage CreateProxiedHttpRequest(this HttpContext context, string uriString, bool shouldAddForwardedHeaders)
private async static Task<string> ReadRequestBodyAsStringAsync(HttpRequest request)
{
request.EnableBuffering();
request.Body.Position = 0;

using var reader = new StreamReader(request.Body, Encoding.UTF8);
var bodyString = await reader.ReadToEndAsync();
request.Body.Position = 0;

return bodyString;
}

private static string GetContentType(HttpRequest request)
{
if(request.Headers.TryGetValue("Content-Type", out var contentType))
{
return contentType.ToString();
}
return request.ContentType;
}

private static bool IsTextBasedMimeType(HttpRequest request)
{
var textBased = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
{
"application/json",
"application/xml",
"text/html",
"text/plain",
"text/css",
"text/javascript",
"text/markdown",
"text/csv"
};

return textBased.Contains(GetContentType(request));
}

private async static Task<HttpRequestMessage> CreateProxiedHttpRequestAsync(this HttpContext context, string uriString, bool shouldAddForwardedHeaders)
{
var uri = new Uri(uriString);
var request = context.Request;
Expand All @@ -89,6 +129,12 @@ private static HttpRequestMessage CreateProxiedHttpRequest(this HttpContext cont
usesStreamContent = false;
requestMessage.Content = request.Form.ToHttpContent(request);
}
else if(IsTextBasedMimeType(request))
{
usesStreamContent = false;
var bodyString = await ReadRequestBodyAsStringAsync(request);
requestMessage.Content = new StringContent(bodyString, Encoding.UTF8, GetContentType(request));
}
else
{
requestMessage.Content = new StreamContent(request.Body);
Expand Down Expand Up @@ -189,4 +235,4 @@ private static void AddForwardedHeadersToHttpRequest(HttpContext context, HttpRe
requestMessage.Headers.TryAddWithoutValidation("Forwarded", forwardedHeader.ToString());
}
}
}
}