#80 - Add CancellationToken to GetClientCertAsyc, GetFormAsync.

Author: Tratcher

src/Microsoft.AspNet.Http/HttpRequest.cs

@@ -63,10 +63,19 @@ public abstract class HttpRequest
         public abstract IReadableStringCollection Query { get; }
 
         /// <summary>
-        /// Gets the query value collection form collection.
+        /// Gets the form collection.
         /// </summary>
         /// <returns>The form collection parsed from the request body.</returns>
-        public abstract Task<IReadableStringCollection> GetFormAsync();
+        public virtual Task<IReadableStringCollection> GetFormAsync()
+        {
+            return GetFormAsync(CancellationToken.None);
+        }
+
+        /// <summary>
+        /// Gets the form collection.
+        /// </summary>
+        /// <returns>The form collection parsed from the request body.</returns>
+        public abstract Task<IReadableStringCollection> GetFormAsync(CancellationToken cancel);
 
         /// <summary>
         /// Gets or set the owin.RequestProtocol.

src/Microsoft.AspNet.HttpFeature/IHttpClientCertificateFeature.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Security.Cryptography.X509Certificates;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Framework.Runtime;
 
@@ -19,6 +20,6 @@ public interface IHttpClientCertificateFeature
         /// Asynchronously retrieves the client certificate, if any.
         /// </summary>
         /// <returns></returns>
-        Task<X509Certificate> GetClientCertificateAsync();
+        Task<X509Certificate> GetClientCertificateAsync(CancellationToken cancel);
     }
 }

src/Microsoft.AspNet.Owin/OwinEnvironment.cs

@@ -69,7 +69,8 @@ public OwinEnvironment(HttpContext context)
             {
                 _entries.Add(OwinConstants.CommonKeys.ClientCertificate, new FeatureMap<IHttpClientCertificateFeature>(feature => feature.ClientCertificate,
                     (feature, value) => feature.ClientCertificate = (X509Certificate)value));
-                _entries.Add(OwinConstants.CommonKeys.LoadClientCertAsync, new FeatureMap<IHttpClientCertificateFeature>(feature => new Func<Task>(feature.GetClientCertificateAsync)));
+                _entries.Add(OwinConstants.CommonKeys.LoadClientCertAsync, new FeatureMap<IHttpClientCertificateFeature>(
+                    feature => new Func<Task>(() => feature.GetClientCertificateAsync(CancellationToken.None))));
             }
 
             _context.Items[typeof(HttpContext).FullName] = _context; // Store for lookup when we transition back out of OWIN

src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs

@@ -203,7 +203,7 @@ X509Certificate IHttpClientCertificateFeature.ClientCertificate
             set { Prop(OwinConstants.CommonKeys.ClientCertificate, value); }
         }
 
-        Task<X509Certificate> IHttpClientCertificateFeature.GetClientCertificateAsync()
+        Task<X509Certificate> IHttpClientCertificateFeature.GetClientCertificateAsync(CancellationToken cancel)
         {
             throw new NotImplementedException();
         }

src/Microsoft.AspNet.PipelineCore/DefaultHttpRequest.cs

@@ -129,9 +129,9 @@ public override IReadableStringCollection Query
             get { return QueryFeature.Query; }
         }
 
-        public override Task<IReadableStringCollection> GetFormAsync()
+        public override Task<IReadableStringCollection> GetFormAsync(CancellationToken cancel)
         {
-            return FormFeature.GetFormAsync();
+            return FormFeature.GetFormAsync(cancel);
         }
 
         public override string Protocol

src/Microsoft.AspNet.PipelineCore/FormFeature.cs

@@ -3,9 +3,10 @@
 
 using System.IO;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http;
 using Microsoft.AspNet.FeatureModel;
+using Microsoft.AspNet.Http;
 using Microsoft.AspNet.HttpFeature;
 using Microsoft.AspNet.PipelineCore.Collections;
 using Microsoft.AspNet.PipelineCore.Infrastructure;
@@ -24,14 +25,22 @@ public FormFeature(IFeatureCollection features)
             _features = features;
         }
 
-        public async Task<IReadableStringCollection> GetFormAsync()
+        public async Task<IReadableStringCollection> GetFormAsync(CancellationToken cancel)
         {
             var body = _request.Fetch(_features).Body;
 
             if (_bodyStream == null || _bodyStream != body)
             {
                 _bodyStream = body;
-                using (var streamReader = new StreamReader(body, Encoding.UTF8,
+                if (!_bodyStream.CanSeek)
+                {
+                    MemoryStream buffer = new MemoryStream();
+                    await _bodyStream.CopyToAsync(buffer, 4096, cancel);
+                    _bodyStream = buffer;
+                    _request.Fetch(_features).Body = _bodyStream;
+                    _bodyStream.Seek(0, SeekOrigin.Begin);
+                }
+                using (var streamReader = new StreamReader(_bodyStream, Encoding.UTF8,
                                                            detectEncodingFromByteOrderMarks: true,
                                                            bufferSize: 1024, leaveOpen: true))
                 {

src/Microsoft.AspNet.PipelineCore/IFormFeature.cs

@@ -1,13 +1,14 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 
 namespace Microsoft.AspNet.PipelineCore
 {
     public interface IFormFeature
     {
-        Task<IReadableStringCollection> GetFormAsync();
+        Task<IReadableStringCollection> GetFormAsync(CancellationToken cancel);
     }
 }

test/Microsoft.AspNet.PipelineCore.Tests/FormFeatureTests.cs

@@ -3,6 +3,7 @@
 
 using System.IO;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.FeatureModel;
 using Microsoft.AspNet.HttpFeature;
@@ -29,7 +30,7 @@ public async Task GetFormAsync_ReturnsParsedFormCollection()
             var provider = new FormFeature(features.Object);
 
             // Act
-            var formCollection = await provider.GetFormAsync();
+            var formCollection = await provider.GetFormAsync(CancellationToken.None);
 
             // Assert
             Assert.Equal("bar", formCollection["foo"]);
@@ -53,16 +54,16 @@ public async Task GetFormAsync_CachesFormCollectionPerBodyStream()
             var provider = new FormFeature(features.Object);
 
             // Act - 1
-            var formCollection = await provider.GetFormAsync();
+            var formCollection = await provider.GetFormAsync(CancellationToken.None);
 
             // Assert - 1
             Assert.Equal("bar", formCollection["foo"]);
             Assert.Equal("2", formCollection["baz"]);
-            Assert.Same(formCollection, await provider.GetFormAsync());
+            Assert.Same(formCollection, await provider.GetFormAsync(CancellationToken.None));
 
             // Act - 2
             request.SetupGet(r => r.Body).Returns(new MemoryStream(formContent2));
-            formCollection = await provider.GetFormAsync();
+            formCollection = await provider.GetFormAsync(CancellationToken.None);
 
             // Assert - 2
             Assert.Equal("value", formCollection["collection2"]);