From c035f2baa1f3537d298a6559d15bd7ca40188e5d Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 12 Nov 2016 01:58:50 -0500
Subject: update responses

---
 ServiceStack/HttpResponseExtensionsInternal.cs | 90 ++++----------------------
 1 file changed, 14 insertions(+), 76 deletions(-)

(limited to 'ServiceStack/HttpResponseExtensionsInternal.cs')

diff --git a/ServiceStack/HttpResponseExtensionsInternal.cs b/ServiceStack/HttpResponseExtensionsInternal.cs
index 1195f63ca..88b82bdf6 100644
--- a/ServiceStack/HttpResponseExtensionsInternal.cs
+++ b/ServiceStack/HttpResponseExtensionsInternal.cs
@@ -33,8 +33,11 @@ namespace ServiceStack
             var stream = result as Stream;
             if (stream != null)
             {
-                WriteTo(stream, response.OutputStream);
-                return true;
+                using (stream)
+                {
+                    await stream.CopyToAsync(response.OutputStream).ConfigureAwait(false);
+                    return true;
+                }
             }
 
             var bytes = result as byte[];
@@ -43,35 +46,13 @@ namespace ServiceStack
                 response.ContentType = "application/octet-stream";
                 response.SetContentLength(bytes.Length);
 
-                response.OutputStream.Write(bytes, 0, bytes.Length);
+                await response.OutputStream.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
                 return true;
             }
 
             return false;
         }
 
-        public static long WriteTo(Stream inStream, Stream outStream)
-        {
-            var memoryStream = inStream as MemoryStream;
-            if (memoryStream != null)
-            {
-                memoryStream.WriteTo(outStream);
-                return memoryStream.Position;
-            }
-
-            var data = new byte[4096];
-            long total = 0;
-            int bytesRead;
-
-            while ((bytesRead = inStream.Read(data, 0, data.Length)) > 0)
-            {
-                outStream.Write(data, 0, bytesRead);
-                total += bytesRead;
-            }
-
-            return total;
-        }
-
         /// <summary>
         /// End a ServiceStack Request with no content
         /// </summary>
@@ -85,7 +66,7 @@ namespace ServiceStack
             httpRes.SetContentLength(0);
         }
 
-        public static Task WriteToResponse(this IResponse httpRes, MediaBrowser.Model.Services.IRequest httpReq, object result)
+        public static Task WriteToResponse(this IResponse httpRes, IRequest httpReq, object result)
         {
             if (result == null)
             {
@@ -98,19 +79,10 @@ namespace ServiceStack
             {
                 httpResult.RequestContext = httpReq;
                 httpReq.ResponseContentType = httpResult.ContentType ?? httpReq.ResponseContentType;
-                var httpResSerializer = ContentTypes.Instance.GetResponseSerializer(httpReq.ResponseContentType);
-                return httpRes.WriteToResponse(httpResult, httpResSerializer, httpReq);
+                return httpRes.WriteToResponseInternal(httpResult, httpReq);
             }
 
-            var serializer = ContentTypes.Instance.GetResponseSerializer(httpReq.ResponseContentType);
-            return httpRes.WriteToResponse(result, serializer, httpReq);
-        }
-
-        private static object GetDto(object response)
-        {
-            if (response == null) return null;
-            var httpResult = response as IHttpResult;
-            return httpResult != null ? httpResult.Response : response;
+            return httpRes.WriteToResponseInternal(result, httpReq);
         }
 
         /// <summary>
@@ -119,17 +91,11 @@ namespace ServiceStack
         /// </summary>
         /// <param name="response">The response.</param>
         /// <param name="result">Whether or not it was implicity handled by ServiceStack's built-in handlers.</param>
-        /// <param name="defaultAction">The default action.</param>
         /// <param name="request">The serialization context.</param>
         /// <returns></returns>
-        public static async Task WriteToResponse(this IResponse response, object result, Action<IRequest, object, IResponse> defaultAction, MediaBrowser.Model.Services.IRequest request)
+        private static async Task WriteToResponseInternal(this IResponse response, object result, IRequest request)
         {
             var defaultContentType = request.ResponseContentType;
-            if (result == null)
-            {
-                response.EndRequestWithNoContent();
-                return;
-            }
 
             var httpResult = result as IHttpResult;
             if (httpResult != null)
@@ -137,10 +103,8 @@ namespace ServiceStack
                 if (httpResult.RequestContext == null)
                     httpResult.RequestContext = request;
 
-                response.Dto = response.Dto ?? GetDto(httpResult);
-
                 response.StatusCode = httpResult.Status;
-                response.StatusDescription = httpResult.StatusDescription ?? httpResult.StatusCode.ToString();
+                response.StatusDescription = httpResult.StatusCode.ToString();
                 if (string.IsNullOrEmpty(httpResult.ContentType))
                 {
                     httpResult.ContentType = defaultContentType;
@@ -159,21 +123,12 @@ namespace ServiceStack
                     }
                 }
             }
-            else
-            {
-                response.Dto = result;
-            }
 
-            /* Mono Error: Exception: Method not found: 'System.Web.HttpResponse.get_Headers' */
             var responseOptions = result as IHasHeaders;
             if (responseOptions != null)
             {
-                //Reserving options with keys in the format 'xx.xxx' (No Http headers contain a '.' so its a safe restriction)
-                const string reservedOptions = ".";
-
                 foreach (var responseHeaders in responseOptions.Headers)
                 {
-                    if (responseHeaders.Key.Contains(reservedOptions)) continue;
                     if (responseHeaders.Key == "Content-Length")
                     {
                         response.SetContentLength(long.Parse(responseHeaders.Value));
@@ -196,42 +151,25 @@ namespace ServiceStack
                 response.ContentType += "; charset=utf-8";
             }
 
-            var disposableResult = result as IDisposable;
             var writeToOutputStreamResult = await WriteToOutputStream(response, result).ConfigureAwait(false);
             if (writeToOutputStreamResult)
             {
                 response.Flush(); //required for Compression
-                if (disposableResult != null) disposableResult.Dispose();
                 return;
             }
 
-            if (httpResult != null)
-                result = httpResult.Response;
-
             var responseText = result as string;
             if (responseText != null)
             {
                 if (response.ContentType == null || response.ContentType == "text/html")
                     response.ContentType = defaultContentType;
-                response.Write(responseText);
 
+                response.Write(responseText);
                 return;
             }
 
-            if (defaultAction == null)
-            {
-                throw new ArgumentNullException("defaultAction", String.Format(
-                    "As result '{0}' is not a supported responseType, a defaultAction must be supplied",
-                    (result != null ? result.GetType().GetOperationName() : "")));
-            }
-
-
-            if (result != null)
-                defaultAction(request, result, response);
-
-            if (disposableResult != null)
-                disposableResult.Dispose();
+            var serializer = ContentTypes.Instance.GetResponseSerializer(defaultContentType);
+            serializer(result, response);
         }
-
     }
 }
-- 
cgit v1.2.3


From a855864207fe3ed0ac9b4d648617bb1cb39df3f3 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 12 Nov 2016 02:14:04 -0500
Subject: limit access to response stream

---
 .../HttpServer/HttpListenerHost.cs                 | 22 +++++++++++++++-------
 .../SocketSharp/WebSocketSharpResponse.cs          | 21 ++++-----------------
 MediaBrowser.Model/Services/IRequest.cs            | 13 -------------
 ServiceStack/Host/ContentTypes.cs                  | 10 +---------
 ServiceStack/HttpResponseExtensionsInternal.cs     | 22 ++++++++++++----------
 5 files changed, 32 insertions(+), 56 deletions(-)

(limited to 'ServiceStack/HttpResponseExtensionsInternal.cs')

diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index 49c664eec..41b7a4622 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -9,6 +9,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Text;
 using System.Threading.Tasks;
 using Emby.Server.Implementations.HttpServer;
 using Emby.Server.Implementations.HttpServer.SocketSharp;
@@ -248,9 +249,7 @@ namespace Emby.Server.Implementations.HttpServer
                 httpRes.StatusCode = statusCode;
 
                 httpRes.ContentType = "text/html";
-                httpRes.Write(ex.Message);
-
-                httpRes.Close();
+                Write(httpRes, ex.Message);
             }
             catch
             {
@@ -404,7 +403,7 @@ namespace Emby.Server.Implementations.HttpServer
                 {
                     httpRes.StatusCode = 400;
                     httpRes.ContentType = "text/plain";
-                    httpRes.Write("Invalid host");
+                    Write(httpRes, "Invalid host");
                     return;
                 }
 
@@ -458,7 +457,7 @@ namespace Emby.Server.Implementations.HttpServer
 
                     if (!string.Equals(newUrl, urlString, StringComparison.OrdinalIgnoreCase))
                     {
-                        httpRes.Write(
+                        Write(httpRes,
                             "<!doctype html><html><head><title>Emby</title></head><body>Please update your Emby bookmark to <a href=\"" +
                             newUrl + "\">" + newUrl + "</a></body></html>");
                         return;
@@ -475,7 +474,7 @@ namespace Emby.Server.Implementations.HttpServer
 
                     if (!string.Equals(newUrl, urlString, StringComparison.OrdinalIgnoreCase))
                     {
-                        httpRes.Write(
+                        Write(httpRes,
                             "<!doctype html><html><head><title>Emby</title></head><body>Please update your Emby bookmark to <a href=\"" +
                             newUrl + "\">" + newUrl + "</a></body></html>");
                         return;
@@ -513,7 +512,7 @@ namespace Emby.Server.Implementations.HttpServer
                 {
                     httpRes.StatusCode = 503;
                     httpRes.ContentType = "text/html";
-                    httpRes.Write(GlobalResponse);
+                    Write(httpRes, GlobalResponse);
                     return;
                 }
 
@@ -547,6 +546,15 @@ namespace Emby.Server.Implementations.HttpServer
             }
         }
 
+        private void Write(IResponse response, string text)
+        {
+            var bOutput = Encoding.UTF8.GetBytes(text);
+            response.SetContentLength(bOutput.Length);
+
+            var outputStream = response.OutputStream;
+            outputStream.Write(bOutput, 0, bOutput.Length);
+        }
+
         public static void RedirectToUrl(IResponse httpRes, string url)
         {
             httpRes.StatusCode = 302;
diff --git a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs
index 9de86e9cc..a8b115056 100644
--- a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs
+++ b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpResponse.cs
@@ -77,16 +77,6 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
             get { return _response.OutputStream; }
         }
 
-        public void Write(string text)
-        {
-            var bOutput = System.Text.Encoding.UTF8.GetBytes(text);
-            _response.ContentLength64 = bOutput.Length;
-
-            var outputStream = _response.OutputStream;
-            outputStream.Write(bOutput, 0, bOutput.Length);
-            Close();
-        }
-
         public void Close()
         {
             if (!this.IsClosed)
@@ -108,8 +98,10 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
         {
             try
             {
-                response.OutputStream.Flush();
-                response.OutputStream.Dispose();
+                var outputStream = response.OutputStream;
+
+                outputStream.Flush();
+                outputStream.Dispose();
                 response.Close();
             }
             catch (Exception ex)
@@ -118,11 +110,6 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
             }
         }
 
-        public void Flush()
-        {
-            _response.OutputStream.Flush();
-        }
-
         public bool IsClosed
         {
             get;
diff --git a/MediaBrowser.Model/Services/IRequest.cs b/MediaBrowser.Model/Services/IRequest.cs
index 455a69d37..e9a9f1c5b 100644
--- a/MediaBrowser.Model/Services/IRequest.cs
+++ b/MediaBrowser.Model/Services/IRequest.cs
@@ -136,23 +136,12 @@ namespace MediaBrowser.Model.Services
 
         Stream OutputStream { get; }
 
-        /// <summary>
-        /// Write once to the Response Stream then close it. 
-        /// </summary>
-        /// <param name="text"></param>
-        void Write(string text);
-
         /// <summary>
         /// Signal that this response has been handled and no more processing should be done.
         /// When used in a request or response filter, no more filters or processing is done on this request.
         /// </summary>
         void Close();
 
-        /// <summary>
-        /// Response.Flush() and OutputStream.Flush() seem to have different behaviour in ASP.NET
-        /// </summary>
-        void Flush();
-
         /// <summary>
         /// Gets a value indicating whether this instance is closed.
         /// </summary>
@@ -160,8 +149,6 @@ namespace MediaBrowser.Model.Services
 
         void SetContentLength(long contentLength);
 
-        bool KeepAlive { get; set; }
-
         //Add Metadata to Response
         Dictionary<string, object> Items { get; }
     }
diff --git a/ServiceStack/Host/ContentTypes.cs b/ServiceStack/Host/ContentTypes.cs
index 58ba29801..8840e7c8b 100644
--- a/ServiceStack/Host/ContentTypes.cs
+++ b/ServiceStack/Host/ContentTypes.cs
@@ -18,15 +18,7 @@ namespace ServiceStack.Host
             serializer(response, responseStream);
         }
 
-        public Action<object, IResponse> GetResponseSerializer(string contentType)
-        {
-            var serializer = GetStreamSerializer(contentType);
-            if (serializer == null) return null;
-
-            return (dto, httpRes) => serializer(dto, httpRes.OutputStream);
-        }
-
-        public Action<object, Stream> GetStreamSerializer(string contentType)
+        private Action<object, Stream> GetStreamSerializer(string contentType)
         {
             switch (GetRealContentType(contentType))
             {
diff --git a/ServiceStack/HttpResponseExtensionsInternal.cs b/ServiceStack/HttpResponseExtensionsInternal.cs
index 88b82bdf6..44b790f5f 100644
--- a/ServiceStack/HttpResponseExtensionsInternal.cs
+++ b/ServiceStack/HttpResponseExtensionsInternal.cs
@@ -6,6 +6,7 @@ using System.IO;
 using System.Net;
 using System.Threading.Tasks;
 using System.Collections.Generic;
+using System.Text;
 using System.Threading;
 using MediaBrowser.Model.Services;
 using ServiceStack.Host;
@@ -14,19 +15,19 @@ namespace ServiceStack
 {
     public static class HttpResponseExtensionsInternal
     {
-        public static async Task<bool> WriteToOutputStream(IResponse response, object result)
+        public static async Task<bool> WriteToOutputStream(IResponse response, Stream outputStream, object result)
         {
             var asyncStreamWriter = result as IAsyncStreamWriter;
             if (asyncStreamWriter != null)
             {
-                await asyncStreamWriter.WriteToAsync(response.OutputStream, CancellationToken.None).ConfigureAwait(false);
+                await asyncStreamWriter.WriteToAsync(outputStream, CancellationToken.None).ConfigureAwait(false);
                 return true;
             }
 
             var streamWriter = result as IStreamWriter;
             if (streamWriter != null)
             {
-                streamWriter.WriteTo(response.OutputStream);
+                streamWriter.WriteTo(outputStream);
                 return true;
             }
 
@@ -35,7 +36,7 @@ namespace ServiceStack
             {
                 using (stream)
                 {
-                    await stream.CopyToAsync(response.OutputStream).ConfigureAwait(false);
+                    await stream.CopyToAsync(outputStream).ConfigureAwait(false);
                     return true;
                 }
             }
@@ -46,7 +47,7 @@ namespace ServiceStack
                 response.ContentType = "application/octet-stream";
                 response.SetContentLength(bytes.Length);
 
-                await response.OutputStream.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
+                await outputStream.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
                 return true;
             }
 
@@ -151,10 +152,11 @@ namespace ServiceStack
                 response.ContentType += "; charset=utf-8";
             }
 
-            var writeToOutputStreamResult = await WriteToOutputStream(response, result).ConfigureAwait(false);
+            var outputStream = response.OutputStream;
+
+            var writeToOutputStreamResult = await WriteToOutputStream(response, outputStream, result).ConfigureAwait(false);
             if (writeToOutputStreamResult)
             {
-                response.Flush(); //required for Compression
                 return;
             }
 
@@ -164,12 +166,12 @@ namespace ServiceStack
                 if (response.ContentType == null || response.ContentType == "text/html")
                     response.ContentType = defaultContentType;
 
-                response.Write(responseText);
+                var bytes = Encoding.UTF8.GetBytes(responseText);
+                await outputStream.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
                 return;
             }
 
-            var serializer = ContentTypes.Instance.GetResponseSerializer(defaultContentType);
-            serializer(result, response);
+            ContentTypes.Instance.SerializeToStream(request, result, outputStream);
         }
     }
 }
-- 
cgit v1.2.3


From 6865bb53530abbf703b590dd39cfa27274b03107 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 12 Nov 2016 02:45:06 -0500
Subject: update responses

---
 ServiceStack/Host/ContentTypes.cs              |  2 +-
 ServiceStack/HttpResponseExtensionsInternal.cs | 35 ++++++++++++++++++--------
 ServiceStack/HttpResult.cs                     |  2 +-
 3 files changed, 27 insertions(+), 12 deletions(-)

(limited to 'ServiceStack/HttpResponseExtensionsInternal.cs')

diff --git a/ServiceStack/Host/ContentTypes.cs b/ServiceStack/Host/ContentTypes.cs
index 8840e7c8b..f7734a36b 100644
--- a/ServiceStack/Host/ContentTypes.cs
+++ b/ServiceStack/Host/ContentTypes.cs
@@ -18,7 +18,7 @@ namespace ServiceStack.Host
             serializer(response, responseStream);
         }
 
-        private Action<object, Stream> GetStreamSerializer(string contentType)
+        public static Action<object, Stream> GetStreamSerializer(string contentType)
         {
             switch (GetRealContentType(contentType))
             {
diff --git a/ServiceStack/HttpResponseExtensionsInternal.cs b/ServiceStack/HttpResponseExtensionsInternal.cs
index 44b790f5f..318d62429 100644
--- a/ServiceStack/HttpResponseExtensionsInternal.cs
+++ b/ServiceStack/HttpResponseExtensionsInternal.cs
@@ -15,19 +15,19 @@ namespace ServiceStack
 {
     public static class HttpResponseExtensionsInternal
     {
-        public static async Task<bool> WriteToOutputStream(IResponse response, Stream outputStream, object result)
+        public static async Task<bool> WriteToOutputStream(IResponse response, object result)
         {
             var asyncStreamWriter = result as IAsyncStreamWriter;
             if (asyncStreamWriter != null)
             {
-                await asyncStreamWriter.WriteToAsync(outputStream, CancellationToken.None).ConfigureAwait(false);
+                await asyncStreamWriter.WriteToAsync(response.OutputStream, CancellationToken.None).ConfigureAwait(false);
                 return true;
             }
 
             var streamWriter = result as IStreamWriter;
             if (streamWriter != null)
             {
-                streamWriter.WriteTo(outputStream);
+                streamWriter.WriteTo(response.OutputStream);
                 return true;
             }
 
@@ -36,7 +36,7 @@ namespace ServiceStack
             {
                 using (stream)
                 {
-                    await stream.CopyToAsync(outputStream).ConfigureAwait(false);
+                    await stream.CopyToAsync(response.OutputStream).ConfigureAwait(false);
                     return true;
                 }
             }
@@ -47,7 +47,7 @@ namespace ServiceStack
                 response.ContentType = "application/octet-stream";
                 response.SetContentLength(bytes.Length);
 
-                await outputStream.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
+                await response.OutputStream.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
                 return true;
             }
 
@@ -152,9 +152,7 @@ namespace ServiceStack
                 response.ContentType += "; charset=utf-8";
             }
 
-            var outputStream = response.OutputStream;
-
-            var writeToOutputStreamResult = await WriteToOutputStream(response, outputStream, result).ConfigureAwait(false);
+            var writeToOutputStreamResult = await WriteToOutputStream(response, result).ConfigureAwait(false);
             if (writeToOutputStreamResult)
             {
                 return;
@@ -167,11 +165,28 @@ namespace ServiceStack
                     response.ContentType = defaultContentType;
 
                 var bytes = Encoding.UTF8.GetBytes(responseText);
-                await outputStream.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
+                await response.OutputStream.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
                 return;
             }
 
-            ContentTypes.Instance.SerializeToStream(request, result, outputStream);
+            await WriteObject(request, result, response).ConfigureAwait(false);
+        }
+
+        public static async Task WriteObject(IRequest request, object result, IResponse response)
+        {
+            var contentType = request.ResponseContentType;
+            var serializer = ContentTypes.GetStreamSerializer(contentType);
+            
+            using (var ms = new MemoryStream())
+            {
+                serializer(result, ms);
+
+                ms.Position = 0;
+                response.SetContentLength(ms.Length);
+                await ms.CopyToAsync(response.OutputStream).ConfigureAwait(false);
+            }
+
+            //serializer(result, outputStream);
         }
     }
 }
diff --git a/ServiceStack/HttpResult.cs b/ServiceStack/HttpResult.cs
index e25002b3e..3f86ffdf7 100644
--- a/ServiceStack/HttpResult.cs
+++ b/ServiceStack/HttpResult.cs
@@ -55,7 +55,7 @@ namespace ServiceStack
                 return;
             }
 
-            ContentTypes.Instance.SerializeToStream(this.RequestContext, this.Response, responseStream);
+            await HttpResponseExtensionsInternal.WriteObject(this.RequestContext, this.Response, response).ConfigureAwait(false);
         }
     }
 }
-- 
cgit v1.2.3