Skip to content

Commit

Permalink
Re-write commented out tests in RequestHeaderLimitsTests as Frame tes…
Browse files Browse the repository at this point in the history 
…ts (#1583).
  • Loading branch information
Cesar Blum Silveira committed Apr 5, 2017
1 parent b40d8b4 commit adea477
Show file tree
Hide file tree
Showing 2 changed files with 130 additions and 151 deletions.
153 changes: 2 additions & 151 deletions test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/RequestHeaderLimitsTests.cs
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Server.Kestrel.Core;
using Microsoft.AspNetCore.Testing;
using Microsoft.Extensions.Primitives;
using Xunit;

namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
Expand Down Expand Up @@ -80,108 +76,6 @@ public async Task ServerAcceptsRequestWithHeaderCountWithinLimit(int headerCount
}
}

//[Theory]
//[InlineData(1, 1)]
//[InlineData(5, 5)]
//[InlineData(100, 100)]
//[InlineData(600, 100)]
//[InlineData(700, 1)]
//[InlineData(1, 700)]
//public async Task ServerAcceptsHeadersAcrossSends(int header0Count, int header1Count)
//{
// var headers0 = MakeHeaders(header0Count);
// var headers1 = MakeHeaders(header1Count, header0Count);

// using (var server = CreateServer(maxRequestHeaderCount: header0Count + header1Count))
// {
// using (var connection = new TestConnection(server.Port))
// {
// await connection.SendAll("GET / HTTP/1.1\r\n");
// // Wait for parsing to start
// await WaitForCondition(TimeSpan.FromSeconds(1), () => server.Frame?.RequestHeaders != null);

// Assert.Equal(0, server.Frame.RequestHeaders.Count);

// await connection.SendAll(headers0);
// // Wait for headers to be parsed
// await WaitForCondition(TimeSpan.FromSeconds(1), () => server.Frame.RequestHeaders.Count >= header0Count);

// Assert.Equal(header0Count, server.Frame.RequestHeaders.Count);

// await connection.SendAll(headers1);
// // Wait for headers to be parsed
// await WaitForCondition(TimeSpan.FromSeconds(1), () => server.Frame.RequestHeaders.Count >= header0Count + header1Count);

// Assert.Equal(header0Count + header1Count, server.Frame.RequestHeaders.Count);

// await connection.SendAll("\r\n");
// await connection.ReceiveEnd(
// "HTTP/1.1 200 OK",
// $"Date: {server.Context.DateHeaderValue}",
// "Transfer-Encoding: chunked",
// "",
// "c",
// "hello, world",
// "0",
// "",
// "");
// }
// }
//}

//[Theory]
//[InlineData(1, 1)]
//[InlineData(5, 5)]
//public async Task ServerKeepsSameHeaderCollectionAcrossSends(int header0Count, int header1Count)
//{
// var headers0 = MakeHeaders(header0Count);
// var headers1 = MakeHeaders(header0Count, header1Count);

// using (var server = CreateServer(maxRequestHeaderCount: header0Count + header1Count))
// {
// using (var connection = new TestConnection(server.Port))
// {
// await connection.SendAll("GET / HTTP/1.1\r\n");
// // Wait for parsing to start
// await WaitForCondition(TimeSpan.FromSeconds(1), () => server.Frame?.RequestHeaders != null);

// Assert.Equal(0, server.Frame.RequestHeaders.Count);

// var newRequestHeaders = new RequestHeadersWrapper(server.Frame.RequestHeaders);
// server.Frame.RequestHeaders = newRequestHeaders;

// Assert.Same(newRequestHeaders, server.Frame.RequestHeaders);

// await connection.SendAll(headers0);
// // Wait for headers to be parsed
// await WaitForCondition(TimeSpan.FromSeconds(1), () => server.Frame.RequestHeaders.Count >= header0Count);

// Assert.Same(newRequestHeaders, server.Frame.RequestHeaders);
// Assert.Equal(header0Count, server.Frame.RequestHeaders.Count);

// await connection.SendAll(headers1);
// // Wait for headers to be parsed
// await WaitForCondition(TimeSpan.FromSeconds(1), () => server.Frame.RequestHeaders.Count >= header0Count + header1Count);

// Assert.Equal(header0Count + header1Count, server.Frame.RequestHeaders.Count);

// Assert.Same(newRequestHeaders, server.Frame.RequestHeaders);

// await connection.SendAll("\r\n");
// await connection.ReceiveEnd(
// "HTTP/1.1 200 OK",
// $"Date: {server.Context.DateHeaderValue}",
// "Transfer-Encoding: chunked",
// "",
// "c",
// "hello, world",
// "0",
// "",
// "");
// }
// }
//}

[Theory]
[InlineData(1)]
[InlineData(5)]
Expand Down Expand Up @@ -229,26 +123,11 @@ public async Task ServerRejectsRequestWithHeaderCountOverLimit(int headerCount,
}
}

private static async Task WaitForCondition(TimeSpan timeout, Func<bool> condition)
{
const int MaxWaitLoop = 150;

var delay = (int)Math.Ceiling(timeout.TotalMilliseconds / MaxWaitLoop);

var waitLoop = 0;
while (waitLoop < MaxWaitLoop && !condition())
{
// Wait for parsing condition to trigger
await Task.Delay(delay);
waitLoop++;
}
}

private static string MakeHeaders(int count, int startAt = 0)
private static string MakeHeaders(int count)
{
return string.Join("", Enumerable
.Range(0, count)
.Select(i => $"Header-{startAt + i}: value{startAt + i}\r\n"));
.Select(i => $"Header-{i}: value{i}\r\n"));
}

private TestServer CreateServer(int? maxRequestHeaderCount = null, int? maxRequestHeadersTotalSize = null)
Expand All @@ -270,33 +149,5 @@ private TestServer CreateServer(int? maxRequestHeaderCount = null, int? maxReque
ServerOptions = options
});
}

private class RequestHeadersWrapper : IHeaderDictionary
{
IHeaderDictionary _innerHeaders;

public RequestHeadersWrapper(IHeaderDictionary headers)
{
_innerHeaders = headers;
}

public StringValues this[string key] { get => _innerHeaders[key]; set => _innerHeaders[key] = value; }
public long? ContentLength { get => _innerHeaders.ContentLength; set => _innerHeaders.ContentLength = value; }
public ICollection<string> Keys => _innerHeaders.Keys;
public ICollection<StringValues> Values => _innerHeaders.Values;
public int Count => _innerHeaders.Count;
public bool IsReadOnly => _innerHeaders.IsReadOnly;
public void Add(string key, StringValues value) => _innerHeaders.Add(key, value);
public void Add(KeyValuePair<string, StringValues> item) => _innerHeaders.Add(item);
public void Clear() => _innerHeaders.Clear();
public bool Contains(KeyValuePair<string, StringValues> item) => _innerHeaders.Contains(item);
public bool ContainsKey(string key) => _innerHeaders.ContainsKey(key);
public void CopyTo(KeyValuePair<string, StringValues>[] array, int arrayIndex) => _innerHeaders.CopyTo(array, arrayIndex);
public IEnumerator<KeyValuePair<string, StringValues>> GetEnumerator() => _innerHeaders.GetEnumerator();
public bool Remove(string key) => _innerHeaders.Remove(key);
public bool Remove(KeyValuePair<string, StringValues> item) => _innerHeaders.Remove(item);
public bool TryGetValue(string key, out StringValues value) => _innerHeaders.TryGetValue(key, out value);
IEnumerator IEnumerable.GetEnumerator() => _innerHeaders.GetEnumerator();
}
}
}
128 changes: 128 additions & 0 deletions test/Microsoft.AspNetCore.Server.KestrelTests/FrameTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.IO.Pipelines;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading;
Expand All @@ -20,6 +22,7 @@
using Microsoft.AspNetCore.Testing;
using Microsoft.Extensions.Internal;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Primitives;
using Moq;
using Xunit;

Expand Down Expand Up @@ -640,6 +643,103 @@ public async Task ExceptionDetailNotIncludedWhenLogLevelInformationNotEnabled()
}
}

[Theory]
[InlineData(1, 1)]
[InlineData(5, 5)]
[InlineData(100, 100)]
[InlineData(600, 100)]
[InlineData(700, 1)]
[InlineData(1, 700)]
public async Task AcceptsHeadersAcrossSends(int header0Count, int header1Count)
{
_serviceContext.ServerOptions.Limits.MaxRequestHeaderCount = header0Count + header1Count;

var headers0 = MakeHeaders(header0Count);
var headers1 = MakeHeaders(header1Count, header0Count);

var requestProcessingTask = _frame.RequestProcessingAsync();

await _input.Writer.WriteAsync(Encoding.ASCII.GetBytes("GET / HTTP/1.0\r\n"));
await WaitForCondition(TimeSpan.FromSeconds(1), () => _frame.RequestHeaders != null);
Assert.Equal(0, _frame.RequestHeaders.Count);

await _input.Writer.WriteAsync(Encoding.ASCII.GetBytes(headers0));
await WaitForCondition(TimeSpan.FromSeconds(1), () => _frame.RequestHeaders.Count >= header0Count);
Assert.Equal(header0Count, _frame.RequestHeaders.Count);

await _input.Writer.WriteAsync(Encoding.ASCII.GetBytes(headers1));
await WaitForCondition(TimeSpan.FromSeconds(1), () => _frame.RequestHeaders.Count >= header0Count + header1Count);
Assert.Equal(header0Count + header1Count, _frame.RequestHeaders.Count);

await _input.Writer.WriteAsync(Encoding.ASCII.GetBytes("\r\n"));
Assert.Equal(header0Count + header1Count, _frame.RequestHeaders.Count);

await requestProcessingTask.TimeoutAfter(TimeSpan.FromSeconds(10));
}

[Theory]
[InlineData(1, 1)]
[InlineData(5, 5)]
[InlineData(100, 100)]
[InlineData(600, 100)]
[InlineData(700, 1)]
[InlineData(1, 700)]
public async Task KeepsSameHeaderCollectionAcrossSends(int header0Count, int header1Count)
{
_serviceContext.ServerOptions.Limits.MaxRequestHeaderCount = header0Count + header1Count;

var headers0 = MakeHeaders(header0Count);
var headers1 = MakeHeaders(header1Count, header0Count);

var requestProcessingTask = _frame.RequestProcessingAsync();

await _input.Writer.WriteAsync(Encoding.ASCII.GetBytes("GET / HTTP/1.0\r\n"));
await WaitForCondition(TimeSpan.FromSeconds(1), () => _frame.RequestHeaders != null);
Assert.Equal(0, _frame.RequestHeaders.Count);

var newRequestHeaders = new RequestHeadersWrapper(_frame.RequestHeaders);
_frame.RequestHeaders = newRequestHeaders;
Assert.Same(newRequestHeaders, _frame.RequestHeaders);

await _input.Writer.WriteAsync(Encoding.ASCII.GetBytes(headers0));
await WaitForCondition(TimeSpan.FromSeconds(1), () => _frame.RequestHeaders.Count >= header0Count);
Assert.Same(newRequestHeaders, _frame.RequestHeaders);
Assert.Equal(header0Count, _frame.RequestHeaders.Count);

await _input.Writer.WriteAsync(Encoding.ASCII.GetBytes(headers1));
await WaitForCondition(TimeSpan.FromSeconds(1), () => _frame.RequestHeaders.Count >= header0Count + header1Count);
Assert.Same(newRequestHeaders, _frame.RequestHeaders);
Assert.Equal(header0Count + header1Count, _frame.RequestHeaders.Count);

await _input.Writer.WriteAsync(Encoding.ASCII.GetBytes("\r\n"));
Assert.Same(newRequestHeaders, _frame.RequestHeaders);
Assert.Equal(header0Count + header1Count, _frame.RequestHeaders.Count);

await requestProcessingTask.TimeoutAfter(TimeSpan.FromSeconds(10));
}

private static async Task WaitForCondition(TimeSpan timeout, Func<bool> condition)
{
const int MaxWaitLoop = 150;

var delay = (int)Math.Ceiling(timeout.TotalMilliseconds / MaxWaitLoop);

var waitLoop = 0;
while (waitLoop < MaxWaitLoop && !condition())
{
// Wait for parsing condition to trigger
await Task.Delay(delay);
waitLoop++;
}
}

private static string MakeHeaders(int count, int startAt = 0)
{
return string.Join("", Enumerable
.Range(0, count)
.Select(i => $"Header-{startAt + i}: value{startAt + i}\r\n"));
}

public static IEnumerable<object> RequestLineValidData => HttpParsingData.RequestLineValidData;

public static IEnumerable<object> RequestLineDotSegmentData => HttpParsingData.RequestLineDotSegmentData;
Expand Down Expand Up @@ -719,5 +819,33 @@ private class MockConnectionInformation : IConnectionInformation
public IScheduler OutputReaderScheduler { get; }
public ITimeoutControl TimeoutControl { get; set; } = Mock.Of<ITimeoutControl>();
}

private class RequestHeadersWrapper : IHeaderDictionary
{
IHeaderDictionary _innerHeaders;

public RequestHeadersWrapper(IHeaderDictionary headers)
{
_innerHeaders = headers;
}

public StringValues this[string key] { get => _innerHeaders[key]; set => _innerHeaders[key] = value; }
public long? ContentLength { get => _innerHeaders.ContentLength; set => _innerHeaders.ContentLength = value; }
public ICollection<string> Keys => _innerHeaders.Keys;
public ICollection<StringValues> Values => _innerHeaders.Values;
public int Count => _innerHeaders.Count;
public bool IsReadOnly => _innerHeaders.IsReadOnly;
public void Add(string key, StringValues value) => _innerHeaders.Add(key, value);
public void Add(KeyValuePair<string, StringValues> item) => _innerHeaders.Add(item);
public void Clear() => _innerHeaders.Clear();
public bool Contains(KeyValuePair<string, StringValues> item) => _innerHeaders.Contains(item);
public bool ContainsKey(string key) => _innerHeaders.ContainsKey(key);
public void CopyTo(KeyValuePair<string, StringValues>[] array, int arrayIndex) => _innerHeaders.CopyTo(array, arrayIndex);
public IEnumerator<KeyValuePair<string, StringValues>> GetEnumerator() => _innerHeaders.GetEnumerator();
public bool Remove(string key) => _innerHeaders.Remove(key);
public bool Remove(KeyValuePair<string, StringValues> item) => _innerHeaders.Remove(item);
public bool TryGetValue(string key, out StringValues value) => _innerHeaders.TryGetValue(key, out value);
IEnumerator IEnumerable.GetEnumerator() => _innerHeaders.GetEnumerator();
}
}
}

0 comments on commit adea477

Please sign in to comment.